From 9fba9a5d5eeb07ac0e9da0c6237bfb8d4dc873cb Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 23 Jan 2024 17:37:33 -0700
Subject: [PATCH 01/13] roks start

---
 chart/infra-server/static/flavors.yaml        |  76 +++++++++
 .../static/workflow-openshift-ibmroks.yaml    | 150 ++++++++++++++++++
 chart/infra-server/templates/secrets.yaml     |   3 +
 3 files changed, 229 insertions(+)
 create mode 100644 chart/infra-server/static/workflow-openshift-ibmroks.yaml

diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml
index 60a563023..ff683af2f 100644
--- a/chart/infra-server/static/flavors.yaml
+++ b/chart/infra-server/static/flavors.yaml
@@ -1024,6 +1024,82 @@
     - name: cluster-console-password
       description: The password to login at the openshift console
 
+#########################
+#  Openshift IBM ROKS   #
+#########################
+- id: rosa
+  name: IBMROKS
+  description: IBM ROKS cluster
+  availability: stable
+  workflow: configuration/workflow-openshift-ibmroks.yaml
+  parameters:
+    - name: name
+      description: cluster name
+      value: example1
+      help: The name must start with a letter, can contain letters, 
+        numbers, periods (.), and hyphen (-), and must be 35 
+        characters or fewer. Use a name that is unique across 
+        regions. The cluster name and the region in which the 
+        cluster is deployed form the fully qualified domain name 
+        for the Ingress subdomain. To ensure that the Ingress 
+        subdomain is unique within a region, the cluster name 
+        might be truncated and appended with a random value within 
+        the Ingress domain name.
+        https://cloud.ibm.com/docs/openshift?topic=openshift-cluster-create-vpc-gen2&interface=cli
+
+    - name: nodes
+      description: number of nodes
+      value: "2"
+      kind: optional
+
+    - name: instance-type
+      description: node machine type
+      value: cx2.8x16
+      kind: optional
+
+    - name: zone
+      description: IBM Cloud zone to deploy into.
+      value: us-south-1
+      kind: optional
+
+    - name: vpc
+      description: VPC to deploy into.
+      value: acs
+      kind: optional
+      help: Empty for a new temporary vpc to be created.
+
+    - name: public-gateway
+      description: Public gateway for vpc external access.
+      value: acstest
+      kind: optional
+      help: Empty for a new temporary gateway to be created.
+
+    - name: subnet
+      description: Subnet within the vpc.
+      kind: optional
+      help: Empty for a new temporary subnet to be created.
+
+  artifacts:
+    - name: kubeconfig
+      description: Kube config for connecting to this cluster
+
+    - name: admin-key.pem
+      description: client key for kubeconfig connections
+
+    - name: admin.pem
+      description: client certificate for kubeconfig connections
+
+    - name: dotenv
+      description: Environment variables used to access the cluster and consoles
+
+    - name: data
+      description: An archive that includes kubeconfig and keys to connect to the cluster
+
+    - name: cluster-console-url
+      description: The URL for the openshift console
+      tags: [url]
+
+
 {{ if ne .Values.environment "production" -}}
 #################
 #  URL artifact #
diff --git a/chart/infra-server/static/workflow-openshift-ibmroks.yaml b/chart/infra-server/static/workflow-openshift-ibmroks.yaml
new file mode 100644
index 000000000..f2d9dbbd7
--- /dev/null
+++ b/chart/infra-server/static/workflow-openshift-ibmroks.yaml
@@ -0,0 +1,150 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Workflow
+metadata:
+  generateName: roks-
+spec:
+  entrypoint: start
+  arguments:
+    parameters:
+      - name: name
+      - name: nodes
+        value: ""
+      - name: instance-type
+        value: ""
+      - name: zone
+        value: ""
+      - name: vpc
+        value: ""
+      - name: public-gateway
+        value: ""
+      - name: subnet
+        value: ""
+      - name: openshift-version
+        value: ""
+  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-ibmroks-0.9.11-113-ga1fea9bfc8-snapshot
+        imagePullPolicy: Always
+        command:
+          - ./entrypoint.sh
+        args:
+          - create
+          - "{{workflow.parameters.name}}"
+        env:
+          - name: IBM_ROKS_API_KEY
+            valueFrom:
+              secretKeyRef:
+                name: osd-access-secrets
+                key: IBM_ROKS_API_KEY
+          - name: NODE_COUNT
+            value: "{{workflow.parameters.nodes}}"
+          - name: INSTANCE_TYPE
+            value: "{{workflow.parameters.instance-type}}"
+          - name: IBM_ZONE
+            value: "{{workflow.parameters.zone}}"
+          - name: OPENSHIFT_VERSION
+            value: "{{workflow.parameters.openshift-version}}"
+          - name: VPC_ID
+            value: "{{workflow.parameters.vpc}}"
+          - name: GATEWAY_ID
+            value: "{{workflow.parameters.public-gateway}}"
+          - name: SUBNET_ID
+            value: "{{workflow.parameters.subnet}}"
+          - 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
+          ls -la
+        volumeMounts:
+          - name: data
+            mountPath: /data
+      outputs:
+        artifacts:
+          - name: kubeconfig
+            path: /data/kubeconfig
+            archive:
+              none: {}
+          - name: admin-key.pem
+            path: /data/admin-key.pem
+            archive:
+              none: {}
+          - name: admin.pem
+            path: /data/admin.pem
+            archive:
+              none: {}
+          - name: data
+            path: /data/data.zip
+            archive:
+              none: {}
+          - name: cluster-console-url
+            path: /data/cluster-console-url
+            archive:
+              none: {}
+
+    - name: wait
+      suspend: {}
+
+    - name: destroy
+      activeDeadlineSeconds: 3600
+      container:
+        image: quay.io/stackrox-io/ci:automation-flavors-ibmroks-0.9.11-113-ga1fea9bfc8-snapshot
+        imagePullPolicy: Always
+        command:
+          - ./entrypoint.sh
+        args:
+          - destroy
+          - "{{workflow.parameters.name}}"
+        env:
+          - name: IBM_ROKS_API_KEY
+            valueFrom:
+              secretKeyRef:
+                name: osd-access-secrets
+                key: IBM_ROKS_API_KEY
+          - name: IBM_ZONE
+            value: "{{workflow.parameters.zone}}"
+          - name: VPC_ID
+            value: "{{workflow.parameters.vpc}}"
+          - name: GATEWAY_ID
+            value: "{{workflow.parameters.public-gateway}}"
+          - name: SUBNET_ID
+            value: "{{workflow.parameters.subnet}}"
+        volumeMounts:
+          - name: data
+            mountPath: /data
diff --git a/chart/infra-server/templates/secrets.yaml b/chart/infra-server/templates/secrets.yaml
index 79993b62b..9f7538e42 100644
--- a/chart/infra-server/templates/secrets.yaml
+++ b/chart/infra-server/templates/secrets.yaml
@@ -67,6 +67,9 @@ data:
   workflow-openshift-rosa-hcp.yaml: |-
     {{- .Files.Get "static/workflow-openshift-rosa-hcp.yaml" | b64enc | nindent 4 }}
 
+  workflow-openshift-ibmroks.yaml: |-
+    {{- .Files.Get "static/workflow-openshift-ibmroks.yaml" | b64enc | nindent 4 }}
+
   workflow-osd-aws.yaml: |-
     {{- .Files.Get "static/workflow-osd-aws.yaml" | b64enc | nindent 4 }}
 

From a601eb90a0c7d577825109bb38357bc77fe5e875 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Tue, 23 Jan 2024 17:52:18 -0700
Subject: [PATCH 02/13] fix ref name

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

diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml
index ff683af2f..fff9283e9 100644
--- a/chart/infra-server/static/flavors.yaml
+++ b/chart/infra-server/static/flavors.yaml
@@ -1027,7 +1027,7 @@
 #########################
 #  Openshift IBM ROKS   #
 #########################
-- id: rosa
+- id: ibmroks
   name: IBMROKS
   description: IBM ROKS cluster
   availability: stable
diff --git a/chart/infra-server/static/workflow-openshift-ibmroks.yaml b/chart/infra-server/static/workflow-openshift-ibmroks.yaml
index f2d9dbbd7..3e2fab4a3 100644
--- a/chart/infra-server/static/workflow-openshift-ibmroks.yaml
+++ b/chart/infra-server/static/workflow-openshift-ibmroks.yaml
@@ -48,7 +48,7 @@ spec:
     - name: create
       activeDeadlineSeconds: 7200
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-ibmroks-0.9.11-113-ga1fea9bfc8-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-ibmroks-0.9.11-116-gb2a6d7450e-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -124,7 +124,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-ibmroks-0.9.11-113-ga1fea9bfc8-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-ibmroks-0.9.11-116-gb2a6d7450e-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 23bdd51b6ae346e9178c1d48c408f8a0be2b1141 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 24 Jan 2024 10:15:24 -0700
Subject: [PATCH 03/13] add help to roks form

---
 chart/infra-server/static/flavors.yaml | 34 ++++++++++++++++++++------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml
index fff9283e9..e1ff3ba52 100644
--- a/chart/infra-server/static/flavors.yaml
+++ b/chart/infra-server/static/flavors.yaml
@@ -1028,8 +1028,8 @@
 #  Openshift IBM ROKS   #
 #########################
 - id: ibmroks
-  name: IBMROKS
-  description: IBM ROKS cluster
+  name: IBM ROKS
+  description: IBM ROKS cluster on VPC infrastructure.
   availability: stable
   workflow: configuration/workflow-openshift-ibmroks.yaml
   parameters:
@@ -1045,22 +1045,42 @@
         subdomain is unique within a region, the cluster name 
         might be truncated and appended with a random value within 
         the Ingress domain name.
-        https://cloud.ibm.com/docs/openshift?topic=openshift-cluster-create-vpc-gen2&interface=cli
+        <https://cloud.ibm.com/docs/openshift?topic=openshift-cluster-create-vpc-gen2&interface=cli>
 
     - name: nodes
-      description: number of nodes
-      value: "2"
+      description: number of nodes (ACS may not start if memory < 48gb total)
+      value: "3"
       kind: optional
+      help: <https://cloud.ibm.com/docs/openshift?topic=openshift-vpc-flavors>
+        Current ACS(<=4.3) fails to start on instances with fewer
+        than 8 cores individually or memory less than 48GB combined.
+        # ACS 4.2.2 started on instance types (node count in parens):
+        - cx2.8x16 (3,4)
+        - bx2.8x32 (2)
+        - mx2.8x64 (2)
+        - cx2.16x32 (2)
+        - bx2.16x64 (2,4)
 
     - name: instance-type
-      description: node machine type
+      description: node machine type (ACS may not start if cores < 8 each or memory < 48gb total)
       value: cx2.8x16
       kind: optional
+      help: <https://cloud.ibm.com/docs/openshift?topic=openshift-vpc-flavors>
+        Current ACS(<=4.3) fails to start on instances with fewer
+        than 8 cores individually or memory less than 48GB combined.
+        # ACS 4.2.2 started on instance types (node count in parens):
+        - cx2.8x16 (3,4)
+        - bx2.8x32 (2)
+        - mx2.8x64 (2)
+        - cx2.16x32 (2)
+        - bx2.16x64 (2,4)
 
     - name: zone
-      description: IBM Cloud zone to deploy into.
+      description: IBM Cloud zone to deploy into (Ex: eu-de-1, us-south-1, jp-tok-1).
       value: us-south-1
       kind: optional
+      help: Example VPC-gen2 regions: eu-de-1, us-south-1, jp-tok-1
+        <https://cloud.ibm.com/docs/openshift?topic=openshift-regions-and-zones#zones-vpc>
 
     - name: vpc
       description: VPC to deploy into.

From 346cdc4b5eaffd1c975fb9b8e7111cfc696751d0 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 26 Jan 2024 00:17:50 -0700
Subject: [PATCH 04/13] more help

---
 chart/infra-server/static/flavors.yaml        | 52 ++++++++++---------
 .../static/workflow-openshift-ibmroks.yaml    | 16 +++---
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml
index e1ff3ba52..cb6c91aef 100644
--- a/chart/infra-server/static/flavors.yaml
+++ b/chart/infra-server/static/flavors.yaml
@@ -1036,7 +1036,8 @@
     - name: name
       description: cluster name
       value: example1
-      help: The name must start with a letter, can contain letters, 
+      help: |
+        The name must start with a letter, can contain letters, 
         numbers, periods (.), and hyphen (-), and must be 35 
         characters or fewer. Use a name that is unique across 
         regions. The cluster name and the region in which the 
@@ -1051,62 +1052,65 @@
       description: number of nodes (ACS may not start if memory < 48gb total)
       value: "3"
       kind: optional
-      help: <https://cloud.ibm.com/docs/openshift?topic=openshift-vpc-flavors>
-        Current ACS(<=4.3) fails to start on instances with fewer
-        than 8 cores individually or memory less than 48GB combined.
-        # ACS 4.2.2 started on instance types (node count in parens):
-        - cx2.8x16 (3,4)
-        - bx2.8x32 (2)
-        - mx2.8x64 (2)
-        - cx2.16x32 (2)
-        - bx2.16x64 (2,4)
 
     - name: instance-type
       description: node machine type (ACS may not start if cores < 8 each or memory < 48gb total)
       value: cx2.8x16
       kind: optional
-      help: <https://cloud.ibm.com/docs/openshift?topic=openshift-vpc-flavors>
-        Current ACS(<=4.3) fails to start on instances with fewer
+      help: |
+        <https://cloud.ibm.com/docs/openshift?topic=openshift-vpc-flavors>
+        Current ACS(<=4.3) fails to start on ROKS instances with fewer
         than 8 cores individually or memory less than 48GB combined.
-        # ACS 4.2.2 started on instance types (node count in parens):
-        - cx2.8x16 (3,4)
-        - bx2.8x32 (2)
-        - mx2.8x64 (2)
-        - cx2.16x32 (2)
-        - bx2.16x64 (2,4)
+        ACS 4.2.2 successfully started on instance types below (minimum node count)
+        + cx2.8x16 (3)
+        + bx2.8x32 (2)
+        + mx2.8x64 (2)
+        + cx2.16x32 (2)
+        + bx2.16x64 (2)
 
     - name: zone
-      description: IBM Cloud zone to deploy into (Ex: eu-de-1, us-south-1, jp-tok-1).
+      description: IBM Cloud zone to deploy into (Example eu-de-1, us-south-1, jp-tok-1).
       value: us-south-1
       kind: optional
-      help: Example VPC-gen2 regions: eu-de-1, us-south-1, jp-tok-1
+      help: |
         <https://cloud.ibm.com/docs/openshift?topic=openshift-regions-and-zones#zones-vpc>
+        Example VPC-gen2 regions
+        + Berlin eu-de-1
+        + Dallas us-south-1
+        + Tokyo jp-tok-1
 
     - name: vpc
       description: VPC to deploy into.
-      value: acs
+      value: infra
       kind: optional
       help: Empty for a new temporary vpc to be created.
 
     - name: public-gateway
       description: Public gateway for vpc external access.
-      value: acstest
+      value: infra-gateway
       kind: optional
       help: Empty for a new temporary gateway to be created.
 
     - name: subnet
       description: Subnet within the vpc.
+      value: ""
       kind: optional
       help: Empty for a new temporary subnet to be created.
 
+    - name: openshift-version
+      description: ROKS Openshift version (Like "4.14" or empty for default stable)
+      value: ""
+      kind: optional
+      help: <https://cloud.ibm.com/docs/openshift?topic=openshift-openshift_versions>
+
   artifacts:
     - name: kubeconfig
       description: Kube config for connecting to this cluster
 
-    - name: admin-key.pem
+    - name: admin-key
       description: client key for kubeconfig connections
 
-    - name: admin.pem
+    - name: admin
       description: client certificate for kubeconfig connections
 
     - name: dotenv
diff --git a/chart/infra-server/static/workflow-openshift-ibmroks.yaml b/chart/infra-server/static/workflow-openshift-ibmroks.yaml
index 3e2fab4a3..67dd3dd55 100644
--- a/chart/infra-server/static/workflow-openshift-ibmroks.yaml
+++ b/chart/infra-server/static/workflow-openshift-ibmroks.yaml
@@ -48,7 +48,7 @@ spec:
     - name: create
       activeDeadlineSeconds: 7200
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-ibmroks-0.9.11-116-gb2a6d7450e-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-ibmroks-0.9.11-20-g20b667de08-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -59,7 +59,7 @@ spec:
           - name: IBM_ROKS_API_KEY
             valueFrom:
               secretKeyRef:
-                name: osd-access-secrets
+                name: ibm-cloud-secrets
                 key: IBM_ROKS_API_KEY
           - name: NODE_COUNT
             value: "{{workflow.parameters.nodes}}"
@@ -101,11 +101,15 @@ spec:
             path: /data/kubeconfig
             archive:
               none: {}
-          - name: admin-key.pem
+          - name: dotenv
+            path: /data/dotenv
+            archive:
+              none: {}
+          - name: admin-key
             path: /data/admin-key.pem
             archive:
               none: {}
-          - name: admin.pem
+          - name: admin
             path: /data/admin.pem
             archive:
               none: {}
@@ -124,7 +128,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-ibmroks-0.9.11-116-gb2a6d7450e-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-ibmroks-0.9.11-20-g20b667de08-snapshot
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -135,7 +139,7 @@ spec:
           - name: IBM_ROKS_API_KEY
             valueFrom:
               secretKeyRef:
-                name: osd-access-secrets
+                name: ibm-cloud-secrets
                 key: IBM_ROKS_API_KEY
           - name: IBM_ZONE
             value: "{{workflow.parameters.zone}}"

From 7f54d07a54abc4d7d8860ddfc04dbafb14458d10 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 26 Jan 2024 10:08:58 -0700
Subject: [PATCH 05/13] Apply suggestions from code review

Co-authored-by: Tom Martensen <tmartens@redhat.com>
---
 chart/infra-server/static/flavors.yaml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml
index cb6c91aef..007afabff 100644
--- a/chart/infra-server/static/flavors.yaml
+++ b/chart/infra-server/static/flavors.yaml
@@ -1049,17 +1049,19 @@
         <https://cloud.ibm.com/docs/openshift?topic=openshift-cluster-create-vpc-gen2&interface=cli>
 
     - name: nodes
-      description: number of nodes (ACS may not start if memory < 48gb total)
+      description: number of nodes 
+      help: ACS may not start if memory < 48gb total
       value: "3"
       kind: optional
 
     - name: instance-type
-      description: node machine type (ACS may not start if cores < 8 each or memory < 48gb total)
+      description: node machine type
+      help: ACS may not start if cores < 8 each or memory < 48gb total
       value: cx2.8x16
       kind: optional
       help: |
         <https://cloud.ibm.com/docs/openshift?topic=openshift-vpc-flavors>
-        Current ACS(<=4.3) fails to start on ROKS instances with fewer
+        ACS fails to start on ROKS instances with fewer
         than 8 cores individually or memory less than 48GB combined.
         ACS 4.2.2 successfully started on instance types below (minimum node count)
         + cx2.8x16 (3)
@@ -1069,7 +1071,7 @@
         + bx2.16x64 (2)
 
     - name: zone
-      description: IBM Cloud zone to deploy into (Example eu-de-1, us-south-1, jp-tok-1).
+      description: IBM Cloud zone to deploy into
       value: us-south-1
       kind: optional
       help: |
@@ -1098,10 +1100,10 @@
       help: Empty for a new temporary subnet to be created.
 
     - name: openshift-version
-      description: ROKS Openshift version (Like "4.14" or empty for default stable)
+      description: ROKS Openshift major.minor version
       value: ""
       kind: optional
-      help: <https://cloud.ibm.com/docs/openshift?topic=openshift-openshift_versions>
+      help: <https://cloud.ibm.com/docs/openshift?topic=openshift-openshift_versions> Keep empty for default stable version.
 
   artifacts:
     - name: kubeconfig

From 5f1383d13900c9f70f6a078b5d7bf5420b7419a5 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 26 Jan 2024 10:22:32 -0700
Subject: [PATCH 06/13] remove ls, un-usable console login

---
 chart/infra-server/static/workflow-openshift-ibmroks.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/chart/infra-server/static/workflow-openshift-ibmroks.yaml b/chart/infra-server/static/workflow-openshift-ibmroks.yaml
index 67dd3dd55..e2994e6f8 100644
--- a/chart/infra-server/static/workflow-openshift-ibmroks.yaml
+++ b/chart/infra-server/static/workflow-openshift-ibmroks.yaml
@@ -89,9 +89,6 @@ spec:
           cd /data
           . ./dotenv
           echo "${CONSOLE_ENDPOINT}" > cluster-console-url
-          echo "${CONSOLE_USER}" > cluster-console-username
-          echo "${CONSOLE_PASSWORD}" > cluster-console-password
-          ls -la
         volumeMounts:
           - name: data
             mountPath: /data

From b06b7fa27e8108151db0591cf236226250c83a79 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Fri, 26 Jan 2024 10:32:50 -0700
Subject: [PATCH 07/13] specify SCRATCH shared dir

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

diff --git a/chart/infra-server/static/workflow-openshift-ibmroks.yaml b/chart/infra-server/static/workflow-openshift-ibmroks.yaml
index e2994e6f8..4b4ce1b20 100644
--- a/chart/infra-server/static/workflow-openshift-ibmroks.yaml
+++ b/chart/infra-server/static/workflow-openshift-ibmroks.yaml
@@ -77,6 +77,8 @@ spec:
             value: "{{workflow.parameters.subnet}}"
           - name: CREATION_SOURCE
             value: "infra"
+          - name: SCRATCH
+            value: "/data"
         volumeMounts:
           - name: data
             mountPath: /data
@@ -146,6 +148,8 @@ spec:
             value: "{{workflow.parameters.public-gateway}}"
           - name: SUBNET_ID
             value: "{{workflow.parameters.subnet}}"
+          - name: SCRATCH
+            value: "/data"
         volumeMounts:
           - name: data
             mountPath: /data

From 449d3a21b5b06b980d9572f0418cfe7370c5671c Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Wed, 31 Jan 2024 00:15:27 -0700
Subject: [PATCH 08/13] add secret lookup template

---
 chart/infra-server/templates/ibm/secrets.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 chart/infra-server/templates/ibm/secrets.yaml

diff --git a/chart/infra-server/templates/ibm/secrets.yaml b/chart/infra-server/templates/ibm/secrets.yaml
new file mode 100644
index 000000000..8c757cc37
--- /dev/null
+++ b/chart/infra-server/templates/ibm/secrets.yaml
@@ -0,0 +1,10 @@
+---
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: ibm-cloud-secrets
+  namespace: default
+data:
+  IBM_ROKS_API_KEY: |-
+    {{ .Values.ibmCloudSecrets.ibmRoksApiKey | b64enc }}

From 7bcb197a83cabbf9295ab8893c109dac13191600 Mon Sep 17 00:00:00 2001
From: Tom Martensen <tmartens@redhat.com>
Date: Thu, 1 Feb 2024 09:37:21 +0100
Subject: [PATCH 09/13] update the ibmroks image tag after automation-flavors
 release

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

diff --git a/chart/infra-server/static/workflow-openshift-ibmroks.yaml b/chart/infra-server/static/workflow-openshift-ibmroks.yaml
index 4b4ce1b20..e4905409c 100644
--- a/chart/infra-server/static/workflow-openshift-ibmroks.yaml
+++ b/chart/infra-server/static/workflow-openshift-ibmroks.yaml
@@ -48,7 +48,7 @@ spec:
     - name: create
       activeDeadlineSeconds: 7200
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-ibmroks-0.9.11-20-g20b667de08-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-ibmroks-0.9.14
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh
@@ -127,7 +127,7 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-ibmroks-0.9.11-20-g20b667de08-snapshot
+        image: quay.io/stackrox-io/ci:automation-flavors-ibmroks-0.9.14
         imagePullPolicy: Always
         command:
           - ./entrypoint.sh

From 28070f9202740afb9c05437e51cc40e5cbe64140 Mon Sep 17 00:00:00 2001
From: Tom Martensen <tmartens@redhat.com>
Date: Thu, 1 Feb 2024 10:36:14 +0100
Subject: [PATCH 10/13] clean up

---
 chart/infra-server/static/flavors.yaml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml
index 007afabff..5b4c865f2 100644
--- a/chart/infra-server/static/flavors.yaml
+++ b/chart/infra-server/static/flavors.yaml
@@ -1037,26 +1037,25 @@
       description: cluster name
       value: example1
       help: |
-        The name must start with a letter, can contain letters, 
-        numbers, periods (.), and hyphen (-), and must be 35 
-        characters or fewer. Use a name that is unique across 
-        regions. The cluster name and the region in which the 
-        cluster is deployed form the fully qualified domain name 
-        for the Ingress subdomain. To ensure that the Ingress 
-        subdomain is unique within a region, the cluster name 
-        might be truncated and appended with a random value within 
+        The name must start with a letter, can contain letters,
+        numbers, periods (.), and hyphen (-), and must be 35
+        characters or fewer. Use a name that is unique across
+        regions. The cluster name and the region in which the
+        cluster is deployed form the fully qualified domain name
+        for the Ingress subdomain. To ensure that the Ingress
+        subdomain is unique within a region, the cluster name
+        might be truncated and appended with a random value within
         the Ingress domain name.
         <https://cloud.ibm.com/docs/openshift?topic=openshift-cluster-create-vpc-gen2&interface=cli>
 
     - name: nodes
-      description: number of nodes 
+      description: number of nodes
       help: ACS may not start if memory < 48gb total
       value: "3"
       kind: optional
 
     - name: instance-type
       description: node machine type
-      help: ACS may not start if cores < 8 each or memory < 48gb total
       value: cx2.8x16
       kind: optional
       help: |

From b366eb53a6e4c8b94d2c123089b7c4fb357aff64 Mon Sep 17 00:00:00 2001
From: Tom Martensen <tmartens@redhat.com>
Date: Thu, 1 Feb 2024 10:39:22 +0100
Subject: [PATCH 11/13] simplify artifact gathering

---
 .../static/workflow-openshift-ibmroks.yaml         | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/chart/infra-server/static/workflow-openshift-ibmroks.yaml b/chart/infra-server/static/workflow-openshift-ibmroks.yaml
index e4905409c..f2c132b3c 100644
--- a/chart/infra-server/static/workflow-openshift-ibmroks.yaml
+++ b/chart/infra-server/static/workflow-openshift-ibmroks.yaml
@@ -82,18 +82,6 @@ spec:
         volumeMounts:
           - name: data
             mountPath: /data
-
-    - name: gather
-      script:
-        image: busybox
-        command: [sh]
-        source: |
-          cd /data
-          . ./dotenv
-          echo "${CONSOLE_ENDPOINT}" > cluster-console-url
-        volumeMounts:
-          - name: data
-            mountPath: /data
       outputs:
         artifacts:
           - name: kubeconfig
@@ -117,7 +105,7 @@ spec:
             archive:
               none: {}
           - name: cluster-console-url
-            path: /data/cluster-console-url
+            path: /data/url
             archive:
               none: {}
 

From 6e7072b3f95557635872d491ad9475dead28921d Mon Sep 17 00:00:00 2001
From: Tom Martensen <tmartens@redhat.com>
Date: Thu, 1 Feb 2024 11:01:03 +0100
Subject: [PATCH 12/13] fix workflow template

---
 chart/infra-server/static/workflow-openshift-ibmroks.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/chart/infra-server/static/workflow-openshift-ibmroks.yaml b/chart/infra-server/static/workflow-openshift-ibmroks.yaml
index f2c132b3c..94f058abc 100644
--- a/chart/infra-server/static/workflow-openshift-ibmroks.yaml
+++ b/chart/infra-server/static/workflow-openshift-ibmroks.yaml
@@ -36,9 +36,6 @@ spec:
         - - name: create
             template: create
 
-        - - name: gather
-            template: gather
-
         - - name: wait
             template: wait
 

From 59a72f71842564e5db5b4f39a04b7b33235c3892 Mon Sep 17 00:00:00 2001
From: Tom Martensen <tmartens@redhat.com>
Date: Thu, 1 Feb 2024 11:50:59 +0100
Subject: [PATCH 13/13] update CHANGELOG

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9dc21403..2d24b0a13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ Please avoid adding duplicate information across this changelog and JIRA/doc inp
 
 ## [NEXT RELEASE]
 
+## [0.8.12]
+
+- Add IBM ROKS flavor. Note that there are two known issues (ROX-22142, ROX-22143).
+
 ## [0.8.11]
 
 - Bump default demo versions to 4.3.4.