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/96] 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/96] 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/96] 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/96] 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/96] 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/96] 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/96] 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/96] 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/96] 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/96] 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

From bed69f93a111ebf6f672a859e68f4fba2cd4d718 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 27 Oct 2023 08:56:24 -0600
Subject: [PATCH 11/96] latest flavor img

---
 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 9f6c5d73b..3d22fb4a0 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.8.3-21-g70472dffa6-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.5-22-g105197fe80-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.8.3-21-g70472dffa6-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.5-22-g105197fe80-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 2799cbedbcb526ffd6fda59fa7131118b9b1ed1e Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 22 Nov 2023 09:58:06 -0700
Subject: [PATCH 12/96] latest dev img

---
 chart/infra-server/static/workflow-openshift-rosa.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml
index 3d22fb4a0..494fa8420 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.8.5-22-g105197fe80-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.5-22-g498c7a6a96-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 4cf0132f3999aa6334efa653ca0fa0675788bf34 Mon Sep 17 00:00:00 2001
From: Tom Martensen <tmartens@redhat.com>
Date: Thu, 23 Nov 2023 14:16:51 +0100
Subject: [PATCH 13/96] empty commit


From 77ecf9333c4af33a683f8aabdb13a96d5f97dd47 Mon Sep 17 00:00:00 2001
From: Tom Martensen <tmartens@redhat.com>
Date: Thu, 23 Nov 2023 15:40:26 +0100
Subject: [PATCH 14/96] Revert "Bump namor from 2.0.3 to 3.0.1 in /ui (#969)"

This reverts commit 9710be1153e5bc892cac9e450b921f8003835bf0.
---
 ui/package.json | 2 +-
 ui/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/package.json b/ui/package.json
index bae8ad36b..cd2939d6f 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -30,7 +30,7 @@
     "history": "^5.0.1",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
-    "namor": "^3.0.1",
+    "namor": "^2.0.3",
     "prop-types": "^15.8.1",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
diff --git a/ui/yarn.lock b/ui/yarn.lock
index f3874c75e..bf9f318dc 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -8659,10 +8659,10 @@ multicast-dns@^6.0.1:
     dns-packet "^1.3.1"
     thunky "^1.0.2"
 
-namor@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/namor/-/namor-3.0.1.tgz#1e9338587bc395a2f83937bebb5a7c069abe1a92"
-  integrity sha512-DuXHrPcpgSe9p/P7xS+8JdcHNasd6/eyOYa6oKSLK/Lx0tqrdzUIcWhF2HgtoFvZmoSILjzMJeWBo3Lt7T8F8A==
+namor@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/namor/-/namor-2.0.3.tgz#a42c5e76f6170f9e2fc4ddfc6d403a881f59350d"
+  integrity sha512-BDDfplXUwxcEK1QAwL0k82VyqYyAa3xdQv24ijfLc+5Zqdm3IyfAIBTCRWhKPbbLncmdvG/vCr9JhrVH9FGpNQ==
   dependencies:
     crypto-extra "1.0.1"
 

From e49dfd8e5d1fcb569f090543fc7bdeebd1b8c912 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 28 Nov 2023 13:45:05 -0700
Subject: [PATCH 15/96] update 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 494fa8420..2e39f1351 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.8.5-22-g498c7a6a96-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-37-g498c7a6a96-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.8.5-22-g105197fe80-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-37-g498c7a6a96-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From cbc7766da0cf01a1c2979bde69fadeae6b64dd3d Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 28 Nov 2023 15:29:24 -0700
Subject: [PATCH 16/96] again

---
 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 2e39f1351..bcf8ee64d 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.8.9-37-g498c7a6a96-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-38-g69f01c4e95-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.8.9-37-g498c7a6a96-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-38-g69f01c4e95-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 6c7f12cd24cf8693f290682aa856114ac7e222ec Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 28 Nov 2023 16:26:30 -0700
Subject: [PATCH 17/96] again

---
 Makefile                                      | 444 +++++++++++-------
 .../static/workflow-openshift-rosa.yaml       |   4 +-
 2 files changed, 284 insertions(+), 164 deletions(-)

diff --git a/Makefile b/Makefile
index 5af2438b8..3010b627a 100644
--- a/Makefile
+++ b/Makefile
@@ -14,13 +14,6 @@ else
 	VERSION := $(TAG)
 endif
 
-LOCAL_VALUES_FILE=chart/infra-server/configuration/infra-values-${ENVIRONMENT}.yaml
-LOCAL_COMBINED_VALUES_FILE=chart/infra-server/configuration/infra-values-from-files-${ENVIRONMENT}.yaml
-
-ifeq '$(SECRET_VERSION)' ''
-SECRET_VERSION := latest
-endif
-
 .PHONY: tag
 tag:
 	@echo $(VERSION)
@@ -30,6 +23,92 @@ IMAGE=us.gcr.io/stackrox-infra/infra-server:$(VERSION)
 image-name:
 	@echo $(IMAGE)
 
+#############
+## Linting ##
+#############
+
+.PHONY: argo-workflow-lint
+argo-workflow-lint:
+	@argo lint ./chart/infra-server/static/workflow*.yaml
+
+.PHONY: shellcheck
+shellcheck:
+	@shellcheck -x -- **/*.{bats,sh}
+
+###########
+## Build ##
+###########
+
+# server - Builds the infra-server binary
+# When run locally, a Darwin binary is built and installed into the user's GOPATH bin.
+# When run in CI, a Darwin and Linux binary is built.
+.PHONY: server
+server:
+	@echo "+ $@"
+	GOARCH=amd64 GOOS=linux ./scripts/go-build -o bin/infra-server-linux-amd64 ./cmd/infra-server
+
+# cli - Builds the infractl client binary
+# When run in CI or when preparing an image, a Darwin and Linux binary is built.
+.PHONY: cli
+cli:
+	@echo "+ $@"
+	GOARCH=amd64 GOOS=darwin ./scripts/go-build -o bin/infractl-darwin-amd64 ./cmd/infractl
+	GOARCH=arm64 GOOS=darwin ./scripts/go-build -o bin/infractl-darwin-arm64 ./cmd/infractl
+	GOARCH=amd64 GOOS=linux  ./scripts/go-build -o bin/infractl-linux-amd64  ./cmd/infractl
+
+# cli-local - Builds the infractl client binary
+# When run locally, a Darwin binary is built and installed into the user's GOPATH bin.
+.PHONY: cli-local
+cli-local:
+	@echo "+ $@"
+	./scripts/go-build -o $(GOPATH)/bin/infractl  ./cmd/infractl
+
+.PHONY: ui
+ui:
+	@echo "+ $@"
+	@make -C ui all
+
+.PHONY: image
+image:
+	docker build . -t $(IMAGE) -f image/Dockerfile --secret id=npmrc,src=${HOME}/.npmrc
+
+.PHONY: push
+push:
+	docker push $(IMAGE) | cat
+
+#############
+## Testing ##
+#############
+
+.PHONY: unit-test
+unit-test: proto-generated-srcs
+	@echo "+ $@"
+	@go test -v ./...
+
+.PHONY: go-e2e-tests
+go-e2e-tests: proto-generated-srcs
+	@kubectl apply -f workflows/
+	@go test ./test/e2e/... -tags=e2e -v -parallel 5 -count 1 -cover -timeout 1h
+
+# Assuming a local dev infra server is running and accessible via a port-forward
+# i.e. nohup kubectl -n infra port-forward svc/infra-server-service 8443:8443 &
+.PHONY: pull-infractl-from-dev-server
+pull-infractl-from-dev-server:
+	@mkdir -p bin
+	@rm -f bin/infractl
+	set -o pipefail; \
+	curl --retry 3 --insecure --silent --show-error --fail --location https://localhost:8443/v1/cli/linux/amd64/upgrade \
+          | jq -r ".result.fileChunk" \
+          | base64 -d \
+          > bin/infractl
+	chmod +x bin/infractl
+	bin/infractl -k -e localhost:8443 version
+
+.PHONY: e2e-tests
+e2e-tests:
+	@kubectl apply -f "workflows/*.yaml"
+	@bats --jobs 5 --no-parallelize-within-files --recursive .
+
 ##############
 ## Protobuf ##
 ##############
@@ -115,92 +194,6 @@ proto-generated-srcs: protoc-tools
 		--swagger_out=logtostderr=true:$(PROTO_OUTPUT_DIR) \
 		$(PROTO_FILES)
 
-###########
-## Build ##
-###########
-
-# server - Builds the infra-server binary
-# When run locally, a Darwin binary is built and installed into the user's GOPATH bin.
-# When run in CI, a Darwin and Linux binary is built.
-.PHONY: server
-server:
-	@echo "+ $@"
-	GOARCH=amd64 GOOS=linux ./scripts/go-build -o bin/infra-server-linux-amd64 ./cmd/infra-server
-
-# cli - Builds the infractl client binary
-# When run in CI or when preparing an image, a Darwin and Linux binary is built.
-.PHONY: cli
-cli:
-	@echo "+ $@"
-	GOARCH=amd64 GOOS=darwin ./scripts/go-build -o bin/infractl-darwin-amd64 ./cmd/infractl
-	GOARCH=arm64 GOOS=darwin ./scripts/go-build -o bin/infractl-darwin-arm64 ./cmd/infractl
-	GOARCH=amd64 GOOS=linux  ./scripts/go-build -o bin/infractl-linux-amd64  ./cmd/infractl
-
-# cli-local - Builds the infractl client binary
-# When run locally, a Darwin binary is built and installed into the user's GOPATH bin.
-.PHONY: cli-local
-cli-local:
-	@echo "+ $@"
-	./scripts/go-build -o $(GOPATH)/bin/infractl  ./cmd/infractl
-
-.PHONY: ui
-ui:
-	@echo "+ $@"
-	@make -C ui all
-
-.PHONY: image
-image:
-	docker build . -t $(IMAGE) -f image/Dockerfile --secret id=npmrc,src=${HOME}/.npmrc
-
-.PHONY: push
-push:
-	docker push $(IMAGE) | cat
-
-#############
-## Linting ##
-#############
-
-.PHONY: argo-workflow-lint
-argo-workflow-lint:
-	@argo lint ./chart/infra-server/static/workflow*.yaml
-
-.PHONY: shellcheck
-shellcheck:
-	@shellcheck -x -- **/*.{bats,sh}
-
-#############
-## Testing ##
-#############
-
-.PHONY: unit-test
-unit-test: proto-generated-srcs
-	@echo "+ $@"
-	@go test -v ./...
-
-.PHONY: bats-e2e-tests
-bats-e2e-tests:
-	@kubectl apply -f "workflows/*.yaml"
-	@bats --jobs 5 --no-parallelize-within-files --recursive .
-
-.PHONY: go-e2e-tests
-go-e2e-tests: proto-generated-srcs
-	@kubectl apply -f workflows/
-	@go test ./test/e2e/... -tags=e2e -v -parallel 5 -count 1 -cover -timeout 1h
-
-# Assuming a local dev infra server is running and accessible via a port-forward
-# i.e. nohup kubectl -n infra port-forward svc/infra-server-service 8443:8443 &
-.PHONY: pull-infractl-from-dev-server
-pull-infractl-from-dev-server:
-	@mkdir -p bin
-	@rm -f bin/infractl
-	set -o pipefail; \
-	curl --retry 3 --insecure --silent --show-error --fail --location https://localhost:8443/v1/cli/$(shell go env GOOS)/$(shell go env GOARCH)/upgrade \
-          | jq -r ".result.fileChunk" \
-          | base64 -d \
-          > bin/infractl
-	chmod +x bin/infractl
-	bin/infractl -k -e localhost:8443 version
-
 ##########
 ## Kube ##
 ##########
@@ -211,85 +204,212 @@ this_context = $(shell kubectl config current-context)
 ## Meta
 .PHONY: pre-check
 pre-check:
+ifndef DEPLOYMENT
+	$(error DEPLOYMENT is undefined)
+endif
 ifndef ENVIRONMENT
 	$(error ENVIRONMENT is undefined)
 endif
-	@if [[ "${ENVIRONMENT}" == "development" && "${this_context}" == "${prod_context}" ]]; then \
-		echo -e "Your kube context is not set to a development infra. Use the following for dev cluster or set it to your PR cluster\n\tkubectl config use-context ${dev_context}\n"; \
+	@if [[ "${DEPLOYMENT}" == "local" && ("${this_context}" == "${dev_context}" || "${this_context}" == "${prod_context}") ]]; then \
+		echo "Your kube context is not set to a local infra!"; \
 		exit 1; \
 	fi
-	@if [[ "${ENVIRONMENT}" == "production" && "${this_context}" != "${prod_context}" ]]; then \
+	@if [[ "${DEPLOYMENT}" == "development" && "${this_context}" != "${dev_context}" ]]; then \
+		echo -e "Your kube context is not set to development infra:\n\tkubectl config use-context ${dev_context}"; \
+		exit 1; \
+	fi
+	@if [[ "${DEPLOYMENT}" == "production" && "${this_context}" != "${prod_context}" ]]; then \
 		echo -e "Your kube context is not set to production infra:\n\tkubectl config use-context ${prod_context}"; \
 		exit 1; \
 	fi
 
-## Render template
-.PHONY: helm-template
-helm-template: pre-check
-	@./scripts/deploy/helm.sh template $(VERSION) $(ENVIRONMENT) $(SECRET_VERSION)
+.PHONY: setup-kc
+setup-kc: pre-check
+	$(info DEPLOYMENT: ${DEPLOYMENT}, ENVIRONMENT: ${ENVIRONMENT})
+ifeq ($(DEPLOYMENT), local)
+kc=kubectl
+else ifeq ($(DEPLOYMENT), development)
+kc=kubectl --context gke_stackrox-infra_us-west2_infra-development
+else ifeq ($(DEPLOYMENT), production)
+kc=kubectl --context gke_stackrox-infra_us-west2_infra-production
+endif
 
-## Deploy
-.PHONY: helm-deploy
-helm-deploy: pre-check
-	@./scripts/deploy/helm.sh deploy $(VERSION) $(ENVIRONMENT) $(SECRET_VERSION)
-	# Pick up any eventual changes to the workflow controller configmap
-	@make bounce-argo-pods
+## Configuration
+.PHONY: configuration-download
+configuration-download:
+	@echo "Downloading configuration from gs://infra-configuration"
+	gsutil -m cp -R "gs://infra-configuration/latest/configuration" "chart/infra-server/"
+
+.PHONY: configuration-upload
+configuration-upload: CONST_DATESTAMP := $(shell date '+%Y-%m-%d-%H-%M-%S')
+configuration-upload:
+	@echo "Uploading configuration to gs://infra-configuration/${CONST_DATESTAMP}"
+	gsutil -m cp -R chart/infra-server/configuration "gs://infra-configuration/${CONST_DATESTAMP}/"
+	@echo "Uploading configuration to gs://infra-configuration/latest/"
+	gsutil -m cp -R chart/infra-server/configuration "gs://infra-configuration/latest/"
+
+# Combines configuration/{development,production} files into single helm value.yaml files
+# (configuration/{development,production}-values-from-files.yaml) that can be used in template
+# rendering.
+.PHONY: create-consolidated-values
+create-consolidated-values:
+	@./scripts/create-consolidated-values.sh
+
+## Render
+.PHONY: clean-render
+clean-render:
+	@rm -rf chart-rendered
+
+.PHONY: render
+render: pre-check clean-render create-consolidated-values
+	@if [[ ! -e chart/infra-server/configuration ]]; then \
+		echo chart/infra-server/configuration is absent. Try:; \
+		echo make configuration-download; \
+		exit 1; \
+	fi
+	@mkdir -p chart-rendered
+	helm template chart/infra-server \
+	    --output-dir chart-rendered \
+		--set deployment="${DEPLOYMENT}" \
+		--set tag="$(VERSION)" \
+		--values chart/infra-server/configuration/${ENVIRONMENT}-values.yaml \
+		--values chart/infra-server/configuration/${ENVIRONMENT}-values-from-files.yaml
+
+.PHONY: render-local
+render-local:
+	DEPLOYMENT=local ENVIRONMENT=development make render
+
+.PHONY: render-development
+render-development:
+	DEPLOYMENT=development ENVIRONMENT=development make render
+
+.PHONY: render-production
+render-production:
+	DEPLOYMENT=production ENVIRONMENT=production make render
+
+## Common install targets
+bounce-infra-pods: setup-kc
+	$(kc) -n infra rollout restart deploy/infra-server-deployment
+	$(kc) -n infra rollout status deploy/infra-server-deployment --watch --timeout=3m
+
+install-common: setup-kc
+	@if ! $(kc) get ns argo 2> /dev/null; then \
+		$(kc) create namespace argo; \
+	fi
+	$(kc) apply -n argo -f https://github.com/argoproj/argo-workflows/releases/download/v3.3.9/install.yaml;
+	@if ! $(kc) get ns infra 2> /dev/null; then \
+		$(kc) apply -f chart/infra-server/templates/namespace.yaml; \
+	fi
+
+## Install (without write)
+install: setup-kc install-common
+	gsutil cat gs://infra-configuration/latest/configuration/$(ENVIRONMENT)-values.yaml \
+               gs://infra-configuration/latest/configuration/$(ENVIRONMENT)-values-from-files.yaml | \
+	helm template chart/infra-server \
+		--set deployment="$(DEPLOYMENT)" \
+		--set tag="$(VERSION)" \
+		--values - | \
+	$(kc) apply -R \
+	    -f -
+	@sleep 10
+	make bounce-infra-pods
+
+.PHONY: install-local
+install-local:
+	DEPLOYMENT=local ENVIRONMENT=development make install-common install
+
+.PHONY: install-development
+install-development:
+	DEPLOYMENT=development ENVIRONMENT=development make install-common install
+
+.PHONY: install-production
+install-production:
+	DEPLOYMENT=production ENVIRONMENT=production make install-common install
+
+## Install (with rendered)
+.PHONY: install-with-rendered
+install-with-rendered: setup-kc install-common
+	$(kc) apply -R \
+	    -f chart-rendered/infra-server
+
+.PHONY: install-local
+install-local-with-rendered:
+	DEPLOYMENT=local ENVIRONMENT=development make render install-with-rendered
+
+.PHONY: install-development
+install-development-with-rendered:
+	DEPLOYMENT=development ENVIRONMENT=development make render install-with-rendered
+
+.PHONY: install-production
+install-production-with-rendered:
+	DEPLOYMENT=production ENVIRONMENT=production make render install-with-rendered
 
 ## Diff
-.PHONY: helm-diff
-helm-diff: pre-check
-	@./scripts/deploy/helm.sh diff $(VERSION) $(ENVIRONMENT) $(SECRET_VERSION)
-
-## Bounce pods
-.PHONY: bounce-infra-pods
-bounce-infra-pods:
-	kubectl -n infra rollout restart deploy/infra-server-deployment
-	kubectl -n infra rollout status deploy/infra-server-deployment --watch --timeout=3m
-
-.PHONY: bounce-argo-pods
-bounce-argo-pods:
-	kubectl rollout restart deploy/argo-workflows-workflow-controller -n argo
-	kubectl rollout status deploy/argo-workflows-workflow-controller -n argo --watch --timeout=3m
-	kubectl rollout restart deploy/argo-workflows-server -n argo
-	kubectl rollout status deploy/argo-workflows-server -n argo --watch --timeout=3m
+.PHONY: diff
+diff: setup-kc
+	gsutil cat gs://infra-configuration/latest/configuration/$(ENVIRONMENT)-values.yaml \
+               gs://infra-configuration/latest/configuration/$(ENVIRONMENT)-values-from-files.yaml | \
+	helm template chart/infra-server \
+		--set deployment="$(DEPLOYMENT)" \
+		--set tag="$(VERSION)" \
+		--values - | \
+	$(kc) diff -R -f -
+
+.PHONY: diff-local
+diff-local:
+	DEPLOYMENT=local ENVIRONMENT=development make diff
+
+.PHONY: diff-development
+diff-development:
+	DEPLOYMENT=development ENVIRONMENT=development make diff
+
+.PHONY: diff-production
+diff-production:
+	DEPLOYMENT=production ENVIRONMENT=production make diff
+
+## Clean
+.PHONY: clean-infra
+clean-infra:
+	$(kc) delete namespace infra || true
+
+.PHONY: clean-argo
+clean-argo:
+	$(kc) delete namespace argo || true
+
+.PHONY: clean-local
+clean-local:
+	DEPLOYMENT=local ENVIRONMENT=development make setup-kc clean-infra clean-argo
+
+.PHONY: clean-development
+clean-development:
+	DEPLOYMENT=development ENVIRONMENT=development make setup-kc clean-infra
 
-#############
-## Secrets ##
-#############
-.PHONY: secrets-download
-secrets-download: pre-check
-	@./scripts/deploy/secrets.sh download_secrets $(ENVIRONMENT)
-
-.PHONY: secrets-upload
-secrets-upload: pre-check
-	@./scripts/deploy/secrets.sh upload_secrets $(ENVIRONMENT) $(SECRET_VERSION)
-
-.PHONY: secrets-show
-secrets-show: pre-check
-	@./scripts/deploy/secrets.sh show $(ENVIRONMENT) $(SECRET_VERSION)
-
-.PHONY: secrets-edit
-secrets-edit: pre-check
-	@./scripts/deploy/secrets.sh edit $(ENVIRONMENT) $(SECRET_VERSION)
-
-.PHONY: secrets-revert
-secrets-revert: pre-check
-	@./scripts/deploy/secrets.sh revert $(ENVIRONMENT) $(SECRET_VERSION)
-
-##################
-## Dependencies ##
-##################
-.PHONY: install-argo
-install-argo: pre-check
-	helm repo add argo https://argoproj.github.io/argo-helm
-	helm upgrade \
-		argo-workflows \
-		argo/argo-workflows \
-		--version 0.16.9 \
-		--install \
-		--create-namespace \
-		--namespace argo
-
-.PHONY: clean-argo-config
-clean-argo-config: pre-check
-	kubectl delete configmap argo-workflows-workflow-controller-configmap -n argo || true
+## Deploy
+.PHONY: deploy-local
+deploy-local: push install-local
+	@echo "All done!"
+
+.PHONY: deploy-development
+deploy-development: push install-development
+	@echo "All done!"
+
+.PHONY: deploy-production
+deploy-production: push install-production
+	@echo "All done!"
+
+##########
+## Misc ##
+##########
+.PHONY: gotags
+gotags:
+	@gotags -R . > tags
+	@echo "GoTags written to $(PWD)/tags"
+
+.PHONY: update-version
+update-version: image_regex   := gcr.io/stackrox-infra/automation-flavors/.*
+update-version: image_version := 0.2.16
+update-version:
+	@echo 'Updating automation-flavor image versions to "${image_version}"'
+	@perl -p -i -e 's#image: (${image_regex}):(.*)#image: \1:${image_version}#g' \
+		./chart/infra-server/static/*.yaml
+	@git diff --name-status ./chart/infra-server/static/*.yaml
diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml
index bcf8ee64d..ad25129c4 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.8.9-38-g69f01c4e95-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-39-g5195212af8-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.8.9-38-g69f01c4e95-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-39-g5195212af8-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 09d24bad2835d9d23e62e2c16233c1bac8bee4cc Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 29 Nov 2023 09:37:33 -0700
Subject: [PATCH 18/96] and again

---
 chart/infra-server/static/flavors.yaml                 | 1 -
 chart/infra-server/static/workflow-openshift-rosa.yaml | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml
index 92fd8dc86..51a678f54 100644
--- a/chart/infra-server/static/flavors.yaml
+++ b/chart/infra-server/static/flavors.yaml
@@ -780,7 +780,6 @@
       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: rosa-args
       description: additional rosa cli args
diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml
index ad25129c4..f8779d358 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.8.9-39-g5195212af8-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-40-gac04d8a631-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.8.9-39-g5195212af8-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-40-gac04d8a631-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 8b50fc3ec4c39c21d32bf6f3837b1d6b4c7c843f Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 29 Nov 2023 10:43:22 -0700
Subject: [PATCH 19/96] Revert "again"

This reverts commit 6c7f12cd24cf8693f290682aa856114ac7e222ec.
---
 Makefile | 444 ++++++++++++++++++++-----------------------------------
 1 file changed, 162 insertions(+), 282 deletions(-)

diff --git a/Makefile b/Makefile
index 3010b627a..5af2438b8 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,13 @@ else
 	VERSION := $(TAG)
 endif
 
+LOCAL_VALUES_FILE=chart/infra-server/configuration/infra-values-${ENVIRONMENT}.yaml
+LOCAL_COMBINED_VALUES_FILE=chart/infra-server/configuration/infra-values-from-files-${ENVIRONMENT}.yaml
+
+ifeq '$(SECRET_VERSION)' ''
+SECRET_VERSION := latest
+endif
+
 .PHONY: tag
 tag:
 	@echo $(VERSION)
@@ -23,92 +30,6 @@ IMAGE=us.gcr.io/stackrox-infra/infra-server:$(VERSION)
 image-name:
 	@echo $(IMAGE)
 
-#############
-## Linting ##
-#############
-
-.PHONY: argo-workflow-lint
-argo-workflow-lint:
-	@argo lint ./chart/infra-server/static/workflow*.yaml
-
-.PHONY: shellcheck
-shellcheck:
-	@shellcheck -x -- **/*.{bats,sh}
-
-###########
-## Build ##
-###########
-
-# server - Builds the infra-server binary
-# When run locally, a Darwin binary is built and installed into the user's GOPATH bin.
-# When run in CI, a Darwin and Linux binary is built.
-.PHONY: server
-server:
-	@echo "+ $@"
-	GOARCH=amd64 GOOS=linux ./scripts/go-build -o bin/infra-server-linux-amd64 ./cmd/infra-server
-
-# cli - Builds the infractl client binary
-# When run in CI or when preparing an image, a Darwin and Linux binary is built.
-.PHONY: cli
-cli:
-	@echo "+ $@"
-	GOARCH=amd64 GOOS=darwin ./scripts/go-build -o bin/infractl-darwin-amd64 ./cmd/infractl
-	GOARCH=arm64 GOOS=darwin ./scripts/go-build -o bin/infractl-darwin-arm64 ./cmd/infractl
-	GOARCH=amd64 GOOS=linux  ./scripts/go-build -o bin/infractl-linux-amd64  ./cmd/infractl
-
-# cli-local - Builds the infractl client binary
-# When run locally, a Darwin binary is built and installed into the user's GOPATH bin.
-.PHONY: cli-local
-cli-local:
-	@echo "+ $@"
-	./scripts/go-build -o $(GOPATH)/bin/infractl  ./cmd/infractl
-
-.PHONY: ui
-ui:
-	@echo "+ $@"
-	@make -C ui all
-
-.PHONY: image
-image:
-	docker build . -t $(IMAGE) -f image/Dockerfile --secret id=npmrc,src=${HOME}/.npmrc
-
-.PHONY: push
-push:
-	docker push $(IMAGE) | cat
-
-#############
-## Testing ##
-#############
-
-.PHONY: unit-test
-unit-test: proto-generated-srcs
-	@echo "+ $@"
-	@go test -v ./...
-
-.PHONY: go-e2e-tests
-go-e2e-tests: proto-generated-srcs
-	@kubectl apply -f workflows/
-	@go test ./test/e2e/... -tags=e2e -v -parallel 5 -count 1 -cover -timeout 1h
-
-# Assuming a local dev infra server is running and accessible via a port-forward
-# i.e. nohup kubectl -n infra port-forward svc/infra-server-service 8443:8443 &
-.PHONY: pull-infractl-from-dev-server
-pull-infractl-from-dev-server:
-	@mkdir -p bin
-	@rm -f bin/infractl
-	set -o pipefail; \
-	curl --retry 3 --insecure --silent --show-error --fail --location https://localhost:8443/v1/cli/linux/amd64/upgrade \
-          | jq -r ".result.fileChunk" \
-          | base64 -d \
-          > bin/infractl
-	chmod +x bin/infractl
-	bin/infractl -k -e localhost:8443 version
-
-.PHONY: e2e-tests
-e2e-tests:
-	@kubectl apply -f "workflows/*.yaml"
-	@bats --jobs 5 --no-parallelize-within-files --recursive .
-
 ##############
 ## Protobuf ##
 ##############
@@ -194,6 +115,92 @@ proto-generated-srcs: protoc-tools
 		--swagger_out=logtostderr=true:$(PROTO_OUTPUT_DIR) \
 		$(PROTO_FILES)
 
+###########
+## Build ##
+###########
+
+# server - Builds the infra-server binary
+# When run locally, a Darwin binary is built and installed into the user's GOPATH bin.
+# When run in CI, a Darwin and Linux binary is built.
+.PHONY: server
+server:
+	@echo "+ $@"
+	GOARCH=amd64 GOOS=linux ./scripts/go-build -o bin/infra-server-linux-amd64 ./cmd/infra-server
+
+# cli - Builds the infractl client binary
+# When run in CI or when preparing an image, a Darwin and Linux binary is built.
+.PHONY: cli
+cli:
+	@echo "+ $@"
+	GOARCH=amd64 GOOS=darwin ./scripts/go-build -o bin/infractl-darwin-amd64 ./cmd/infractl
+	GOARCH=arm64 GOOS=darwin ./scripts/go-build -o bin/infractl-darwin-arm64 ./cmd/infractl
+	GOARCH=amd64 GOOS=linux  ./scripts/go-build -o bin/infractl-linux-amd64  ./cmd/infractl
+
+# cli-local - Builds the infractl client binary
+# When run locally, a Darwin binary is built and installed into the user's GOPATH bin.
+.PHONY: cli-local
+cli-local:
+	@echo "+ $@"
+	./scripts/go-build -o $(GOPATH)/bin/infractl  ./cmd/infractl
+
+.PHONY: ui
+ui:
+	@echo "+ $@"
+	@make -C ui all
+
+.PHONY: image
+image:
+	docker build . -t $(IMAGE) -f image/Dockerfile --secret id=npmrc,src=${HOME}/.npmrc
+
+.PHONY: push
+push:
+	docker push $(IMAGE) | cat
+
+#############
+## Linting ##
+#############
+
+.PHONY: argo-workflow-lint
+argo-workflow-lint:
+	@argo lint ./chart/infra-server/static/workflow*.yaml
+
+.PHONY: shellcheck
+shellcheck:
+	@shellcheck -x -- **/*.{bats,sh}
+
+#############
+## Testing ##
+#############
+
+.PHONY: unit-test
+unit-test: proto-generated-srcs
+	@echo "+ $@"
+	@go test -v ./...
+
+.PHONY: bats-e2e-tests
+bats-e2e-tests:
+	@kubectl apply -f "workflows/*.yaml"
+	@bats --jobs 5 --no-parallelize-within-files --recursive .
+
+.PHONY: go-e2e-tests
+go-e2e-tests: proto-generated-srcs
+	@kubectl apply -f workflows/
+	@go test ./test/e2e/... -tags=e2e -v -parallel 5 -count 1 -cover -timeout 1h
+
+# Assuming a local dev infra server is running and accessible via a port-forward
+# i.e. nohup kubectl -n infra port-forward svc/infra-server-service 8443:8443 &
+.PHONY: pull-infractl-from-dev-server
+pull-infractl-from-dev-server:
+	@mkdir -p bin
+	@rm -f bin/infractl
+	set -o pipefail; \
+	curl --retry 3 --insecure --silent --show-error --fail --location https://localhost:8443/v1/cli/$(shell go env GOOS)/$(shell go env GOARCH)/upgrade \
+          | jq -r ".result.fileChunk" \
+          | base64 -d \
+          > bin/infractl
+	chmod +x bin/infractl
+	bin/infractl -k -e localhost:8443 version
+
 ##########
 ## Kube ##
 ##########
@@ -204,212 +211,85 @@ this_context = $(shell kubectl config current-context)
 ## Meta
 .PHONY: pre-check
 pre-check:
-ifndef DEPLOYMENT
-	$(error DEPLOYMENT is undefined)
-endif
 ifndef ENVIRONMENT
 	$(error ENVIRONMENT is undefined)
 endif
-	@if [[ "${DEPLOYMENT}" == "local" && ("${this_context}" == "${dev_context}" || "${this_context}" == "${prod_context}") ]]; then \
-		echo "Your kube context is not set to a local infra!"; \
+	@if [[ "${ENVIRONMENT}" == "development" && "${this_context}" == "${prod_context}" ]]; then \
+		echo -e "Your kube context is not set to a development infra. Use the following for dev cluster or set it to your PR cluster\n\tkubectl config use-context ${dev_context}\n"; \
 		exit 1; \
 	fi
-	@if [[ "${DEPLOYMENT}" == "development" && "${this_context}" != "${dev_context}" ]]; then \
-		echo -e "Your kube context is not set to development infra:\n\tkubectl config use-context ${dev_context}"; \
-		exit 1; \
-	fi
-	@if [[ "${DEPLOYMENT}" == "production" && "${this_context}" != "${prod_context}" ]]; then \
+	@if [[ "${ENVIRONMENT}" == "production" && "${this_context}" != "${prod_context}" ]]; then \
 		echo -e "Your kube context is not set to production infra:\n\tkubectl config use-context ${prod_context}"; \
 		exit 1; \
 	fi
 
-.PHONY: setup-kc
-setup-kc: pre-check
-	$(info DEPLOYMENT: ${DEPLOYMENT}, ENVIRONMENT: ${ENVIRONMENT})
-ifeq ($(DEPLOYMENT), local)
-kc=kubectl
-else ifeq ($(DEPLOYMENT), development)
-kc=kubectl --context gke_stackrox-infra_us-west2_infra-development
-else ifeq ($(DEPLOYMENT), production)
-kc=kubectl --context gke_stackrox-infra_us-west2_infra-production
-endif
-
-## Configuration
-.PHONY: configuration-download
-configuration-download:
-	@echo "Downloading configuration from gs://infra-configuration"
-	gsutil -m cp -R "gs://infra-configuration/latest/configuration" "chart/infra-server/"
-
-.PHONY: configuration-upload
-configuration-upload: CONST_DATESTAMP := $(shell date '+%Y-%m-%d-%H-%M-%S')
-configuration-upload:
-	@echo "Uploading configuration to gs://infra-configuration/${CONST_DATESTAMP}"
-	gsutil -m cp -R chart/infra-server/configuration "gs://infra-configuration/${CONST_DATESTAMP}/"
-	@echo "Uploading configuration to gs://infra-configuration/latest/"
-	gsutil -m cp -R chart/infra-server/configuration "gs://infra-configuration/latest/"
-
-# Combines configuration/{development,production} files into single helm value.yaml files
-# (configuration/{development,production}-values-from-files.yaml) that can be used in template
-# rendering.
-.PHONY: create-consolidated-values
-create-consolidated-values:
-	@./scripts/create-consolidated-values.sh
-
-## Render
-.PHONY: clean-render
-clean-render:
-	@rm -rf chart-rendered
-
-.PHONY: render
-render: pre-check clean-render create-consolidated-values
-	@if [[ ! -e chart/infra-server/configuration ]]; then \
-		echo chart/infra-server/configuration is absent. Try:; \
-		echo make configuration-download; \
-		exit 1; \
-	fi
-	@mkdir -p chart-rendered
-	helm template chart/infra-server \
-	    --output-dir chart-rendered \
-		--set deployment="${DEPLOYMENT}" \
-		--set tag="$(VERSION)" \
-		--values chart/infra-server/configuration/${ENVIRONMENT}-values.yaml \
-		--values chart/infra-server/configuration/${ENVIRONMENT}-values-from-files.yaml
-
-.PHONY: render-local
-render-local:
-	DEPLOYMENT=local ENVIRONMENT=development make render
-
-.PHONY: render-development
-render-development:
-	DEPLOYMENT=development ENVIRONMENT=development make render
-
-.PHONY: render-production
-render-production:
-	DEPLOYMENT=production ENVIRONMENT=production make render
-
-## Common install targets
-bounce-infra-pods: setup-kc
-	$(kc) -n infra rollout restart deploy/infra-server-deployment
-	$(kc) -n infra rollout status deploy/infra-server-deployment --watch --timeout=3m
-
-install-common: setup-kc
-	@if ! $(kc) get ns argo 2> /dev/null; then \
-		$(kc) create namespace argo; \
-	fi
-	$(kc) apply -n argo -f https://github.com/argoproj/argo-workflows/releases/download/v3.3.9/install.yaml;
-	@if ! $(kc) get ns infra 2> /dev/null; then \
-		$(kc) apply -f chart/infra-server/templates/namespace.yaml; \
-	fi
-
-## Install (without write)
-install: setup-kc install-common
-	gsutil cat gs://infra-configuration/latest/configuration/$(ENVIRONMENT)-values.yaml \
-               gs://infra-configuration/latest/configuration/$(ENVIRONMENT)-values-from-files.yaml | \
-	helm template chart/infra-server \
-		--set deployment="$(DEPLOYMENT)" \
-		--set tag="$(VERSION)" \
-		--values - | \
-	$(kc) apply -R \
-	    -f -
-	@sleep 10
-	make bounce-infra-pods
-
-.PHONY: install-local
-install-local:
-	DEPLOYMENT=local ENVIRONMENT=development make install-common install
-
-.PHONY: install-development
-install-development:
-	DEPLOYMENT=development ENVIRONMENT=development make install-common install
-
-.PHONY: install-production
-install-production:
-	DEPLOYMENT=production ENVIRONMENT=production make install-common install
-
-## Install (with rendered)
-.PHONY: install-with-rendered
-install-with-rendered: setup-kc install-common
-	$(kc) apply -R \
-	    -f chart-rendered/infra-server
-
-.PHONY: install-local
-install-local-with-rendered:
-	DEPLOYMENT=local ENVIRONMENT=development make render install-with-rendered
-
-.PHONY: install-development
-install-development-with-rendered:
-	DEPLOYMENT=development ENVIRONMENT=development make render install-with-rendered
-
-.PHONY: install-production
-install-production-with-rendered:
-	DEPLOYMENT=production ENVIRONMENT=production make render install-with-rendered
-
-## Diff
-.PHONY: diff
-diff: setup-kc
-	gsutil cat gs://infra-configuration/latest/configuration/$(ENVIRONMENT)-values.yaml \
-               gs://infra-configuration/latest/configuration/$(ENVIRONMENT)-values-from-files.yaml | \
-	helm template chart/infra-server \
-		--set deployment="$(DEPLOYMENT)" \
-		--set tag="$(VERSION)" \
-		--values - | \
-	$(kc) diff -R -f -
-
-.PHONY: diff-local
-diff-local:
-	DEPLOYMENT=local ENVIRONMENT=development make diff
-
-.PHONY: diff-development
-diff-development:
-	DEPLOYMENT=development ENVIRONMENT=development make diff
-
-.PHONY: diff-production
-diff-production:
-	DEPLOYMENT=production ENVIRONMENT=production make diff
-
-## Clean
-.PHONY: clean-infra
-clean-infra:
-	$(kc) delete namespace infra || true
-
-.PHONY: clean-argo
-clean-argo:
-	$(kc) delete namespace argo || true
-
-.PHONY: clean-local
-clean-local:
-	DEPLOYMENT=local ENVIRONMENT=development make setup-kc clean-infra clean-argo
-
-.PHONY: clean-development
-clean-development:
-	DEPLOYMENT=development ENVIRONMENT=development make setup-kc clean-infra
+## Render template
+.PHONY: helm-template
+helm-template: pre-check
+	@./scripts/deploy/helm.sh template $(VERSION) $(ENVIRONMENT) $(SECRET_VERSION)
 
 ## Deploy
-.PHONY: deploy-local
-deploy-local: push install-local
-	@echo "All done!"
-
-.PHONY: deploy-development
-deploy-development: push install-development
-	@echo "All done!"
+.PHONY: helm-deploy
+helm-deploy: pre-check
+	@./scripts/deploy/helm.sh deploy $(VERSION) $(ENVIRONMENT) $(SECRET_VERSION)
+	# Pick up any eventual changes to the workflow controller configmap
+	@make bounce-argo-pods
 
-.PHONY: deploy-production
-deploy-production: push install-production
-	@echo "All done!"
+## Diff
+.PHONY: helm-diff
+helm-diff: pre-check
+	@./scripts/deploy/helm.sh diff $(VERSION) $(ENVIRONMENT) $(SECRET_VERSION)
+
+## Bounce pods
+.PHONY: bounce-infra-pods
+bounce-infra-pods:
+	kubectl -n infra rollout restart deploy/infra-server-deployment
+	kubectl -n infra rollout status deploy/infra-server-deployment --watch --timeout=3m
+
+.PHONY: bounce-argo-pods
+bounce-argo-pods:
+	kubectl rollout restart deploy/argo-workflows-workflow-controller -n argo
+	kubectl rollout status deploy/argo-workflows-workflow-controller -n argo --watch --timeout=3m
+	kubectl rollout restart deploy/argo-workflows-server -n argo
+	kubectl rollout status deploy/argo-workflows-server -n argo --watch --timeout=3m
 
-##########
-## Misc ##
-##########
-.PHONY: gotags
-gotags:
-	@gotags -R . > tags
-	@echo "GoTags written to $(PWD)/tags"
-
-.PHONY: update-version
-update-version: image_regex   := gcr.io/stackrox-infra/automation-flavors/.*
-update-version: image_version := 0.2.16
-update-version:
-	@echo 'Updating automation-flavor image versions to "${image_version}"'
-	@perl -p -i -e 's#image: (${image_regex}):(.*)#image: \1:${image_version}#g' \
-		./chart/infra-server/static/*.yaml
-	@git diff --name-status ./chart/infra-server/static/*.yaml
+#############
+## Secrets ##
+#############
+.PHONY: secrets-download
+secrets-download: pre-check
+	@./scripts/deploy/secrets.sh download_secrets $(ENVIRONMENT)
+
+.PHONY: secrets-upload
+secrets-upload: pre-check
+	@./scripts/deploy/secrets.sh upload_secrets $(ENVIRONMENT) $(SECRET_VERSION)
+
+.PHONY: secrets-show
+secrets-show: pre-check
+	@./scripts/deploy/secrets.sh show $(ENVIRONMENT) $(SECRET_VERSION)
+
+.PHONY: secrets-edit
+secrets-edit: pre-check
+	@./scripts/deploy/secrets.sh edit $(ENVIRONMENT) $(SECRET_VERSION)
+
+.PHONY: secrets-revert
+secrets-revert: pre-check
+	@./scripts/deploy/secrets.sh revert $(ENVIRONMENT) $(SECRET_VERSION)
+
+##################
+## Dependencies ##
+##################
+.PHONY: install-argo
+install-argo: pre-check
+	helm repo add argo https://argoproj.github.io/argo-helm
+	helm upgrade \
+		argo-workflows \
+		argo/argo-workflows \
+		--version 0.16.9 \
+		--install \
+		--create-namespace \
+		--namespace argo
+
+.PHONY: clean-argo-config
+clean-argo-config: pre-check
+	kubectl delete configmap argo-workflows-workflow-controller-configmap -n argo || true

From 44c9ffe2416e026b52e18b876f0f025e87021afc Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 29 Nov 2023 12:50:14 -0700
Subject: [PATCH 20/96] bump

---
 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 f8779d358..2a24a10c6 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.8.9-40-gac04d8a631-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-43-ga096bd071e-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.8.9-40-gac04d8a631-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-43-ga096bd071e-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From efa886d25e410dc86be28c83780ebc3584e2859f Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 29 Nov 2023 13:49:18 -0700
Subject: [PATCH 21/96] bump

---
 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 2a24a10c6..6fb9d0a5f 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.8.9-43-ga096bd071e-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-44-ga9678bc650-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.8.9-43-ga096bd071e-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-44-ga9678bc650-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 00b80da84237534f27b13884b24109a645647834 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 29 Nov 2023 15:23:35 -0700
Subject: [PATCH 22/96] bump

---
 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 6fb9d0a5f..a28180f1c 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.8.9-44-ga9678bc650-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-45-g1823f7bc36-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.8.9-44-ga9678bc650-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-45-g1823f7bc36-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 7092d4def0c2e02517aa0b7b7cd87977fda99830 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 29 Nov 2023 15:52:47 -0700
Subject: [PATCH 23/96] bump

---
 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 a28180f1c..3cd863970 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.8.9-45-g1823f7bc36-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-46-g5ace6639cc-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.8.9-45-g1823f7bc36-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-46-g5ace6639cc-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 9afd15d94aee3c2cf0f4039a97b8ac39433e63a9 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 29 Nov 2023 16:12:58 -0700
Subject: [PATCH 24/96] bump

---
 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 3cd863970..6cfee95a6 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.8.9-46-g5ace6639cc-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-47-g7d278a8329-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.8.9-46-g5ace6639cc-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-47-g7d278a8329-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 8e0d615637318be073117d80704e3df1f1fa08c5 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 29 Nov 2023 20:05:14 -0700
Subject: [PATCH 25/96] bump

---
 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 6cfee95a6..f1dc5a95e 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.8.9-47-g7d278a8329-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-48-g9bca1e0207-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.8.9-47-g7d278a8329-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-48-g9bca1e0207-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 66ada70b0ea3a80025c5fbdc3ef58c07b39eeb8c Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Thu, 30 Nov 2023 10:09:32 -0700
Subject: [PATCH 26/96] bump

---
 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 f1dc5a95e..1630a593b 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.8.9-48-g9bca1e0207-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-49-g310c412e46-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.8.9-48-g9bca1e0207-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-49-g310c412e46-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 7f23a4c77a6c8f7be893b5a9ef7c1f7f77b36a8d Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Thu, 30 Nov 2023 13:23:37 -0700
Subject: [PATCH 27/96] bump

---
 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 1630a593b..791772b4d 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.8.9-49-g310c412e46-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-50-g1439750ca2-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.8.9-49-g310c412e46-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-50-g1439750ca2-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 01668c46b0c5c44763d3c84bae9c6c736e0a1655 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Thu, 30 Nov 2023 13:50:09 -0700
Subject: [PATCH 28/96] bump

---
 chart/infra-server/static/workflow-openshift-rosa.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml
index 791772b4d..280de0141 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.8.9-50-g1439750ca2-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-51-g7f23a4c77a-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -134,7 +134,8 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-50-g1439750ca2-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-51-g7f23a4c77a-snapshot
+
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 19cdf5a7be5e4ffaf29f4c1f12e3770e35d0e1d0 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Thu, 30 Nov 2023 15:06:07 -0700
Subject: [PATCH 29/96] bump

---
 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 280de0141..a299aea18 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.8.9-51-g7f23a4c77a-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-51-g23469b531c-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -135,7 +135,7 @@ spec:
       activeDeadlineSeconds: 3600
       container:
         image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-51-g7f23a4c77a-snapshot
-
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-51-g23469b531c-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 14037bb62dacae714201378616c084b30fa4ac54 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Thu, 30 Nov 2023 15:06:23 -0700
Subject: [PATCH 30/96] bump

---
 chart/infra-server/static/workflow-openshift-rosa.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml
index a299aea18..a2ecd97fa 100644
--- a/chart/infra-server/static/workflow-openshift-rosa.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa.yaml
@@ -134,7 +134,6 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-51-g7f23a4c77a-snapshot
         image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-51-g23469b531c-snapshot
         imagePullPolicy: Always
         command:

From 1aca2a4425ba3eb911b4c74e6f4915148af3d139 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Thu, 30 Nov 2023 15:59:35 -0700
Subject: [PATCH 31/96] bump

---
 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 a2ecd97fa..f584d5bd0 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.8.9-51-g23469b531c-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-52-gcfe9b1643c-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.8.9-51-g23469b531c-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-52-gcfe9b1643c-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From e8b8c9eeea875f57e0332020ae7ee256082c0a13 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 1 Dec 2023 10:00:47 -0700
Subject: [PATCH 32/96] bump

---
 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 f584d5bd0..7f9c182f2 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.8.9-52-gcfe9b1643c-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-53-g19b90208c2-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.8.9-52-gcfe9b1643c-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-53-g19b90208c2-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From c7c919217f34a21e4bb7be561098e38064347e23 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 1 Dec 2023 10:45:25 -0700
Subject: [PATCH 33/96] bump

---
 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 7f9c182f2..d9a520d5a 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.8.9-53-g19b90208c2-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-54-g40dc11d55a-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.8.9-53-g19b90208c2-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-54-g40dc11d55a-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From b7c55c8a6c4949992b41890311ac9ecd7e8942f3 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 1 Dec 2023 13:42:46 -0700
Subject: [PATCH 34/96] bump

---
 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 d9a520d5a..6b981e1be 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.8.9-54-g40dc11d55a-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-55-g9771d05941-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.8.9-54-g40dc11d55a-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-55-g9771d05941-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From e23c3f6097beb6b17df2e2612f3a74b46b50738a Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 5 Dec 2023 13:53:54 -0700
Subject: [PATCH 35/96] bump

---
 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 6b981e1be..50ab1da39 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.8.9-55-g9771d05941-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-56-g74f98b1e0c-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.8.9-55-g9771d05941-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-56-g74f98b1e0c-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 5280b5675c8fb0df0617724a07ff566425395767 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 5 Dec 2023 13:55:45 -0700
Subject: [PATCH 36/96] remove aws default region var

---
 chart/infra-server/static/workflow-openshift-rosa.yaml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml
index 50ab1da39..bef86d15f 100644
--- a/chart/infra-server/static/workflow-openshift-rosa.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa.yaml
@@ -16,7 +16,7 @@ spec:
       - name: nodes
         value: "4"
       - name: machine-type
-        value: "m5.xlarge"
+        value: "m5.2xlarge"
   volumeClaimTemplates:
     - metadata:
         name: data
@@ -72,8 +72,6 @@ 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
@@ -144,8 +142,6 @@ spec:
         env:
           - name: ROSA_ARGS
             value: "{{workflow.parameters.rosa-args}}"
-          - name: AWS_DEFAULT_REGION
-            value: "{{workflow.parameters.aws-region}}"
           - name: AWS_REGION
             value: "{{workflow.parameters.aws-region}}"
           - name: AWS_ACCESS_KEY_ID

From 9137830f6a346388eb2003ce89435335e24cf329 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 5 Dec 2023 15:33:54 -0700
Subject: [PATCH 37/96] bump

---
 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 bef86d15f..248724971 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.8.9-56-g74f98b1e0c-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-61-g44e5fdc39d-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-56-g74f98b1e0c-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-61-g44e5fdc39d-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 033eb262bbde2709df0a12a88fa06d6008242089 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 5 Dec 2023 16:33:19 -0700
Subject: [PATCH 38/96] bump

---
 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 248724971..c5851e49e 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.8.9-61-g44e5fdc39d-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.0-61-g44e5fdc39d-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.8.9-61-g44e5fdc39d-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.0-61-g44e5fdc39d-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 0b4fb757a178b9d292d4a3b84a5256e109077c73 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 6 Dec 2023 10:02:40 -0700
Subject: [PATCH 39/96] bump

---
 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 c5851e49e..6448129b4 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.9.0-61-g44e5fdc39d-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.0-62-g2828cdfe64-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.0-61-g44e5fdc39d-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.0-62-g2828cdfe64-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 6fae866681e5cdb6536c33e29f255f76be539fef Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 6 Dec 2023 13:31:48 -0700
Subject: [PATCH 40/96] bump

---
 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 6448129b4..71e0fec2c 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.9.0-62-g2828cdfe64-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.0-65-g3a6c1405ca-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.0-62-g2828cdfe64-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.0-65-g3a6c1405ca-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From d855755cec06ffb2764aabb9729bd16bceec805f Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 6 Dec 2023 13:39:29 -0700
Subject: [PATCH 41/96] bump

---
 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 71e0fec2c..534383969 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.9.0-65-g3a6c1405ca-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.0-66-g0b6191ccc1-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.0-65-g3a6c1405ca-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.0-66-g0b6191ccc1-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From fde6ca349b53abbaac828e7738778c27109637db Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 6 Dec 2023 15:11:09 -0700
Subject: [PATCH 42/96] bump

---
 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 534383969..39821188a 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.9.0-66-g0b6191ccc1-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.0-67-g2363158184-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.0-66-g0b6191ccc1-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.0-67-g2363158184-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 84ea8fb1d1abf16caf2e8743932550d3ffbeba84 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 6 Dec 2023 15:29:40 -0700
Subject: [PATCH 43/96] bump

---
 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 39821188a..519848a42 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.9.0-67-g2363158184-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-69-ga64715a750-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.0-67-g2363158184-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-69-ga64715a750-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From bbe98e8963c2a4f9a6207e0d6311b54604834bbd Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 6 Dec 2023 15:42:02 -0700
Subject: [PATCH 44/96] bump

---
 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 519848a42..3e37466dd 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.9.1-69-ga64715a750-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-70-g874011da17-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-69-ga64715a750-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-70-g874011da17-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 8180c1065eb1e95a7938e896d749966b790efb41 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 6 Dec 2023 16:04:57 -0700
Subject: [PATCH 45/96] bump

---
 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 3e37466dd..6bda3bf85 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.9.1-70-g874011da17-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-71-g874011da17-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-70-g874011da17-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-71-g874011da17-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 7aac8cc2e8f1e05c4bcbbea214a57f44d93b2c74 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Thu, 7 Dec 2023 20:44:52 -0700
Subject: [PATCH 46/96] bump

---
 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 6bda3bf85..9e93f94b9 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.9.1-71-g874011da17-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-82-g26686681c4-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-71-g874011da17-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-82-g26686681c4-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 13590f232a9c8d079308f9e1def7864750eafcc7 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 8 Dec 2023 09:02:05 -0700
Subject: [PATCH 47/96] bump

---
 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 9e93f94b9..355da04a9 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.9.1-82-g26686681c4-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-83-g6a37c16ae4-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-82-g26686681c4-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-83-g6a37c16ae4-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From a1bcba1aabf3b66fd1431d4c9440c8336704f74b Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 8 Dec 2023 09:58:36 -0700
Subject: [PATCH 48/96] bump

---
 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 355da04a9..c40ad028f 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.9.1-83-g6a37c16ae4-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-84-g27b3c14e05-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-83-g6a37c16ae4-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-84-g27b3c14e05-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From f04fcdf7ddf384191bba24c91ec472a19ec49720 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 8 Dec 2023 10:15:43 -0700
Subject: [PATCH 49/96] bump

---
 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 c40ad028f..e6652824a 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.9.1-84-g27b3c14e05-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-85-ga58e77f07e-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-84-g27b3c14e05-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-85-ga58e77f07e-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 215f1e522f04ca89c75b20d5843dda5a633ca5bd Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 8 Dec 2023 12:38:21 -0700
Subject: [PATCH 50/96] before role switch

---
 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 e6652824a..3af3cb9a4 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.9.1-85-ga58e77f07e-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.0-59-g4e5e49d3a6-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-85-ga58e77f07e-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.0-59-g4e5e49d3a6-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 0f00907737548144ff53601a129ce21b84b08568 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 8 Dec 2023 13:07:38 -0700
Subject: [PATCH 51/96] at dash

---
 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 3af3cb9a4..6448129b4 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.9.0-59-g4e5e49d3a6-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.0-62-g2828cdfe64-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.0-59-g4e5e49d3a6-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.0-62-g2828cdfe64-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 099516ef43f69a670a5597cd3b2c69b23cf3bb86 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 8 Dec 2023 14:14:53 -0700
Subject: [PATCH 52/96] latest

---
 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 6448129b4..e6652824a 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.9.0-62-g2828cdfe64-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-85-ga58e77f07e-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.0-62-g2828cdfe64-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-85-ga58e77f07e-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 5abf5b84c07a2039b3304321bd7a1c55983e2489 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Mon, 11 Dec 2023 09:31:37 -0700
Subject: [PATCH 53/96] bump

---
 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 e6652824a..d2a0966d6 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.9.1-85-ga58e77f07e-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-86-g6f5e39a6d2-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-85-ga58e77f07e-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-86-g6f5e39a6d2-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 32da955d2b45ca548bb823735e3f492d11b513eb Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Mon, 11 Dec 2023 13:22:52 -0700
Subject: [PATCH 54/96] check patch

---
 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 d2a0966d6..e709197f2 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.9.1-86-g6f5e39a6d2-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-87-g28991bb6d3-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-86-g6f5e39a6d2-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-87-g28991bb6d3-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 98a2738330a56d83f8ec883cf5365cd3f6e6ea07 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Mon, 11 Dec 2023 18:01:34 -0700
Subject: [PATCH 55/96] bump

---
 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 e709197f2..b236ba06d 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.9.1-87-g28991bb6d3-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-88-g84481469c8-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-87-g28991bb6d3-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-88-g84481469c8-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 6f78685ac5e55c3d78e9d616b16cd76f5931e0b2 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Mon, 11 Dec 2023 19:47:52 -0700
Subject: [PATCH 56/96] bump

---
 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 b236ba06d..0973626fe 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.9.1-88-g84481469c8-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-89-g3ff14180f4-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-88-g84481469c8-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-89-g3ff14180f4-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 57b39befefa8f7d5b486d4f147bb098da4b67745 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:20:24 -0700
Subject: [PATCH 57/96] bump

---
 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 0973626fe..a165d735b 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.9.1-89-g3ff14180f4-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-92-g76266c7477-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-89-g3ff14180f4-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-92-g76266c7477-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 944cf8caa9e23e0ca79974d68c89fb20d6a5d944 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 12 Dec 2023 07:47:21 -0700
Subject: [PATCH 58/96] 'bump

---
 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 a165d735b..46075af0a 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.9.1-92-g76266c7477-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-93-g00390ed5d0-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-92-g76266c7477-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-93-g00390ed5d0-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 2172f8dc8f6172667d524d90f3ffc8f55e84ff3e Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 12 Dec 2023 10:34:55 -0700
Subject: [PATCH 59/96] bump

---
 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 46075af0a..0de8e9ec3 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.9.1-93-g00390ed5d0-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-94-ga47338ab8e-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-93-g00390ed5d0-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-94-ga47338ab8e-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 1675132a031cd321bc4646759001eb7ced7e121e Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 12 Dec 2023 11:41:29 -0700
Subject: [PATCH 60/96] bump

---
 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 0de8e9ec3..a165d735b 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.9.1-94-ga47338ab8e-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-92-g76266c7477-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-94-ga47338ab8e-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-92-g76266c7477-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 73a234a3ea094d8a37a5a61933a62d9bacbd2a63 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 12 Dec 2023 11:48:18 -0700
Subject: [PATCH 61/96] bump

---
 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 a165d735b..0503c3d0c 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.9.1-92-g76266c7477-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-97-g5b01348c14-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-92-g76266c7477-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-97-g5b01348c14-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 8ae3b999c1bd7d508fcc5b2fa70551d8cb73f14c Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 12 Dec 2023 11:58:41 -0700
Subject: [PATCH 62/96] bump

---
 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 0503c3d0c..d47d3286d 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.9.1-97-g5b01348c14-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-98-g27edcc86a9-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-97-g5b01348c14-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-98-g27edcc86a9-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 9bd2f3eb72ff0eef34e055616202c9af74155499 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 12 Dec 2023 12:11:17 -0700
Subject: [PATCH 63/96] bump

---
 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 d47d3286d..2aece411f 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.9.1-98-g27edcc86a9-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-99-g8123cf811e-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-98-g27edcc86a9-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-99-g8123cf811e-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From b20bc61ed2e277ba4740832027a1decc067dda54 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 12 Dec 2023 13:00:10 -0700
Subject: [PATCH 64/96] bump

---
 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 2aece411f..d975bedef 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.9.1-99-g8123cf811e-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-100-g27773abcdb-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-99-g8123cf811e-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-100-g27773abcdb-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From c2ea257d77416687551bee7ff593dbf41088d0df Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 12 Dec 2023 17:42:29 -0700
Subject: [PATCH 65/96] bump

---
 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 d975bedef..b143c95ad 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.9.1-100-g27773abcdb-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.2-107-g42dacc9708-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.1-100-g27773abcdb-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.2-107-g42dacc9708-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 5536ff62d84dd63292872d9598b94eb382c7f80a Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 12 Dec 2023 22:17:08 -0700
Subject: [PATCH 66/96] add separate rosa-hcp flavor option

---
 chart/infra-server/static/flavors.yaml        |  58 ++++++
 .../static/workflow-openshift-rosa-hcp.yaml   | 169 ++++++++++++++++++
 .../static/workflow-openshift-rosa.yaml       |   4 +-
 3 files changed, 229 insertions(+), 2 deletions(-)
 create mode 100644 chart/infra-server/static/workflow-openshift-rosa-hcp.yaml

diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml
index 51a678f54..f8186eba0 100644
--- a/chart/infra-server/static/flavors.yaml
+++ b/chart/infra-server/static/flavors.yaml
@@ -811,6 +811,64 @@
     - name: cluster-console-password
       description: The password to login at the openshift console
 
+########################
+#  Openshift ROSA HCP  #
+########################
+- id: rosahcp
+  name: ROSA HCP
+  description: Openshift ROSA Hypershift (ManagedCP) cluster
+  availability: stable
+  workflow: configuration/workflow-openshift-rosa-hcp.yaml
+  parameters:
+    - name: name
+      description: cluster name
+      value: example1
+
+    - name: nodes
+      description: number of nodes
+      value: "2"
+      kind: optional
+
+    - name: aws-region
+      description: aws region for cluster
+      value: "us-east-1"
+      kind: optional
+
+    - name: managed-cp
+      description: Use managed control-plane?
+      value: "true"
+      kind: optional
+
+    - name: rosa-args
+      description: additional rosa cli args
+      value: ""
+      kind: optional
+
+    - name: machine-type
+      description: node machine type
+      value: m5.2xlarge
+      kind: optional
+
+  artifacts:
+    - name: kubeconfig
+      description: Kube config for connecting to this cluster
+
+    - name: dotenv
+      description: Environment variables used to access the cluster and consoles
+
+    - name: data
+      description: An archive that includes ssh keys to connect to cluster nodes
+
+    - name: cluster-console-url
+      description: The URL for the openshift console
+      tags: [url]
+
+    - name: cluster-console-username
+      description: The username to login at the openshift console
+
+    - name: cluster-console-password
+      description: The password to login at the openshift console
+
 #########################
 #  Openshift OSD on AWS #
 #########################
diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
new file mode 100644
index 000000000..d7d9b3612
--- /dev/null
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -0,0 +1,169 @@
+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: 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.2-107-g42dacc9708-snapshot
+        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: AWS_REGION
+            value: "{{workflow.parameters.aws-region}}"
+          - name: MANAGED_CP
+            value: "{{workflow.parameters.managed-cp}}"
+          - 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
+          echo "${CONSOLE_ENDPOINT}" > cluster-console-url
+          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.2-107-g42dacc9708-snapshot
+        imagePullPolicy: Always
+        command:
+          - ./entrypoint.sh
+        args:
+          - destroy
+          - "{{workflow.parameters.name}}"
+        env:
+          - name: ROSA_ARGS
+            value: "{{workflow.parameters.rosa-args}}"
+          - 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
diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml
index b143c95ad..21d0e70b3 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.9.2-107-g42dacc9708-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.2-15-g8116bf4d61-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -132,7 +132,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.2-107-g42dacc9708-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.2-15-g8116bf4d61-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From a9bc80eca1b55037ec2b8d695d306359ecab534f Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 12 Dec 2023 22:23:04 -0700
Subject: [PATCH 67/96] fix rosa_args loc

---
 chart/infra-server/static/workflow-openshift-rosa-hcp.yaml | 4 ++--
 chart/infra-server/static/workflow-openshift-rosa.yaml     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
index d7d9b3612..3e2b9c1b1 100644
--- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -72,6 +72,8 @@ spec:
               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
@@ -140,8 +142,6 @@ spec:
           - destroy
           - "{{workflow.parameters.name}}"
         env:
-          - name: ROSA_ARGS
-            value: "{{workflow.parameters.rosa-args}}"
           - name: AWS_REGION
             value: "{{workflow.parameters.aws-region}}"
           - name: AWS_ACCESS_KEY_ID
diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml
index 21d0e70b3..025fd82c0 100644
--- a/chart/infra-server/static/workflow-openshift-rosa.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa.yaml
@@ -72,6 +72,8 @@ spec:
               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
@@ -140,8 +142,6 @@ spec:
           - destroy
           - "{{workflow.parameters.name}}"
         env:
-          - name: ROSA_ARGS
-            value: "{{workflow.parameters.rosa-args}}"
           - name: AWS_REGION
             value: "{{workflow.parameters.aws-region}}"
           - name: AWS_ACCESS_KEY_ID

From 1cf62cd2ce998716f3e6d5673202adb0b313ca3f Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 13 Dec 2023 08:36:46 -0700
Subject: [PATCH 68/96] bump

---
 chart/infra-server/static/workflow-openshift-rosa-hcp.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
index 3e2b9c1b1..bdb6a543a 100644
--- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -10,13 +10,13 @@ spec:
       - name: rosa-args
         value: ""
       - name: aws-region
-        value: "us-east-1"
+        value: "us-east-2"
       - name: managed-cp
         value: true
       - name: nodes
         value: "2"
       - name: machine-type
-        value: "m5.2xlarge"
+        value: "m5.xlarge"
   volumeClaimTemplates:
     - metadata:
         name: data

From 8275be14e7e6021380d6d6c03b98e96b48fb2984 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 13 Dec 2023 09:39:06 -0700
Subject: [PATCH 69/96] push rosa-hcp into secrets

---
 chart/infra-server/templates/secrets.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/chart/infra-server/templates/secrets.yaml b/chart/infra-server/templates/secrets.yaml
index 6f3f74ad8..79993b62b 100644
--- a/chart/infra-server/templates/secrets.yaml
+++ b/chart/infra-server/templates/secrets.yaml
@@ -64,6 +64,9 @@ data:
   workflow-openshift-rosa.yaml: |-
     {{- .Files.Get "static/workflow-openshift-rosa.yaml" | b64enc | nindent 4 }}
 
+  workflow-openshift-rosa-hcp.yaml: |-
+    {{- .Files.Get "static/workflow-openshift-rosa-hcp.yaml" | b64enc | nindent 4 }}
+
   workflow-osd-aws.yaml: |-
     {{- .Files.Get "static/workflow-osd-aws.yaml" | b64enc | nindent 4 }}
 

From 5c6c2afb9d44796be46bc9e431d050e69574d01e Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 13 Dec 2023 13:22:28 -0700
Subject: [PATCH 70/96] bump

---
 chart/infra-server/static/workflow-openshift-rosa-hcp.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
index bdb6a543a..392c36545 100644
--- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -44,7 +44,7 @@ spec:
     - name: create
       activeDeadlineSeconds: 7200
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.2-107-g42dacc9708-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-108-g8c864da1b2-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.9.2-107-g42dacc9708-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-108-g8c864da1b2-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 25733541f0719d52357d5a189385cc9c727cf490 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 13 Dec 2023 13:23:28 -0700
Subject: [PATCH 71/96] bump

---
 chart/infra-server/static/workflow-openshift-rosa-hcp.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
index 392c36545..2b7b5a8a3 100644
--- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -44,7 +44,7 @@ spec:
     - name: create
       activeDeadlineSeconds: 7200
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-108-g8c864da1b2-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-109-g76ee6f5efc-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.9.3-108-g8c864da1b2-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-109-g76ee6f5efc-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From b6f2ef839a48430e3b8cca26c9810cf2381ecb37 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 13 Dec 2023 15:58:51 -0700
Subject: [PATCH 72/96] bump

---
 chart/infra-server/static/workflow-openshift-rosa-hcp.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
index 2b7b5a8a3..f156841c8 100644
--- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -44,7 +44,7 @@ spec:
     - name: create
       activeDeadlineSeconds: 7200
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-109-g76ee6f5efc-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-112-gca0be88e96-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.9.3-109-g76ee6f5efc-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-112-gca0be88e96-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 403ea5e3c39821af2b1ea8bf9b8fec178268257a Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Thu, 14 Dec 2023 09:24:28 -0700
Subject: [PATCH 73/96] bump

---
 chart/infra-server/static/workflow-openshift-rosa-hcp.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
index f156841c8..a79ccf36e 100644
--- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -44,7 +44,7 @@ spec:
     - name: create
       activeDeadlineSeconds: 7200
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-112-gca0be88e96-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-113-g9d9463c6b7-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.9.3-112-gca0be88e96-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-113-g9d9463c6b7-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From f81f4e920e34d05c2690ee9f866761329fcfeb38 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Thu, 14 Dec 2023 10:03:38 -0700
Subject: [PATCH 74/96] bump

---
 chart/infra-server/static/workflow-openshift-rosa-hcp.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
index a79ccf36e..ddfc34219 100644
--- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -44,7 +44,7 @@ spec:
     - name: create
       activeDeadlineSeconds: 7200
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-113-g9d9463c6b7-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-114-ge9ceae76e0-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.9.3-113-g9d9463c6b7-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-114-ge9ceae76e0-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 49e787ac3aba51030cfeb9c7cc67ca51d7e3869f Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Thu, 14 Dec 2023 14:58:50 -0700
Subject: [PATCH 75/96] bump

---
 chart/infra-server/static/workflow-openshift-rosa-hcp.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
index ddfc34219..4f382117d 100644
--- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -44,7 +44,7 @@ spec:
     - name: create
       activeDeadlineSeconds: 7200
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-114-ge9ceae76e0-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-115-ge9ceae76e0-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.9.3-114-ge9ceae76e0-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-115-ge9ceae76e0-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 2ad90195701069fdbb2c1e8fc4965f68ef4950ad Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Thu, 14 Dec 2023 22:30:40 -0700
Subject: [PATCH 76/96] bump

---
 chart/infra-server/static/workflow-openshift-rosa-hcp.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
index 4f382117d..0159fb2f9 100644
--- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -44,7 +44,7 @@ spec:
     - name: create
       activeDeadlineSeconds: 7200
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-115-ge9ceae76e0-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-117-gb9bab0a3e5-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.9.3-115-ge9ceae76e0-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-117-gb9bab0a3e5-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 97801c14e6dd733d339cddc1d5d4ea49b52d0aec Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Thu, 14 Dec 2023 22:58:35 -0700
Subject: [PATCH 77/96] bump

---
 chart/infra-server/static/workflow-openshift-rosa-hcp.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
index 0159fb2f9..be27e2bed 100644
--- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -44,7 +44,7 @@ spec:
     - name: create
       activeDeadlineSeconds: 7200
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-117-gb9bab0a3e5-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-118-g740c303c86-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.9.3-117-gb9bab0a3e5-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-118-g740c303c86-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 26949218de61346b8782778b133bb33f1dc701b1 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 15 Dec 2023 09:38:32 -0700
Subject: [PATCH 78/96] bump

---
 chart/infra-server/static/workflow-openshift-rosa-hcp.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
index be27e2bed..18b3026ba 100644
--- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -44,7 +44,7 @@ spec:
     - name: create
       activeDeadlineSeconds: 7200
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-118-g740c303c86-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-119-gb2439850df-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.9.3-118-g740c303c86-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-119-gb2439850df-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From c628ce2212c9cc8f8190294407d36d51ab769851 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 15 Dec 2023 12:12:39 -0700
Subject: [PATCH 79/96] bump

---
 chart/infra-server/static/workflow-openshift-rosa-hcp.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
index 18b3026ba..1dfcf2c53 100644
--- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -44,7 +44,7 @@ spec:
     - name: create
       activeDeadlineSeconds: 7200
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-119-gb2439850df-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-120-g7239d6d493-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.9.3-119-gb2439850df-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-120-g7239d6d493-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 250aa59dd7fb3d1515939af1802efcafde59b7a8 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 15 Dec 2023 12:31:00 -0700
Subject: [PATCH 80/96] bump

---
 chart/infra-server/static/workflow-openshift-rosa-hcp.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
index 1dfcf2c53..64b75a153 100644
--- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -44,7 +44,7 @@ spec:
     - name: create
       activeDeadlineSeconds: 7200
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-120-g7239d6d493-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-122-g7239d6d493-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.9.3-120-g7239d6d493-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-122-g7239d6d493-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 22c2cfa05cb514428f42852177d7c5fb3668ac30 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 15 Dec 2023 13:49:38 -0700
Subject: [PATCH 81/96] bump

---
 chart/infra-server/static/workflow-openshift-rosa-hcp.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
index 64b75a153..57ae61c43 100644
--- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -44,7 +44,7 @@ spec:
     - name: create
       activeDeadlineSeconds: 7200
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-122-g7239d6d493-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-125-g32e83ca968-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.9.3-122-g7239d6d493-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-125-g32e83ca968-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From a85d100100b913449bcef36199128a67ccb02a1e Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 15 Dec 2023 17:32:40 -0700
Subject: [PATCH 82/96] bump

---
 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 025fd82c0..24b252d7f 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.9.2-15-g8116bf4d61-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.4-2-gb88ba0a885-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.9.2-15-g8116bf4d61-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.4-2-gb88ba0a885-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From c871295a0fcd05c6d0e87b2403be3fb4dfb2a8cb Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 15 Dec 2023 17:39:54 -0700
Subject: [PATCH 83/96] add help to new rosa args

---
 chart/infra-server/static/flavors.yaml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml
index f8186eba0..184e4b5d6 100644
--- a/chart/infra-server/static/flavors.yaml
+++ b/chart/infra-server/static/flavors.yaml
@@ -780,11 +780,18 @@
       description: Use managed control-plane?
       value: "false"
       kind: optional
+      help: |
+        Run as ROSA HCP?
 
     - name: rosa-args
       description: additional rosa cli args
       value: ""
       kind: optional
+      help: |
+        Arguments such as,
+        --sts
+        --private-link
+        See `rosa create cluster --help`
 
     - name: machine-type
       description: node machine type
@@ -838,11 +845,18 @@
       description: Use managed control-plane?
       value: "true"
       kind: optional
+      help: |
+        Run as ROSA HCP?
 
     - name: rosa-args
       description: additional rosa cli args
-      value: ""
+      value: "--sts"
       kind: optional
+      help: |
+        Arguments such as,
+        --sts
+        --private-link
+        See `rosa create cluster --help`
 
     - name: machine-type
       description: node machine type

From 8a068842fba1a913caed10f4e9fe9859b5543d76 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 15 Dec 2023 17:50:04 -0700
Subject: [PATCH 84/96] add subnets arg for hcp

---
 chart/infra-server/static/flavors.yaml                   | 9 +++++++++
 .../infra-server/static/workflow-openshift-rosa-hcp.yaml | 8 ++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml
index 184e4b5d6..c5e867810 100644
--- a/chart/infra-server/static/flavors.yaml
+++ b/chart/infra-server/static/flavors.yaml
@@ -848,6 +848,15 @@
       help: |
         Run as ROSA HCP?
 
+    - name: subnet-ids
+      description: Subnets for the cluster.
+      value: "true"
+      kind: optional
+      help: |
+        Set like "public_subnet,private_subnet"
+        It will be placed in the command like `rosa create cluster --subnet-ids $SUBNET_IDS` 
+        Set empty for the installer to create a new empty vpc and subnets.
+
     - name: rosa-args
       description: additional rosa cli args
       value: "--sts"
diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
index 57ae61c43..6e2270c5f 100644
--- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -10,13 +10,15 @@ spec:
       - name: rosa-args
         value: ""
       - name: aws-region
-        value: "us-east-2"
+        value: "us-east-1"
       - name: managed-cp
         value: true
+      - name: SUBNET_IDS
+        value: ""
       - name: nodes
         value: "2"
       - name: machine-type
-        value: "m5.xlarge"
+        value: "m5.2xlarge"
   volumeClaimTemplates:
     - metadata:
         name: data
@@ -78,6 +80,8 @@ spec:
             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

From cb3df41c864e2471f64a71990263456a066f4f1f Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 15 Dec 2023 17:51:41 -0700
Subject: [PATCH 85/96] bump

---
 chart/infra-server/static/workflow-openshift-rosa-hcp.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
index 6e2270c5f..232d08b6c 100644
--- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -46,7 +46,7 @@ spec:
     - name: create
       activeDeadlineSeconds: 7200
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-125-g32e83ca968-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.4-2-gb88ba0a885-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -138,7 +138,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.3-125-g32e83ca968-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.4-2-gb88ba0a885-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 9539e0c47676a4b0bea6f9fa876e953d30b92298 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 15 Dec 2023 17:55:40 -0700
Subject: [PATCH 86/96] fix name case

---
 chart/infra-server/static/workflow-openshift-rosa-hcp.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
index 232d08b6c..9f03ca349 100644
--- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -13,7 +13,7 @@ spec:
         value: "us-east-1"
       - name: managed-cp
         value: true
-      - name: SUBNET_IDS
+      - name: subnet-ids
         value: ""
       - name: nodes
         value: "2"

From 20984335bff653fe95debfcff61e1245198fe163 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 19 Dec 2023 11:03:52 -0700
Subject: [PATCH 87/96] use tag, flavor merged

---
 chart/infra-server/static/workflow-openshift-rosa-hcp.yaml | 4 ++--
 chart/infra-server/static/workflow-openshift-rosa.yaml     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
index 9f03ca349..dd858e44e 100644
--- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -46,7 +46,7 @@ spec:
     - name: create
       activeDeadlineSeconds: 7200
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.4-2-gb88ba0a885-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.5
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -138,7 +138,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.4-2-gb88ba0a885-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.5
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml
index 24b252d7f..f961dbaf6 100644
--- a/chart/infra-server/static/workflow-openshift-rosa.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa.yaml
@@ -16,7 +16,7 @@ spec:
       - name: nodes
         value: "4"
       - name: machine-type
-        value: "m5.2xlarge"
+        value: "m5.xlarge"
   volumeClaimTemplates:
     - metadata:
         name: data
@@ -44,7 +44,7 @@ spec:
     - name: create
       activeDeadlineSeconds: 7200
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.4-2-gb88ba0a885-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.5
         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.9.4-2-gb88ba0a885-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.5
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From ebdc96128962aa2d51fc206c7cdbb517ab995fe4 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 19 Dec 2023 11:17:24 -0700
Subject: [PATCH 88/96] rename as hypershift

---
 chart/infra-server/static/flavors.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml
index c5e867810..74f74e5c8 100644
--- a/chart/infra-server/static/flavors.yaml
+++ b/chart/infra-server/static/flavors.yaml
@@ -822,8 +822,8 @@
 #  Openshift ROSA HCP  #
 ########################
 - id: rosahcp
-  name: ROSA HCP
-  description: Openshift ROSA Hypershift (ManagedCP) cluster
+  name: Hypershift on ROSA (HCP)
+  description: Openshift ROSA HCP (Hypershift ManagedCP) cluster
   availability: stable
   workflow: configuration/workflow-openshift-rosa-hcp.yaml
   parameters:

From 075ac884634552814f9ab88e6ca89ad582f80bf4 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 19 Dec 2023 11:18:33 -0700
Subject: [PATCH 89/96] fix default for subnets

---
 chart/infra-server/static/flavors.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml
index 74f74e5c8..639d1bcb9 100644
--- a/chart/infra-server/static/flavors.yaml
+++ b/chart/infra-server/static/flavors.yaml
@@ -850,7 +850,7 @@
 
     - name: subnet-ids
       description: Subnets for the cluster.
-      value: "true"
+      value: ""
       kind: optional
       help: |
         Set like "public_subnet,private_subnet"

From 58bb7edbf2ac503285fb870bf09cf58d62c1e0f3 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 19 Dec 2023 12:14:48 -0700
Subject: [PATCH 90/96] fix console url

---
 chart/infra-server/static/workflow-openshift-rosa-hcp.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
index dd858e44e..6fba01608 100644
--- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -99,7 +99,7 @@ spec:
         source: |
           cd /data
           . ./dotenv
-          echo "${CONSOLE_ENDPOINT}" > cluster-console-url
+          echo "https://console-openshift-console.apps.rosa${API_ENDPOINT//https:\/\/api}" > cluster-console-url
           echo "${CONSOLE_USER}" > cluster-console-username
           echo "${CONSOLE_PASSWORD}" > cluster-console-password
         volumeMounts:

From 56a2dfbdcdf4ee012583932b19a395bd2126405c Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 19 Dec 2023 12:16:10 -0700
Subject: [PATCH 91/96] allow fix from flavor

---
 chart/infra-server/static/workflow-openshift-rosa-hcp.yaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
index 6fba01608..4d24b7d92 100644
--- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -99,7 +99,11 @@ spec:
         source: |
           cd /data
           . ./dotenv
-          echo "https://console-openshift-console.apps.rosa${API_ENDPOINT//https:\/\/api}" > cluster-console-url
+          if [[ -z "${CONSOLE_ENDPOINT// /}" ]]; then
+            echo "https://console-openshift-console.apps.rosa${API_ENDPOINT//https:\/\/api}" > cluster-console-url
+          else
+            echo "${CONSOLE_ENDPOINT}" > cluster-console-url
+          fi
           echo "${CONSOLE_USER}" > cluster-console-username
           echo "${CONSOLE_PASSWORD}" > cluster-console-password
         volumeMounts:

From a7d04794f11a294ca5aaf7ef06da7a63c577cbff Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 19 Dec 2023 13:32:12 -0700
Subject: [PATCH 92/96] remove port

---
 chart/infra-server/static/workflow-openshift-rosa-hcp.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
index 4d24b7d92..b42757738 100644
--- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml
@@ -100,7 +100,9 @@ spec:
           cd /data
           . ./dotenv
           if [[ -z "${CONSOLE_ENDPOINT// /}" ]]; then
-            echo "https://console-openshift-console.apps.rosa${API_ENDPOINT//https:\/\/api}" > cluster-console-url
+            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

From 740aa58b34c0feda5c2eb742d2b500e3ad81d7a0 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 20 Dec 2023 11:37:59 -0700
Subject: [PATCH 93/96] markdown in rosa-args help

Co-authored-by: Gavin Jefferies <gjefferi@redhat.com>
---
 chart/infra-server/static/flavors.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml
index 639d1bcb9..b14f7122c 100644
--- a/chart/infra-server/static/flavors.yaml
+++ b/chart/infra-server/static/flavors.yaml
@@ -789,8 +789,8 @@
       kind: optional
       help: |
         Arguments such as,
-        --sts
-        --private-link
+        - `--sts`
+        - `--private-link`
         See `rosa create cluster --help`
 
     - name: machine-type

From a2c26261a911dab0e73adadfb01f4f45baff89da Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Thu, 21 Dec 2023 10:01:20 -0700
Subject: [PATCH 94/96] remove hcp option from rosa flavor form

---
 chart/infra-server/static/flavors.yaml        | 22 -------------------
 .../static/workflow-openshift-rosa.yaml       | 14 ------------
 2 files changed, 36 deletions(-)

diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml
index b14f7122c..196dc033f 100644
--- a/chart/infra-server/static/flavors.yaml
+++ b/chart/infra-server/static/flavors.yaml
@@ -771,28 +771,6 @@
       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"
-      kind: optional
-      help: |
-        Run as ROSA HCP?
-
-    - name: rosa-args
-      description: additional rosa cli args
-      value: ""
-      kind: optional
-      help: |
-        Arguments such as,
-        - `--sts`
-        - `--private-link`
-        See `rosa create cluster --help`
-
     - 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 f961dbaf6..161558297 100644
--- a/chart/infra-server/static/workflow-openshift-rosa.yaml
+++ b/chart/infra-server/static/workflow-openshift-rosa.yaml
@@ -7,12 +7,6 @@ spec:
   arguments:
     parameters:
       - name: name
-      - name: rosa-args
-        value: ""
-      - name: aws-region
-        value: "us-east-2"
-      - name: managed-cp
-        value: false
       - name: nodes
         value: "4"
       - name: machine-type
@@ -72,12 +66,6 @@ spec:
               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: NODE_COUNT
             value: "{{workflow.parameters.nodes}}"
           - name: INSTANCE_TYPE
@@ -142,8 +130,6 @@ spec:
           - destroy
           - "{{workflow.parameters.name}}"
         env:
-          - name: AWS_REGION
-            value: "{{workflow.parameters.aws-region}}"
           - name: AWS_ACCESS_KEY_ID
             valueFrom:
               secretKeyRef:

From d95bb3a47ec25c32c2680fc0737ef0421137cf3c Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Thu, 21 Dec 2023 10:04:27 -0700
Subject: [PATCH 95/96] markdown formatting

---
 chart/infra-server/static/flavors.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml
index 196dc033f..c8a168d26 100644
--- a/chart/infra-server/static/flavors.yaml
+++ b/chart/infra-server/static/flavors.yaml
@@ -841,8 +841,8 @@
       kind: optional
       help: |
         Arguments such as,
-        --sts
-        --private-link
+        - `--sts`
+        - `--private-link`
         See `rosa create cluster --help`
 
     - name: machine-type

From a20dcf86b27653fd5d205e19fd4ee8bfe728f313 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Thu, 21 Dec 2023 10:05:43 -0700
Subject: [PATCH 96/96] expand note about managed_cp arg

---
 chart/infra-server/static/flavors.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml
index c8a168d26..abad1a993 100644
--- a/chart/infra-server/static/flavors.yaml
+++ b/chart/infra-server/static/flavors.yaml
@@ -824,7 +824,8 @@
       value: "true"
       kind: optional
       help: |
-        Run as ROSA HCP?
+        Run as ROSA HCP? Setting this to `false` will create a 
+        ROSA Classic cluster instead of HCP/Hypershift.
 
     - name: subnet-ids
       description: Subnets for the cluster.