From c1e71836dfff3edd08a19c247c16c1710a954bac Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Tue, 29 Aug 2023 16:15:21 -0600 Subject: [PATCH 01/10] use rosa dev branch flavor image --- chart/infra-server/static/workflow-openshift-rosa.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml index c04438169..c47b1f158 100644 --- a/chart/infra-server/static/workflow-openshift-rosa.yaml +++ b/chart/infra-server/static/workflow-openshift-rosa.yaml @@ -38,7 +38,7 @@ spec: - name: create activeDeadlineSeconds: 7200 container: - image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.5 + image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-1-g48c47ca8b7-snapshot imagePullPolicy: Always command: - ./entrypoint.sh @@ -105,7 +105,7 @@ spec: - name: destroy activeDeadlineSeconds: 3600 container: - image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.5 + image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-1-g48c47ca8b7-snapshot imagePullPolicy: Always command: - ./entrypoint.sh From 469b5d47e133d228fd1f6589ef0982f9a79289b1 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Tue, 29 Aug 2023 18:47:09 -0600 Subject: [PATCH 02/10] add managed-cp option to rosa form --- chart/infra-server/static/flavors.yaml | 6 ++++++ chart/infra-server/static/workflow-openshift-rosa.yaml | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml index b260fde3c..3e4fd04a7 100644 --- a/chart/infra-server/static/flavors.yaml +++ b/chart/infra-server/static/flavors.yaml @@ -654,6 +654,12 @@ value: "4" kind: optional + - name: managed-cp + description: Use managed control-plane? + value: "false" + kind: optional + help: ROSA will switch to managed control-plane (Hypershift) by default around the end of 2023. + - name: machine-type description: node machine type value: m5.xlarge diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml index c47b1f158..b02a6566f 100644 --- a/chart/infra-server/static/workflow-openshift-rosa.yaml +++ b/chart/infra-server/static/workflow-openshift-rosa.yaml @@ -7,6 +7,8 @@ spec: arguments: parameters: - name: name + - name: managed-cp + value: false - name: nodes value: "4" - name: machine-type @@ -66,6 +68,8 @@ spec: secretKeyRef: name: osd-access-secrets key: OPENSHIFT_CLUSTER_MANAGER_API_TOKEN + - name: MANAGED_CP + value: "{{workflow.parameters.managed-cp}}" - name: NODE_COUNT value: "{{workflow.parameters.nodes}}" - name: INSTANCE_TYPE From 3009b1a3c52221f76ae53b0f0fb1392edac2441a Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Tue, 29 Aug 2023 20:20:01 -0600 Subject: [PATCH 03/10] region param --- chart/infra-server/static/flavors.yaml | 5 +++++ chart/infra-server/static/workflow-openshift-rosa.yaml | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml index 3e4fd04a7..188969be4 100644 --- a/chart/infra-server/static/flavors.yaml +++ b/chart/infra-server/static/flavors.yaml @@ -654,6 +654,11 @@ value: "4" kind: optional + - name: aws-region + description: aws region for cluster + value: "us-east-2" + kind: optional + - name: managed-cp description: Use managed control-plane? value: "false" diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml index b02a6566f..5b459931e 100644 --- a/chart/infra-server/static/workflow-openshift-rosa.yaml +++ b/chart/infra-server/static/workflow-openshift-rosa.yaml @@ -7,6 +7,8 @@ spec: arguments: parameters: - name: name + - name: aws-region + value: "us-east-2" - name: managed-cp value: false - name: nodes @@ -68,6 +70,8 @@ spec: secretKeyRef: name: osd-access-secrets key: OPENSHIFT_CLUSTER_MANAGER_API_TOKEN + - name: AWS_REGION + value: "{{workflow.parameters.aws-region}}" - name: MANAGED_CP value: "{{workflow.parameters.managed-cp}}" - name: NODE_COUNT From c46d9d42e18d3b4e5cfd5a3473f60d6a107185e3 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Tue, 29 Aug 2023 20:26:25 -0600 Subject: [PATCH 04/10] use aws region param --- chart/infra-server/static/workflow-openshift-rosa.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml index 5b459931e..775454527 100644 --- a/chart/infra-server/static/workflow-openshift-rosa.yaml +++ b/chart/infra-server/static/workflow-openshift-rosa.yaml @@ -42,7 +42,7 @@ spec: - name: create activeDeadlineSeconds: 7200 container: - image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-1-g48c47ca8b7-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-4-gdb1ab168f7-snapshot imagePullPolicy: Always command: - ./entrypoint.sh @@ -113,7 +113,7 @@ spec: - name: destroy activeDeadlineSeconds: 3600 container: - image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-1-g48c47ca8b7-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-4-gdb1ab168f7-snapshot imagePullPolicy: Always command: - ./entrypoint.sh From 67ed251b0fed845e011a4e6ac3666a89c38b5e16 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Tue, 29 Aug 2023 20:45:30 -0600 Subject: [PATCH 05/10] update image to log region --- chart/infra-server/static/workflow-openshift-rosa.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml index 775454527..45ff98fc2 100644 --- a/chart/infra-server/static/workflow-openshift-rosa.yaml +++ b/chart/infra-server/static/workflow-openshift-rosa.yaml @@ -42,7 +42,7 @@ spec: - name: create activeDeadlineSeconds: 7200 container: - image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-4-gdb1ab168f7-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-5-g20f9b183c0-snapshot imagePullPolicy: Always command: - ./entrypoint.sh @@ -113,7 +113,7 @@ spec: - name: destroy activeDeadlineSeconds: 3600 container: - image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-4-gdb1ab168f7-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-5-g20f9b183c0-snapshot imagePullPolicy: Always command: - ./entrypoint.sh @@ -121,6 +121,8 @@ spec: - destroy - "{{workflow.parameters.name}}" env: + - name: AWS_REGION + value: "{{workflow.parameters.aws-region}}" - name: AWS_ACCESS_KEY_ID valueFrom: secretKeyRef: From 2575a038ec7934eccd78ababd6b65969128cbcea Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Tue, 29 Aug 2023 21:01:14 -0600 Subject: [PATCH 06/10] rosa image with newer(gh) cli --- chart/infra-server/static/workflow-openshift-rosa.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml index 45ff98fc2..f0b523585 100644 --- a/chart/infra-server/static/workflow-openshift-rosa.yaml +++ b/chart/infra-server/static/workflow-openshift-rosa.yaml @@ -42,7 +42,7 @@ spec: - name: create activeDeadlineSeconds: 7200 container: - image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-5-g20f9b183c0-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-6-geafb3988d3-snapshot imagePullPolicy: Always command: - ./entrypoint.sh @@ -113,7 +113,7 @@ spec: - name: destroy activeDeadlineSeconds: 3600 container: - image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-5-g20f9b183c0-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-6-geafb3988d3-snapshot imagePullPolicy: Always command: - ./entrypoint.sh From 11f35a5c7a6c528994bf2e4d13c673ebd2a7ade8 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Tue, 29 Aug 2023 21:34:04 -0600 Subject: [PATCH 07/10] update --- chart/infra-server/static/workflow-openshift-rosa.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml index f0b523585..63e1b2754 100644 --- a/chart/infra-server/static/workflow-openshift-rosa.yaml +++ b/chart/infra-server/static/workflow-openshift-rosa.yaml @@ -42,7 +42,7 @@ spec: - name: create activeDeadlineSeconds: 7200 container: - image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-6-geafb3988d3-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-8-gba17881769-snapshot imagePullPolicy: Always command: - ./entrypoint.sh @@ -70,6 +70,8 @@ spec: secretKeyRef: name: osd-access-secrets key: OPENSHIFT_CLUSTER_MANAGER_API_TOKEN + - name: AWS_DEFAULT_REGION + value: "{{workflow.parameters.aws-region}}" - name: AWS_REGION value: "{{workflow.parameters.aws-region}}" - name: MANAGED_CP @@ -113,7 +115,7 @@ spec: - name: destroy activeDeadlineSeconds: 3600 container: - image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-6-geafb3988d3-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-8-gba17881769-snapshot imagePullPolicy: Always command: - ./entrypoint.sh @@ -121,6 +123,8 @@ spec: - destroy - "{{workflow.parameters.name}}" env: + - name: AWS_DEFAULT_REGION + value: "{{workflow.parameters.aws-region}}" - name: AWS_REGION value: "{{workflow.parameters.aws-region}}" - name: AWS_ACCESS_KEY_ID From 639ce7d58873af9256c484d7b94eb486474269e9 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Tue, 29 Aug 2023 22:40:48 -0600 Subject: [PATCH 08/10] fixed rosa cli download --- chart/infra-server/static/workflow-openshift-rosa.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml index 63e1b2754..3fb7be5a4 100644 --- a/chart/infra-server/static/workflow-openshift-rosa.yaml +++ b/chart/infra-server/static/workflow-openshift-rosa.yaml @@ -42,7 +42,7 @@ spec: - name: create activeDeadlineSeconds: 7200 container: - image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-8-gba17881769-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-12-g57d06ec668-snapshot imagePullPolicy: Always command: - ./entrypoint.sh @@ -115,7 +115,7 @@ spec: - name: destroy activeDeadlineSeconds: 3600 container: - image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-8-gba17881769-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-12-g57d06ec668-snapshot imagePullPolicy: Always command: - ./entrypoint.sh From 9d250ec0e75e5ff1b62aa4d98cc7a57149286246 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Wed, 6 Sep 2023 12:14:23 -0600 Subject: [PATCH 09/10] update re-roll --- chart/infra-server/static/flavors.yaml | 5 +++++ chart/infra-server/static/workflow-openshift-rosa.yaml | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml index 188969be4..bb28135fe 100644 --- a/chart/infra-server/static/flavors.yaml +++ b/chart/infra-server/static/flavors.yaml @@ -665,6 +665,11 @@ kind: optional help: ROSA will switch to managed control-plane (Hypershift) by default around the end of 2023. + - name: rosa-args + description: additional rosa cli args + value: "" + kind: optional + - name: machine-type description: node machine type value: m5.xlarge diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml index 3fb7be5a4..8fcd3207d 100644 --- a/chart/infra-server/static/workflow-openshift-rosa.yaml +++ b/chart/infra-server/static/workflow-openshift-rosa.yaml @@ -7,6 +7,8 @@ spec: arguments: parameters: - name: name + - name: rosa-args + value: "" - name: aws-region value: "us-east-2" - name: managed-cp @@ -42,7 +44,7 @@ spec: - name: create activeDeadlineSeconds: 7200 container: - image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-12-g57d06ec668-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-16-ga2e06ac410-snapshot imagePullPolicy: Always command: - ./entrypoint.sh @@ -115,7 +117,7 @@ spec: - name: destroy activeDeadlineSeconds: 3600 container: - image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-12-g57d06ec668-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-16-ga2e06ac410-snapshot imagePullPolicy: Always command: - ./entrypoint.sh @@ -123,6 +125,8 @@ spec: - destroy - "{{workflow.parameters.name}}" env: + - name: ROSA_ARGS + value: "{{workflow.parameters.rosa-args}}" - name: AWS_DEFAULT_REGION value: "{{workflow.parameters.aws-region}}" - name: AWS_REGION From b35566d0ae702a6b0f0880bcf2a8b1cf0b731528 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Fri, 20 Oct 2023 09:36:32 -0600 Subject: [PATCH 10/10] latest rosa flavor --- chart/infra-server/static/workflow-openshift-rosa.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml index 002b57d37..9f6c5d73b 100644 --- a/chart/infra-server/static/workflow-openshift-rosa.yaml +++ b/chart/infra-server/static/workflow-openshift-rosa.yaml @@ -44,7 +44,7 @@ spec: - name: create activeDeadlineSeconds: 7200 container: - image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-16-ga2e06ac410-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.3-21-g70472dffa6-snapshot imagePullPolicy: Always command: - ./entrypoint.sh @@ -134,7 +134,7 @@ spec: - name: destroy activeDeadlineSeconds: 3600 container: - image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.7.6-16-ga2e06ac410-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.3-21-g70472dffa6-snapshot imagePullPolicy: Always command: - ./entrypoint.sh