ROX-22818: Move automation-flavor image version to a Chart annotation (…

…#1203)
stackrox · Mar 7, 2024 · d0d69e0 · d0d69e0
1 parent 3f27514
commit d0d69e0
Show file tree

Hide file tree

Showing 19 changed files with 207 additions and 208 deletions.
diff --git a/chart/infra-server/Chart.yaml b/chart/infra-server/Chart.yaml
@@ -8,4 +8,5 @@ sources:
   - https://github.com/stackrox/infra
 annotations:
   acsDemoVersion: 4.3.4
+  automationFlavorsVersion: 0.10.4
   ocpCredentialsMode: Passthrough
diff --git a/chart/infra-server/static/test-connect-artifact.yaml b/chart/infra-server/static/test-connect-artifact.yaml
@@ -36,7 +36,7 @@ spec:
               break
             fi
           done
-          echo {{ workflow.name }} {{ workflow.uid }} > /tmp/connect
+          echo {{ "{{" }} workflow.name {{ "}}" }} {{ "{{" }} workflow.uid {{ "}}" }} > /tmp/connect
 
     - name: wait
       suspend: {}
@@ -53,4 +53,3 @@ spec:
               break
             fi
           done
-
diff --git a/chart/infra-server/static/test-url-artifact.yaml b/chart/infra-server/static/test-url-artifact.yaml
@@ -36,7 +36,7 @@ spec:
               break
             fi
           done
-          echo {{ workflow.name }} {{ workflow.uid }} > /tmp/url
+          echo {{ "{{" }} workflow.name {{ "}}" }} {{ "{{" }} workflow.uid {{ "}}" }} > /tmp/url
 
     - name: wait
       suspend: {}
@@ -53,4 +53,3 @@ spec:
               break
             fi
           done
-
diff --git a/chart/infra-server/static/workflow-aks.yaml b/chart/infra-server/static/workflow-aks.yaml
@@ -48,13 +48,13 @@ spec:
             archive:
               tar: {}
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-aks-0.10.1
+        image: quay.io/stackrox-io/ci:automation-flavors-aks-{{ .Chart.Annotations.automationFlavorsVersion }}
         imagePullPolicy: Always
         command:
           - entrypoint
         args:
           - create
-          - "{{workflow.parameters.name}}"
+          - '{{ "{{" }}workflow.parameters.name{{ "}}" }}'
           - srox-temp-dev-test
         env:
           - name: AZURE_SP_USERNAME
@@ -73,15 +73,15 @@ spec:
                 name: azure-secrets
                 key: AZURE_SP_TENANT
           - name: NODE_COUNT
-            value: "{{workflow.parameters.nodes}}"
+            value: '{{ "{{" }}workflow.parameters.nodes{{ "}}" }}'
           - name: INSTANCE_TYPE
-            value: "{{workflow.parameters.machine-type}}"
+            value: '{{ "{{" }}workflow.parameters.machine-type{{ "}}" }}'
           - name: K8S_VERSION
-            value: "{{workflow.parameters.k8s-version}}"
+            value: '{{ "{{" }}workflow.parameters.k8s-version{{ "}}" }}'
           - name: NETWORK_PLUGIN
-            value: "{{workflow.parameters.network-plugin}}"
+            value: '{{ "{{" }}workflow.parameters.network-plugin{{ "}}" }}'
           - name: NETWORK_POLICY
-            value: "{{workflow.parameters.network-policy}}"
+            value: '{{ "{{" }}workflow.parameters.network-policy{{ "}}" }}'
           - name: CREATION_SOURCE
             value: "infra"
         volumeMounts:
@@ -96,13 +96,13 @@ spec:
 
     - name: destroy
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-aks-0.10.1
+        image: quay.io/stackrox-io/ci:automation-flavors-aks-{{ .Chart.Annotations.automationFlavorsVersion }}
         imagePullPolicy: Always
         command:
           - entrypoint
         args:
           - destroy
-          - "{{workflow.parameters.name}}"
+          - '{{ "{{" }}workflow.parameters.name{{ "}}" }}'
           - srox-temp-dev-test
         env:
           - name: AZURE_SP_USERNAME

diff --git a/chart/infra-server/static/workflow-demo.yaml b/chart/infra-server/static/workflow-demo.yaml
@@ -37,7 +37,7 @@ spec:
             arguments:
               artifacts:
                 - name: roxctl
-                  from: "{{steps.roxctl.outputs.artifacts.roxctl}}"
+                  from: '{{ "{{" }}steps.roxctl.outputs.artifacts.roxctl{{ "}}" }}'
 
         - - name: wait
             template: wait
@@ -49,9 +49,9 @@ spec:
             arguments:
               artifacts:
                 - name: tfstate
-                  from: "{{workflow.outputs.artifacts.global-tfstate}}"
+                  from: '{{ "{{" }}workflow.outputs.artifacts.global-tfstate{{ "}}" }}'
                 - name: tfvars
-                  from: "{{workflow.outputs.artifacts.global-tfvars}}"
+                  from: '{{ "{{" }}workflow.outputs.artifacts.global-tfvars{{ "}}" }}'
 
     - name: roxctl
       activeDeadlineSeconds: 120
@@ -60,7 +60,7 @@ spec:
           - name: roxctl
             path: /tmp/roxctl
       container:
-        image: "{{workflow.parameters.main-image}}"
+        image: '{{ "{{" }}workflow.parameters.main-image{{ "}}" }}'
         imagePullPolicy: Always
         command:
           - cp
@@ -120,22 +120,22 @@ spec:
               none: {}
 
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-demo-0.9.13
+        image: quay.io/stackrox-io/ci:automation-flavors-demo-{{ .Chart.Annotations.automationFlavorsVersion }}
         imagePullPolicy: Always
         command:
           - /usr/bin/entrypoint
         args:
           - create
-          - "--name={{workflow.parameters.name}}"
-          - "--main-image={{workflow.parameters.main-image}}"
-          - "--central-db-image={{workflow.parameters.central-db-image}}"
+          - --name={{ "{{" }}workflow.parameters.name{{ "}}" }}
+          - --main-image={{ "{{" }}workflow.parameters.main-image{{ "}}" }}
+          - --central-db-image={{ "{{" }}workflow.parameters.central-db-image{{ "}}" }}
           - --gcp-project=acs-team-temp-dev
           - --dns-gcp-project=acs-team-temp-dev
           - --creation-source=infra
-          - --k8s-version={{workflow.parameters.k8s-version}}
-          - --enable-psps={{workflow.parameters.enable-psps}}
-          - --gcp-region={{workflow.parameters.gcp-region}}
-          - --gcp-zone={{workflow.parameters.gcp-zone}}
+          - --k8s-version={{ "{{" }}workflow.parameters.k8s-version{{ "}}" }}
+          - --enable-psps={{ "{{" }}workflow.parameters.enable-psps{{ "}}" }}
+          - --gcp-region={{ "{{" }}workflow.parameters.gcp-region{{ "}}" }}
+          - --gcp-zone={{ "{{" }}workflow.parameters.gcp-zone{{ "}}" }}
         volumeMounts:
           - name: credentials
             mountPath: /tmp/google-credentials.json
@@ -188,7 +188,7 @@ spec:
             path: /data/tfvars
             optional: true
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-demo-0.9.13
+        image: quay.io/stackrox-io/ci:automation-flavors-demo-{{ .Chart.Annotations.automationFlavorsVersion }}
         imagePullPolicy: Always
         command:
           - /usr/bin/entrypoint

diff --git a/chart/infra-server/static/workflow-eks.yaml b/chart/infra-server/static/workflow-eks.yaml
@@ -43,13 +43,13 @@ spec:
             archive:
               tar: {}
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-eks-0.6.9
+        image: quay.io/stackrox-io/ci:automation-flavors-eks-{{ .Chart.Annotations.automationFlavorsVersion }}
         imagePullPolicy: Always
         command:
           - entrypoint
         args:
           - create
-          - "{{workflow.parameters.name}}"
+          - '{{ "{{" }}workflow.parameters.name{{ "}}" }}'
         env:
           - name: AWS_ACCESS_KEY_ID
             valueFrom:
@@ -62,17 +62,17 @@ spec:
                 name: aws-access-secrets
                 key: AWS_SECRET_ACCESS_KEY
           - name: NODE_COUNT
-            value: "{{workflow.parameters.nodes}}"
+            value: '{{ "{{" }}workflow.parameters.nodes{{ "}}" }}'
           - name: INSTANCE_TYPE
-            value: "{{workflow.parameters.machine-type}}"
+            value: '{{ "{{" }}workflow.parameters.machine-type{{ "}}" }}'
           - name: K8S_VERSION
-            value: "{{workflow.parameters.k8s-version}}"
+            value: '{{ "{{" }}workflow.parameters.k8s-version{{ "}}" }}'
           - name: USER_ARNS
-            value: "{{workflow.parameters.user-arns}}"
+            value: '{{ "{{" }}workflow.parameters.user-arns{{ "}}" }}'
           - name: CREATION_SOURCE
             value: "infra"
           - name: REGION
-            value: "{{workflow.parameters.region}}"
+            value: '{{ "{{" }}workflow.parameters.region{{ "}}" }}'
 
         volumeMounts:
           - name: data
@@ -87,13 +87,13 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-eks-0.6.9
+        image: quay.io/stackrox-io/ci:automation-flavors-eks-{{ .Chart.Annotations.automationFlavorsVersion }}
         command:
           - entrypoint
         imagePullPolicy: Always
         args:
           - destroy
-          - "{{workflow.parameters.name}}"
+          - '{{ "{{" }}workflow.parameters.name{{ "}}" }}'
         env:
           - name: AWS_ACCESS_KEY_ID
             valueFrom:

diff --git a/chart/infra-server/static/workflow-gke-default.yaml b/chart/infra-server/static/workflow-gke-default.yaml
@@ -35,7 +35,7 @@ spec:
             arguments:
               parameters:
                 - name: name
-                  value: "{{steps.create.outputs.parameters.cluster_name}}"
+                  value: '{{ "{{" }}steps.create.outputs.parameters.cluster_name{{ "}}" }}'
 
     - name: create
       activeDeadlineSeconds: 3600
@@ -60,21 +60,21 @@ spec:
             valueFrom:
               path: /outputs/cluster_name
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-gke-default-0.9.21
+        image: quay.io/stackrox-io/ci:automation-flavors-gke-default-{{ .Chart.Annotations.automationFlavorsVersion }}
         imagePullPolicy: Always
         command:
           - /usr/bin/entrypoint
         args:
           - create
-          - "--name={{workflow.parameters.name}}"
-          - "--nodes={{workflow.parameters.nodes}}"
-          - "--machine-type={{workflow.parameters.machine-type}}"
+          - --name={{ "{{" }}workflow.parameters.name{{ "}}" }}
+          - --nodes={{ "{{" }}workflow.parameters.nodes{{ "}}" }}
+          - --machine-type={{ "{{" }}workflow.parameters.machine-type{{ "}}" }}
           - --gcp-project=acs-team-temp-dev
           - --creation-source=infra
-          - --k8s-version={{workflow.parameters.k8s-version}}
-          - --pod-security-policy={{workflow.parameters.pod-security-policy}}
-          - --gcp-image-type={{workflow.parameters.gcp-image-type}}
-          - --gcp-zone={{workflow.parameters.gcp-zone}}
+          - --k8s-version={{ "{{" }}workflow.parameters.k8s-version{{ "}}" }}
+          - --pod-security-policy={{ "{{" }}workflow.parameters.pod-security-policy{{ "}}" }}
+          - --gcp-image-type={{ "{{" }}workflow.parameters.gcp-image-type{{ "}}" }}
+          - --gcp-zone={{ "{{" }}workflow.parameters.gcp-zone{{ "}}" }}
         volumeMounts:
           - name: credentials
             mountPath: /tmp
@@ -85,15 +85,15 @@ spec:
     - name: destroy
       activeDeadlineSeconds: 3600
       container:
-        image: quay.io/stackrox-io/ci:automation-flavors-gke-default-0.9.21
+        image: quay.io/stackrox-io/ci:automation-flavors-gke-default-{{ .Chart.Annotations.automationFlavorsVersion }}
         imagePullPolicy: Always
         command:
           - /usr/bin/entrypoint
         args:
           - destroy
-          - "--name={{workflow.parameters.name}}"
+          - --name={{ "{{" }}workflow.parameters.name{{ "}}" }}
           - --gcp-project=acs-team-temp-dev
-          - --gcp-zone={{workflow.parameters.gcp-zone}}
+          - --gcp-zone={{ "{{" }}workflow.parameters.gcp-zone{{ "}}" }}
         volumeMounts:
           - name: credentials
             mountPath: /tmp