-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ROX-20252: add rosa hcp option #1053
Merged
Merged
Changes from 101 commits
Commits
Show all changes
106 commits
Select commit
Hold shift + click to select a range
c1e7183
use rosa dev branch flavor image
davdhacs 469b5d4
add managed-cp option to rosa form
davdhacs 3009b1a
region param
davdhacs c46d9d4
use aws region param
davdhacs 67ed251
update image to log region
davdhacs 2575a03
rosa image with newer(gh) cli
davdhacs 11f35a5
update
davdhacs 639ce7d
fixed rosa cli download
davdhacs 9d250ec
update re-roll
davdhacs 0799887
Merge branch 'master' into ROX-19302-rosa-hcp-option
davdhacs a813364
Merge branch 'master' into ROX-19302-rosa-hcp-option
davdhacs b35566d
latest rosa flavor
davdhacs bed69f9
latest flavor img
davdhacs 8fa421c
Merge branch 'master' into ROX-20252-add-rosa-hcp-option
davdhacs 36481c5
Merge branch 'master' into ROX-20252-add-rosa-hcp-option
davdhacs 4a505fc
Merge branch 'master' into ROX-20252-add-rosa-hcp-option
davdhacs 2799cbe
latest dev img
davdhacs 84b24b2
Merge branch 'master' into ROX-20252-add-rosa-hcp-option
davdhacs 4cf0132
empty commit
tommartensen 77ecf93
Revert "Bump namor from 2.0.3 to 3.0.1 in /ui (#969)"
tommartensen f88edee
Merge remote-tracking branch 'origin/tm/revert-namor' into ROX-20252-…
davdhacs e49dfd8
update image
davdhacs cbc7766
again
davdhacs 6c7f12c
again
davdhacs 09d24ba
and again
davdhacs 8b50fc3
Revert "again"
davdhacs 2e7c4c8
Merge branch 'master' into ROX-20252-add-rosa-hcp-option
davdhacs 44c9ffe
bump
davdhacs efa886d
bump
davdhacs 00b80da
bump
davdhacs 7092d4d
bump
davdhacs 9afd15d
bump
davdhacs 8e0d615
bump
davdhacs 66ada70
bump
davdhacs 7f23a4c
bump
davdhacs 01668c4
bump
davdhacs 19cdf5a
bump
davdhacs 14037bb
bump
davdhacs 1aca2a4
bump
davdhacs e8b8c9e
bump
davdhacs c7c9192
bump
davdhacs b7c55c8
bump
davdhacs e23c3f6
bump
davdhacs 5280b56
remove aws default region var
davdhacs 9137830
bump
davdhacs 033eb26
bump
davdhacs 0b4fb75
bump
davdhacs 6fae866
bump
davdhacs d855755
bump
davdhacs fde6ca3
bump
davdhacs 84ea8fb
bump
davdhacs bbe98e8
bump
davdhacs 8180c10
bump
davdhacs 7aac8cc
bump
davdhacs 13590f2
bump
davdhacs a1bcba1
bump
davdhacs f04fcdf
bump
davdhacs 215f1e5
before role switch
davdhacs 0f00907
at dash
davdhacs 099516e
latest
davdhacs 5abf5b8
bump
davdhacs 32da955
check patch
davdhacs 98a2738
bump
davdhacs 6f78685
bump
davdhacs 57b39be
bump
davdhacs 944cf8c
'bump
davdhacs 2172f8d
bump
davdhacs 1675132
bump
davdhacs 73a234a
bump
davdhacs 8ae3b99
bump
davdhacs 9bd2f3e
bump
davdhacs b20bc61
bump
davdhacs c2ea257
bump
davdhacs 5536ff6
add separate rosa-hcp flavor option
davdhacs a9bc80e
fix rosa_args loc
davdhacs 1cf62cd
bump
davdhacs 8275be1
push rosa-hcp into secrets
davdhacs 5c6c2af
bump
davdhacs 2573354
bump
davdhacs b6f2ef8
bump
davdhacs 403ea5e
bump
davdhacs f81f4e9
bump
davdhacs 49e787a
bump
davdhacs 2ad9019
bump
davdhacs 97801c1
bump
davdhacs 2694921
bump
davdhacs c628ce2
bump
davdhacs 250aa59
bump
davdhacs 22c2cfa
bump
davdhacs a85d100
bump
davdhacs c871295
add help to new rosa args
davdhacs 8a06884
add subnets arg for hcp
davdhacs cb3df41
bump
davdhacs 9539e0c
fix name case
davdhacs 6a274f3
Merge branch 'master' into ROX-20252-add-rosa-hcp-option
davdhacs 2098433
use tag, flavor merged
davdhacs ebdc961
rename as hypershift
davdhacs 075ac88
fix default for subnets
davdhacs 58bb7ed
fix console url
davdhacs 56a2dfb
allow fix from flavor
davdhacs a7d0479
remove port
davdhacs 04806d5
Merge branch 'master' into ROX-20252-add-rosa-hcp-option
davdhacs 740aa58
markdown in rosa-args help
davdhacs a2c2626
remove hcp option from rosa flavor form
davdhacs d95bb3a
markdown formatting
davdhacs a20dcf8
expand note about managed_cp arg
davdhacs File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
179 changes: 179 additions & 0 deletions
179
chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,179 @@ | ||
apiVersion: argoproj.io/v1alpha1 | ||
kind: Workflow | ||
metadata: | ||
generateName: rosa- | ||
spec: | ||
entrypoint: start | ||
arguments: | ||
parameters: | ||
- name: name | ||
- name: rosa-args | ||
value: "" | ||
- name: aws-region | ||
value: "us-east-1" | ||
- name: managed-cp | ||
value: true | ||
- name: subnet-ids | ||
value: "" | ||
- name: nodes | ||
value: "2" | ||
- name: machine-type | ||
value: "m5.2xlarge" | ||
volumeClaimTemplates: | ||
- metadata: | ||
name: data | ||
spec: | ||
accessModes: [ "ReadWriteOnce" ] | ||
resources: | ||
requests: | ||
storage: 10Mi | ||
|
||
templates: | ||
- name: start | ||
steps: | ||
- - name: create | ||
template: create | ||
|
||
- - name: gather | ||
template: gather | ||
|
||
- - name: wait | ||
template: wait | ||
|
||
- - name: destroy | ||
template: destroy | ||
|
||
- name: create | ||
activeDeadlineSeconds: 7200 | ||
container: | ||
image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.5 | ||
imagePullPolicy: Always | ||
command: | ||
- ./entrypoint.sh | ||
args: | ||
- create | ||
- "{{workflow.parameters.name}}" | ||
env: | ||
- name: AWS_ACCESS_KEY_ID | ||
valueFrom: | ||
secretKeyRef: | ||
name: osd-access-secrets | ||
key: AWS_ACCESS_KEY_ID | ||
- name: AWS_SECRET_ACCESS_KEY | ||
valueFrom: | ||
secretKeyRef: | ||
name: osd-access-secrets | ||
key: AWS_SECRET_ACCESS_KEY | ||
- name: REDHAT_PULL_SECRET_BASE64 | ||
valueFrom: | ||
secretKeyRef: | ||
name: osd-access-secrets | ||
key: REDHAT_PULL_SECRET_BASE64 | ||
- name: OPENSHIFT_CLUSTER_MANAGER_API_TOKEN | ||
valueFrom: | ||
secretKeyRef: | ||
name: osd-access-secrets | ||
key: OPENSHIFT_CLUSTER_MANAGER_API_TOKEN | ||
- name: ROSA_ARGS | ||
value: "{{workflow.parameters.rosa-args}}" | ||
- name: AWS_REGION | ||
value: "{{workflow.parameters.aws-region}}" | ||
- name: MANAGED_CP | ||
value: "{{workflow.parameters.managed-cp}}" | ||
- name: SUBNET_IDS | ||
value: "{{workflow.parameters.subnet-ids}}" | ||
- name: NODE_COUNT | ||
value: "{{workflow.parameters.nodes}}" | ||
- name: INSTANCE_TYPE | ||
value: "{{workflow.parameters.machine-type}}" | ||
- name: CREATION_SOURCE | ||
value: "infra" | ||
volumeMounts: | ||
- name: data | ||
mountPath: /data | ||
|
||
- name: gather | ||
script: | ||
image: busybox | ||
command: [sh] | ||
source: | | ||
cd /data | ||
. ./dotenv | ||
if [[ -z "${CONSOLE_ENDPOINT// /}" ]]; then | ||
CONSOLE_ENDPOINT="https://console-openshift-console.apps.rosa${API_ENDPOINT#https://api}" | ||
echo "$CONSOLE_ENDPOINT" \ | ||
| sed -e 's/:[0-9]*$//' > cluster-console-url | ||
else | ||
echo "${CONSOLE_ENDPOINT}" > cluster-console-url | ||
fi | ||
echo "${CONSOLE_USER}" > cluster-console-username | ||
echo "${CONSOLE_PASSWORD}" > cluster-console-password | ||
volumeMounts: | ||
- name: data | ||
mountPath: /data | ||
outputs: | ||
artifacts: | ||
- name: kubeconfig | ||
path: /data/kubeconfig | ||
archive: | ||
none: {} | ||
- name: dotenv | ||
path: /data/dotenv | ||
archive: | ||
none: {} | ||
- name: data | ||
path: /data | ||
archive: | ||
tar: {} | ||
- name: cluster-console-url | ||
path: /data/cluster-console-url | ||
archive: | ||
none: {} | ||
- name: cluster-console-username | ||
path: /data/cluster-console-username | ||
archive: | ||
none: {} | ||
- name: cluster-console-password | ||
path: /data/cluster-console-password | ||
archive: | ||
none: {} | ||
|
||
- name: wait | ||
suspend: {} | ||
|
||
- name: destroy | ||
activeDeadlineSeconds: 3600 | ||
container: | ||
image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.5 | ||
imagePullPolicy: Always | ||
command: | ||
- ./entrypoint.sh | ||
args: | ||
- destroy | ||
- "{{workflow.parameters.name}}" | ||
env: | ||
- name: AWS_REGION | ||
value: "{{workflow.parameters.aws-region}}" | ||
- name: AWS_ACCESS_KEY_ID | ||
valueFrom: | ||
secretKeyRef: | ||
name: osd-access-secrets | ||
key: AWS_ACCESS_KEY_ID | ||
- name: AWS_SECRET_ACCESS_KEY | ||
valueFrom: | ||
secretKeyRef: | ||
name: osd-access-secrets | ||
key: AWS_SECRET_ACCESS_KEY | ||
- name: OPENSHIFT_CLUSTER_MANAGER_API_TOKEN | ||
valueFrom: | ||
secretKeyRef: | ||
name: osd-access-secrets | ||
key: OPENSHIFT_CLUSTER_MANAGER_API_TOKEN | ||
- name: REDHAT_PULL_SECRET_BASE64 | ||
valueFrom: | ||
secretKeyRef: | ||
name: osd-access-secrets | ||
key: REDHAT_PULL_SECRET_BASE64 | ||
volumeMounts: | ||
- name: data | ||
mountPath: /data |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this parameter be exposed to the user?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wasn't sure. I like showing that both ROSA flavors are the same, but with different default values. But it may just be confusing? I wondered if I should reset the ROSA flavor to be the same as it was before this change(?).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I think it is confusing now, because you could set
Use Managed Control Plane
totrue
in classic ROSA - what would the effect be?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, you can change the arguments in the rosa flavor form to match the defaults in the hcp/hypershift form and you'll get a matching cluster. So it just provides different default settings, and the
managed_cp
toggles hypershift on/off.