From d0d69e0a48452e5c5f360d003cc0a3d088f6b8f2 Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Thu, 7 Mar 2024 08:07:48 +0100 Subject: [PATCH] ROX-22818: Move automation-flavor image version to a Chart annotation (#1203) --- chart/infra-server/Chart.yaml | 1 + .../static/test-connect-artifact.yaml | 3 +- .../static/test-url-artifact.yaml | 3 +- chart/infra-server/static/workflow-aks.yaml | 18 +++---- chart/infra-server/static/workflow-demo.yaml | 26 +++++----- chart/infra-server/static/workflow-eks.yaml | 18 +++---- .../static/workflow-gke-default.yaml | 24 +++++----- .../static/workflow-openshift-4-demo.yaml | 48 +++++++++---------- .../workflow-openshift-4-perf-scale.yaml | 28 +++++------ .../static/workflow-openshift-4.yaml | 30 ++++++------ .../static/workflow-openshift-aro.yaml | 12 ++--- .../static/workflow-openshift-ibmroks.yaml | 30 ++++++------ .../static/workflow-openshift-multi.yaml | 42 ++++++++-------- .../static/workflow-openshift-rosa-hcp.yaml | 22 ++++----- .../static/workflow-openshift-rosa.yaml | 16 +++---- .../infra-server/static/workflow-osd-aws.yaml | 14 +++--- .../infra-server/static/workflow-osd-gcp.yaml | 14 +++--- .../infra-server/static/workflow-qa-demo.yaml | 30 ++++++------ chart/infra-server/templates/secrets.yaml | 36 +++++++------- 19 files changed, 207 insertions(+), 208 deletions(-) diff --git a/chart/infra-server/Chart.yaml b/chart/infra-server/Chart.yaml index a39ca13e9..c55f8b119 100644 --- 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 index 750583f7c..52d7983bc 100644 --- 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 index b722eec91..2829daf99 100644 --- 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 index 23ee1653c..ebb0dce80 100644 --- 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 index 0ff962658..84609ade8 100644 --- 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 index 0881772d8..e8a073cc2 100644 --- 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 index ed446bb78..6dd1d75dc 100644 --- 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 diff --git a/chart/infra-server/static/workflow-openshift-4-demo.yaml b/chart/infra-server/static/workflow-openshift-4-demo.yaml index 833279da2..f6ef53fa5 100644 --- a/chart/infra-server/static/workflow-openshift-4-demo.yaml +++ b/chart/infra-server/static/workflow-openshift-4-demo.yaml @@ -59,14 +59,14 @@ spec: arguments: parameters: - name: admin-password - value: "{{steps.pre-install.outputs.parameters.admin-password}}" + value: '{{ "{{" }}steps.pre-install.outputs.parameters.admin-password{{ "}}" }}' - name: kubeconfig-base64 - value: "{{steps.pre-install.outputs.parameters.kubeconfig-base64}}" + value: '{{ "{{" }}steps.pre-install.outputs.parameters.kubeconfig-base64{{ "}}" }}' artifacts: - name: roxctl-central - from: "{{steps.roxctl-central.outputs.artifacts.roxctl-central}}" + from: '{{ "{{" }}steps.roxctl-central.outputs.artifacts.roxctl-central{{ "}}" }}' - name: roxctl-secured-cluster-services - from: "{{steps.roxctl-secured-cluster-services.outputs.artifacts.roxctl-secured-cluster-services}}" + from: '{{ "{{" }}steps.roxctl-secured-cluster-services.outputs.artifacts.roxctl-secured-cluster-services{{ "}}" }}' - - name: gather template: gather @@ -79,7 +79,7 @@ spec: - name: create container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.10.0 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always volumeMounts: - name: data @@ -88,7 +88,7 @@ spec: - entrypoint.sh args: - create - - "{{workflow.parameters.name}}" + - '{{ "{{" }}workflow.parameters.name{{ "}}" }}' - ocp.infra.rox.systems env: - name: GOOGLE_CREDENTIALS @@ -104,7 +104,7 @@ spec: name: redhat-pull-secret key: REDHAT_PULL_SECRET - name: OPENSHIFT_VERSION - value: "{{workflow.parameters.openshift-version}}" + value: '{{ "{{" }}workflow.parameters.openshift-version{{ "}}" }}' - name: MASTER_NODE_COUNT value: "3" - name: WORKER_NODE_COUNT @@ -114,13 +114,13 @@ spec: - name: WORKER_NODE_TYPE value: "e2-standard-16" - name: REGION - value: "{{workflow.parameters.region}}" + value: '{{ "{{" }}workflow.parameters.region{{ "}}" }}' - name: TRUSTED_CERTS_ENABLED - value: "{{workflow.parameters.trusted-certs-enabled}}" + value: '{{ "{{" }}workflow.parameters.trusted-certs-enabled{{ "}}" }}' - name: CREDENTIALS_MODE - value: "{{workflow.parameters.credentials-mode}}" + value: '{{ "{{" }}workflow.parameters.credentials-mode{{ "}}" }}' - name: SSD_STORAGE_CLASS - value: "{{workflow.parameters.ssd-storage-class}}" + value: '{{ "{{" }}workflow.parameters.ssd-storage-class{{ "}}" }}' - name: pre-install script: @@ -132,7 +132,7 @@ spec: source: | openssl rand -base64 32 | tr "+/" "_#" | cut -c 1-20 > /data/admin_password base64 /data/auth/kubeconfig | tr -d "\n" > /data/auth/kubeconfig_base64 - subdomain="apps.{{workflow.parameters.name}}.ocp.infra.rox.systems" + subdomain=apps.{{ "{{" }}workflow.parameters.name{{ "}}" }}.ocp.infra.rox.systems echo "https://console-openshift-console.${subdomain}" > /data/url-openshift echo "https://central-stackrox.${subdomain}" > /data/url-stackrox outputs: @@ -155,7 +155,7 @@ spec: - name: roxctl-secured-cluster-services path: /usr/bin/roxctl-secured-cluster-services container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-demo-0.10.0 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-demo-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always command: - ansible-playbook @@ -181,21 +181,21 @@ spec: - name: ORCHESTRATOR value: openshift - name: ADMIN_PASSWORD - value: "{{ inputs.parameters.admin-password }}" + value: '{{ "{{" }}inputs.parameters.admin-password{{ "}}" }}' - name: KUBECONFIG_BASE64 - value: "{{ inputs.parameters.kubeconfig-base64 }}" + value: '{{ "{{" }}inputs.parameters.kubeconfig-base64{{ "}}" }}' - name: IMAGE_REGISTRY - value: "{{ workflow.parameters.image-registry }}" + value: '{{ "{{" }}workflow.parameters.image-registry{{ "}}" }}' - name: MAIN_IMAGE_TAG - value: "{{ workflow.parameters.main-image-tag }}" + value: '{{ "{{" }}workflow.parameters.main-image-tag{{ "}}" }}' - name: SCANNER_IMAGE_TAG - value: "{{ workflow.parameters.scanner-image-tag }}" + value: '{{ "{{" }}workflow.parameters.scanner-image-tag{{ "}}" }}' - name: SCANNER_DB_IMAGE_TAG - value: "{{ workflow.parameters.scanner-db-image-tag }}" + value: '{{ "{{" }}workflow.parameters.scanner-db-image-tag{{ "}}" }}' - name: COLLECTOR_SLIM_IMAGE_TAG - value: "{{ workflow.parameters.collector-slim-image-tag }}" + value: '{{ "{{" }}workflow.parameters.collector-slim-image-tag{{ "}}" }}' - name: CENTRAL_DB_IMAGE_TAG - value: "{{ workflow.parameters.central-db-image-tag }}" + value: '{{ "{{" }}workflow.parameters.central-db-image-tag{{ "}}" }}' - name: ANSIBLE_STDOUT_CALLBACK value: debug volumeMounts: @@ -263,7 +263,7 @@ spec: - name: destroy container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.10.0 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always command: - entrypoint.sh @@ -288,7 +288,7 @@ spec: - name: roxctl-central path: /tmp/roxctl-central container: - image: "quay.io/stackrox-io/main:{{ workflow.parameters.central-services-helm-chart-version }}" + image: 'quay.io/stackrox-io/main:{{ "{{" }}workflow.parameters.central-services-helm-chart-version{{ "}}" }}' imagePullPolicy: Always command: - cp @@ -305,7 +305,7 @@ spec: - name: roxctl-secured-cluster-services path: /tmp/roxctl-secured-cluster-services container: - image: "quay.io/stackrox-io/main:{{ workflow.parameters.secured-cluster-services-helm-chart-version }}" + image: 'quay.io/stackrox-io/main:{{ "{{" }}workflow.parameters.secured-cluster-services-helm-chart-version{{ "}}" }}' imagePullPolicy: Always command: - cp diff --git a/chart/infra-server/static/workflow-openshift-4-perf-scale.yaml b/chart/infra-server/static/workflow-openshift-4-perf-scale.yaml index e7a7f9ce6..f56b1f379 100644 --- a/chart/infra-server/static/workflow-openshift-4-perf-scale.yaml +++ b/chart/infra-server/static/workflow-openshift-4-perf-scale.yaml @@ -81,13 +81,13 @@ spec: archive: tar: {} container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.10.0 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always command: - entrypoint.sh args: - create - - "{{workflow.parameters.name}}" + - '{{ "{{" }}workflow.parameters.name{{ "}}" }}' - ocp.infra.rox.systems env: - name: GOOGLE_CREDENTIALS @@ -103,27 +103,27 @@ spec: name: redhat-pull-secret key: REDHAT_PULL_SECRET - name: USER_PULL_SECRET - value: "{{workflow.parameters.pull-secret}}" + value: '{{ "{{" }}workflow.parameters.pull-secret{{ "}}" }}' - name: OPENSHIFT_VERSION - value: "{{workflow.parameters.openshift-version}}" + value: '{{ "{{" }}workflow.parameters.openshift-version{{ "}}" }}' - name: MASTER_NODE_COUNT - value: "{{workflow.parameters.master-node-count}}" + value: '{{ "{{" }}workflow.parameters.master-node-count{{ "}}" }}' - name: WORKER_NODE_COUNT - value: "{{workflow.parameters.worker-node-count}}" + value: '{{ "{{" }}workflow.parameters.worker-node-count{{ "}}" }}' - name: MASTER_NODE_TYPE - value: "{{workflow.parameters.master-node-type}}" + value: '{{ "{{" }}workflow.parameters.master-node-type{{ "}}" }}' - name: WORKER_NODE_TYPE - value: "{{workflow.parameters.worker-node-type}}" + value: '{{ "{{" }}workflow.parameters.worker-node-type{{ "}}" }}' - name: REGION - value: "{{workflow.parameters.region}}" + value: '{{ "{{" }}workflow.parameters.region{{ "}}" }}' - name: FIPS_ENABLED - value: "{{workflow.parameters.fips-enabled}}" + value: '{{ "{{" }}workflow.parameters.fips-enabled{{ "}}" }}' - name: TRUSTED_CERTS_ENABLED - value: "{{workflow.parameters.trusted-certs-enabled}}" + value: '{{ "{{" }}workflow.parameters.trusted-certs-enabled{{ "}}" }}' - name: CREDENTIALS_MODE - value: "{{workflow.parameters.credentials-mode}}" + value: '{{ "{{" }}workflow.parameters.credentials-mode{{ "}}" }}' - name: SSD_STORAGE_CLASS - value: "{{workflow.parameters.ssd-storage-class}}" + value: '{{ "{{" }}workflow.parameters.ssd-storage-class{{ "}}" }}' volumeMounts: - name: data mountPath: /data @@ -161,7 +161,7 @@ spec: - name: destroy container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.10.0 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always command: - entrypoint.sh diff --git a/chart/infra-server/static/workflow-openshift-4.yaml b/chart/infra-server/static/workflow-openshift-4.yaml index 06876827f..4f7502ace 100644 --- a/chart/infra-server/static/workflow-openshift-4.yaml +++ b/chart/infra-server/static/workflow-openshift-4.yaml @@ -81,13 +81,13 @@ spec: archive: tar: {} container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.10.0 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always command: - entrypoint.sh args: - create - - "{{workflow.parameters.name}}" + - '{{ "{{" }}workflow.parameters.name{{ "}}" }}' - ocp.infra.rox.systems env: - name: GOOGLE_CREDENTIALS @@ -103,27 +103,27 @@ spec: name: redhat-pull-secret key: REDHAT_PULL_SECRET - name: USER_PULL_SECRET - value: "{{workflow.parameters.pull-secret}}" + value: '{{ "{{" }}workflow.parameters.pull-secret{{ "}}" }}' - name: OPENSHIFT_VERSION - value: "{{workflow.parameters.openshift-version}}" + value: '{{ "{{" }}workflow.parameters.openshift-version{{ "}}" }}' - name: MASTER_NODE_COUNT - value: "{{workflow.parameters.master-node-count}}" + value: '{{ "{{" }}workflow.parameters.master-node-count{{ "}}" }}' - name: WORKER_NODE_COUNT - value: "{{workflow.parameters.worker-node-count}}" + value: '{{ "{{" }}workflow.parameters.worker-node-count{{ "}}" }}' - name: MASTER_NODE_TYPE - value: "{{workflow.parameters.master-node-type}}" + value: '{{ "{{" }}workflow.parameters.master-node-type{{ "}}" }}' - name: WORKER_NODE_TYPE - value: "{{workflow.parameters.worker-node-type}}" + value: '{{ "{{" }}workflow.parameters.worker-node-type{{ "}}" }}' - name: REGION - value: "{{workflow.parameters.region}}" + value: '{{ "{{" }}workflow.parameters.region{{ "}}" }}' - name: FIPS_ENABLED - value: "{{workflow.parameters.fips-enabled}}" + value: '{{ "{{" }}workflow.parameters.fips-enabled{{ "}}" }}' - name: TRUSTED_CERTS_ENABLED - value: "{{workflow.parameters.trusted-certs-enabled}}" + value: '{{ "{{" }}workflow.parameters.trusted-certs-enabled{{ "}}" }}' - name: CREDENTIALS_MODE - value: "{{workflow.parameters.credentials-mode}}" + value: '{{ "{{" }}workflow.parameters.credentials-mode{{ "}}" }}' - name: SSD_STORAGE_CLASS - value: "{{workflow.parameters.ssd-storage-class}}" + value: '{{ "{{" }}workflow.parameters.ssd-storage-class{{ "}}" }}' volumeMounts: - name: data mountPath: /data @@ -161,13 +161,13 @@ spec: - name: destroy container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.10.0 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always command: - entrypoint.sh args: - destroy - - "{{workflow.parameters.name}}" + - '{{ "{{" }}workflow.parameters.name{{ "}}" }}' env: - name: GOOGLE_CREDENTIALS valueFrom: diff --git a/chart/infra-server/static/workflow-openshift-aro.yaml b/chart/infra-server/static/workflow-openshift-aro.yaml index 8d72ac86f..e8d9088be 100644 --- a/chart/infra-server/static/workflow-openshift-aro.yaml +++ b/chart/infra-server/static/workflow-openshift-aro.yaml @@ -38,13 +38,13 @@ spec: - name: create activeDeadlineSeconds: 7200 container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-aro-0.2.16 + image: quay.io/stackrox-io/ci:automation-flavors-aro-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always command: - ./entrypoint.sh args: - create - - "{{workflow.parameters.name}}" + - '{{ "{{" }}workflow.parameters.name{{ "}}" }}' env: - name: AZURE_SUBSCRIPTION_ID valueFrom: @@ -72,9 +72,9 @@ spec: name: aro-cluster-manager key: REDHAT_PULL_SECRET_BASE64 - 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: CREATION_SOURCE value: "infra" volumeMounts: @@ -127,13 +127,13 @@ spec: - name: destroy activeDeadlineSeconds: 3600 container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-aro-0.2.16 + image: quay.io/stackrox-io/ci:automation-flavors-aro-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always command: - ./entrypoint.sh args: - destroy - - "{{workflow.parameters.name}}" + - '{{ "{{" }}workflow.parameters.name{{ "}}" }}' env: - name: AZURE_SUBSCRIPTION_ID valueFrom: diff --git a/chart/infra-server/static/workflow-openshift-ibmroks.yaml b/chart/infra-server/static/workflow-openshift-ibmroks.yaml index 7cb8db748..8d73babab 100644 --- a/chart/infra-server/static/workflow-openshift-ibmroks.yaml +++ b/chart/infra-server/static/workflow-openshift-ibmroks.yaml @@ -45,13 +45,13 @@ spec: - name: create activeDeadlineSeconds: 7200 container: - image: quay.io/stackrox-io/ci:automation-flavors-ibmroks-0.10.1 + image: quay.io/stackrox-io/ci:automation-flavors-ibmroks-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always command: - ./entrypoint.sh args: - create - - "{{workflow.parameters.name}}" + - '{{ "{{" }}workflow.parameters.name{{ "}}" }}' env: - name: IBM_ROKS_API_KEY valueFrom: @@ -59,19 +59,19 @@ spec: name: ibm-cloud-secrets key: IBM_ROKS_API_KEY - name: NODE_COUNT - value: "{{workflow.parameters.nodes}}" + value: '{{ "{{" }}workflow.parameters.nodes{{ "}}" }}' - name: INSTANCE_TYPE - value: "{{workflow.parameters.instance-type}}" + value: '{{ "{{" }}workflow.parameters.instance-type{{ "}}" }}' - name: IBM_ZONE - value: "{{workflow.parameters.zone}}" + value: '{{ "{{" }}workflow.parameters.zone{{ "}}" }}' - name: OPENSHIFT_VERSION - value: "{{workflow.parameters.openshift-version}}" + value: '{{ "{{" }}workflow.parameters.openshift-version{{ "}}" }}' - name: VPC_ID - value: "{{workflow.parameters.vpc}}" + value: '{{ "{{" }}workflow.parameters.vpc{{ "}}" }}' - name: GATEWAY_ID - value: "{{workflow.parameters.public-gateway}}" + value: '{{ "{{" }}workflow.parameters.public-gateway{{ "}}" }}' - name: SUBNET_ID - value: "{{workflow.parameters.subnet}}" + value: '{{ "{{" }}workflow.parameters.subnet{{ "}}" }}' - name: CREATION_SOURCE value: "infra" - name: SCRATCH @@ -112,13 +112,13 @@ spec: - name: destroy activeDeadlineSeconds: 3600 container: - image: quay.io/stackrox-io/ci:automation-flavors-ibmroks-0.10.1 + image: quay.io/stackrox-io/ci:automation-flavors-ibmroks-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always command: - ./entrypoint.sh args: - destroy - - "{{workflow.parameters.name}}" + - '{{ "{{" }}workflow.parameters.name{{ "}}" }}' env: - name: IBM_ROKS_API_KEY valueFrom: @@ -126,13 +126,13 @@ spec: name: ibm-cloud-secrets key: IBM_ROKS_API_KEY - name: IBM_ZONE - value: "{{workflow.parameters.zone}}" + value: '{{ "{{" }}workflow.parameters.zone{{ "}}" }}' - name: VPC_ID - value: "{{workflow.parameters.vpc}}" + value: '{{ "{{" }}workflow.parameters.vpc{{ "}}" }}' - name: GATEWAY_ID - value: "{{workflow.parameters.public-gateway}}" + value: '{{ "{{" }}workflow.parameters.public-gateway{{ "}}" }}' - name: SUBNET_ID - value: "{{workflow.parameters.subnet}}" + value: '{{ "{{" }}workflow.parameters.subnet{{ "}}" }}' - name: SCRATCH value: "/data" volumeMounts: diff --git a/chart/infra-server/static/workflow-openshift-multi.yaml b/chart/infra-server/static/workflow-openshift-multi.yaml index 8f674add2..b8ea01099 100644 --- a/chart/infra-server/static/workflow-openshift-multi.yaml +++ b/chart/infra-server/static/workflow-openshift-multi.yaml @@ -27,19 +27,19 @@ spec: arguments: parameters: - name: name - value: "{{workflow.parameters.name}}" + value: '{{ "{{" }}workflow.parameters.name{{ "}}" }}' - name: crio - value: "{{workflow.parameters.crio}}" + value: '{{ "{{" }}workflow.parameters.crio{{ "}}" }}' - name: nodes - value: "{{workflow.parameters.nodes}}" + value: '{{ "{{" }}workflow.parameters.nodes{{ "}}" }}' - name: machine-type - value: "{{workflow.parameters.machine-type}}" + value: '{{ "{{" }}workflow.parameters.machine-type{{ "}}" }}' - name: zone - value: "{{workflow.parameters.zone}}" + value: '{{ "{{" }}workflow.parameters.zone{{ "}}" }}' - name: install-monitoring - value: "{{workflow.parameters.install-monitoring}}" + value: '{{ "{{" }}workflow.parameters.install-monitoring{{ "}}" }}' - name: install-metrics - value: "{{workflow.parameters.install-metrics}}" + value: '{{ "{{" }}workflow.parameters.install-metrics{{ "}}" }}' - - name: wait template: wait @@ -48,10 +48,10 @@ spec: arguments: parameters: - name: name - value: "{{workflow.parameters.name}}" + value: '{{ "{{" }}workflow.parameters.name{{ "}}" }}' artifacts: - name: terraform-destroy-plan - from: "{{steps.create.outputs.artifacts.terraform-destroy-plan}}" + from: '{{ "{{" }}steps.create.outputs.artifacts.terraform-destroy-plan{{ "}}" }}' - name: create activeDeadlineSeconds: 3600 @@ -99,22 +99,22 @@ spec: path: /well-known/artifacts/terraform-destroy.tfplan container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-multi-0.8.5 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-multi-{{ .Chart.Annotations.automationFlavorsVersion }} command: - /usr/bin/entrypoint args: - create - - "--name={{inputs.parameters.name}}" - - "--crio={{inputs.parameters.crio}}" + - '--name={{ "{{" }}inputs.parameters.name{{ "}}" }}' + - '--crio={{ "{{" }}inputs.parameters.crio{{ "}}" }}' - --creation-source=infra - - "--zone={{inputs.parameters.zone}}" - - "--nodes={{inputs.parameters.nodes}}" - - "--machine-type={{inputs.parameters.machine-type}}" - - "--install-metrics={{inputs.parameters.install-metrics}}" - - "--install-monitoring={{inputs.parameters.install-monitoring}}" - - "--gcp-project=acs-team-temp-dev" - - "--dns-project=acs-team-temp-dev" - - "--dns-zone=ocp-infra-rox-systems" + - '--zone={{ "{{" }}inputs.parameters.zone{{ "}}" }}' + - '--nodes={{ "{{" }}inputs.parameters.nodes{{ "}}" }}' + - '--machine-type={{ "{{" }}inputs.parameters.machine-type{{ "}}" }}' + - '--install-metrics={{ "{{" }}inputs.parameters.install-metrics{{ "}}" }}' + - '--install-monitoring={{ "{{" }}inputs.parameters.install-monitoring{{ "}}" }}' + - --gcp-project=acs-team-temp-dev + - --dns-project=acs-team-temp-dev + - --dns-zone=ocp-infra-rox-systems env: - name: GOOGLE_CREDENTIALS valueFrom: @@ -134,7 +134,7 @@ spec: - name: terraform-destroy-plan path: /well-known/artifacts/terraform-destroy.tfplan container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-multi-0.8.5 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-multi-{{ .Chart.Annotations.automationFlavorsVersion }} command: - /usr/bin/entrypoint args: diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml index b42757738..5b1c7e56a 100644 --- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml +++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml @@ -46,13 +46,13 @@ spec: - name: create activeDeadlineSeconds: 7200 container: - image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.5 + image: quay.io/stackrox-io/ci:automation-flavors-rosa-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always command: - ./entrypoint.sh args: - create - - "{{workflow.parameters.name}}" + - '{{ "{{" }}workflow.parameters.name{{ "}}" }}' env: - name: AWS_ACCESS_KEY_ID valueFrom: @@ -75,17 +75,17 @@ spec: name: osd-access-secrets key: OPENSHIFT_CLUSTER_MANAGER_API_TOKEN - name: ROSA_ARGS - value: "{{workflow.parameters.rosa-args}}" + value: '{{ "{{" }}workflow.parameters.rosa-args{{ "}}" }}' - name: AWS_REGION - value: "{{workflow.parameters.aws-region}}" + value: '{{ "{{" }}workflow.parameters.aws-region{{ "}}" }}' - name: MANAGED_CP - value: "{{workflow.parameters.managed-cp}}" + value: '{{ "{{" }}workflow.parameters.managed-cp{{ "}}" }}' - name: SUBNET_IDS - value: "{{workflow.parameters.subnet-ids}}" + value: '{{ "{{" }}workflow.parameters.subnet-ids{{ "}}" }}' - 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: CREATION_SOURCE value: "infra" volumeMounts: @@ -144,16 +144,16 @@ spec: - name: destroy activeDeadlineSeconds: 3600 container: - image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.5 + image: quay.io/stackrox-io/ci:automation-flavors-rosa-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always command: - ./entrypoint.sh args: - destroy - - "{{workflow.parameters.name}}" + - '{{ "{{" }}workflow.parameters.name{{ "}}" }}' env: - name: AWS_REGION - value: "{{workflow.parameters.aws-region}}" + value: '{{ "{{" }}workflow.parameters.aws-region{{ "}}" }}' - name: AWS_ACCESS_KEY_ID valueFrom: secretKeyRef: diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml index 3ceabcf0b..ad07d6a0d 100644 --- a/chart/infra-server/static/workflow-openshift-rosa.yaml +++ b/chart/infra-server/static/workflow-openshift-rosa.yaml @@ -40,13 +40,13 @@ spec: - name: create activeDeadlineSeconds: 7200 container: - image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.5 + image: quay.io/stackrox-io/ci:automation-flavors-rosa-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always command: - ./entrypoint.sh args: - create - - "{{workflow.parameters.name}}" + - '{{ "{{" }}workflow.parameters.name{{ "}}" }}' env: - name: AWS_ACCESS_KEY_ID valueFrom: @@ -69,13 +69,13 @@ spec: name: osd-access-secrets key: OPENSHIFT_CLUSTER_MANAGER_API_TOKEN - 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: CREATION_SOURCE value: "infra" - name: AWS_REGION - value: "{{workflow.parameters.aws-region}}" + value: '{{ "{{" }}workflow.parameters.aws-region{{ "}}" }}' volumeMounts: - name: data mountPath: /data @@ -126,13 +126,13 @@ spec: - name: destroy activeDeadlineSeconds: 3600 container: - image: quay.io/stackrox-io/ci:automation-flavors-rosa-0.9.5 + image: quay.io/stackrox-io/ci:automation-flavors-rosa-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always command: - ./entrypoint.sh args: - destroy - - "{{workflow.parameters.name}}" + - '{{ "{{" }}workflow.parameters.name{{ "}}" }}' env: - name: AWS_ACCESS_KEY_ID valueFrom: @@ -155,7 +155,7 @@ spec: name: osd-access-secrets key: REDHAT_PULL_SECRET_BASE64 - name: AWS_REGION - value: "{{workflow.parameters.aws-region}}" + value: '{{ "{{" }}workflow.parameters.aws-region{{ "}}" }}' volumeMounts: - name: data mountPath: /data diff --git a/chart/infra-server/static/workflow-osd-aws.yaml b/chart/infra-server/static/workflow-osd-aws.yaml index c74d5d822..bfcacbb29 100644 --- a/chart/infra-server/static/workflow-osd-aws.yaml +++ b/chart/infra-server/static/workflow-osd-aws.yaml @@ -40,14 +40,14 @@ spec: - name: create activeDeadlineSeconds: 7200 container: - image: quay.io/stackrox-io/ci:automation-flavors-osd-0.9.7-1-ge4b4757607-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-osd-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always command: - ./entrypoint.sh args: - aws - create - - "{{workflow.parameters.name}}" + - '{{ "{{" }}workflow.parameters.name{{ "}}" }}' env: - name: AWS_ACCESS_KEY_ID valueFrom: @@ -70,13 +70,13 @@ spec: name: osd-access-secrets key: OPENSHIFT_CLUSTER_MANAGER_API_TOKEN - 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: CREATION_SOURCE value: "infra" - name: AWS_REGION - value: "{{workflow.parameters.aws-region}}" + value: '{{ "{{" }}workflow.parameters.aws-region{{ "}}" }}' volumeMounts: - name: data mountPath: /data @@ -127,14 +127,14 @@ spec: - name: destroy activeDeadlineSeconds: 3600 container: - image: quay.io/stackrox-io/ci:automation-flavors-osd-0.9.7-1-ge4b4757607-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-osd-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always command: - ./entrypoint.sh args: - aws - destroy - - "{{workflow.parameters.name}}" + - '{{ "{{" }}workflow.parameters.name{{ "}}" }}' env: - name: AWS_ACCESS_KEY_ID valueFrom: diff --git a/chart/infra-server/static/workflow-osd-gcp.yaml b/chart/infra-server/static/workflow-osd-gcp.yaml index 17f1992b0..335d7e2b2 100644 --- a/chart/infra-server/static/workflow-osd-gcp.yaml +++ b/chart/infra-server/static/workflow-osd-gcp.yaml @@ -40,14 +40,14 @@ spec: - name: create activeDeadlineSeconds: 7200 container: - image: quay.io/stackrox-io/ci:automation-flavors-osd-0.9.7-1-ge4b4757607-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-osd-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always command: - ./entrypoint.sh args: - gcp - create - - "{{workflow.parameters.name}}" + - '{{ "{{" }}workflow.parameters.name{{ "}}" }}' env: - name: OPENSHIFT_CLUSTER_MANAGER_API_TOKEN valueFrom: @@ -67,13 +67,13 @@ spec: - name: GCP_PROJECT value: "acs-team-temp-dev" - 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: CREATION_SOURCE value: "infra" - name: GCP_REGION - value: "{{workflow.parameters.gcp-region}}" + value: '{{ "{{" }}workflow.parameters.gcp-region{{ "}}" }}' volumeMounts: - name: data mountPath: /data @@ -124,14 +124,14 @@ spec: - name: destroy activeDeadlineSeconds: 3600 container: - image: quay.io/stackrox-io/ci:automation-flavors-osd-0.9.7-1-ge4b4757607-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-osd-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always command: - ./entrypoint.sh args: - gcp - destroy - - "{{workflow.parameters.name}}" + - '{{ "{{" }}workflow.parameters.name{{ "}}" }}' env: - name: OPENSHIFT_CLUSTER_MANAGER_API_TOKEN valueFrom: diff --git a/chart/infra-server/static/workflow-qa-demo.yaml b/chart/infra-server/static/workflow-qa-demo.yaml index 06e2d9f61..0f3616d02 100644 --- a/chart/infra-server/static/workflow-qa-demo.yaml +++ b/chart/infra-server/static/workflow-qa-demo.yaml @@ -46,7 +46,7 @@ spec: arguments: artifacts: - name: roxctl - from: "{{steps.roxctl.outputs.artifacts.roxctl}}" + from: '{{ "{{" }}steps.roxctl.outputs.artifacts.roxctl{{ "}}" }}' - - name: wait template: wait @@ -58,9 +58,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 @@ -69,7 +69,7 @@ spec: - name: roxctl path: /tmp/roxctl container: - image: "{{workflow.parameters.main-image}}" + image: '{{ "{{" }}workflow.parameters.main-image{{ "}}" }}' imagePullPolicy: Always command: - cp @@ -126,24 +126,24 @@ 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}}" - - "--scanner-image={{workflow.parameters.scanner-image}}" - - "--scanner-db-image={{workflow.parameters.scanner-db-image}}" - - "--central-db-image={{workflow.parameters.central-db-image}}" + - --name={{ "{{" }}workflow.parameters.name{{ "}}" }} + - --main-image={{ "{{" }}workflow.parameters.main-image{{ "}}" }} + - --scanner-image={{ "{{" }}workflow.parameters.scanner-image{{ "}}" }} + - --scanner-db-image={{ "{{" }}workflow.parameters.scanner-db-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 @@ -196,7 +196,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/templates/secrets.yaml b/chart/infra-server/templates/secrets.yaml index 3ac621d7b..a9bb58ef3 100644 --- a/chart/infra-server/templates/secrets.yaml +++ b/chart/infra-server/templates/secrets.yaml @@ -29,60 +29,60 @@ data: {{ required ".Values.infra_yaml is undefined" .Values.infra_yaml }} flavors.yaml: |- - {{- tpl (.Files.Get "static/flavors.yaml") . | b64enc | nindent 4 }} + {{- tpl (.Files.Get "static/flavors.yaml" ) . | b64enc | nindent 4 }} workflow-gke-default.yaml: |- - {{- .Files.Get "static/workflow-gke-default.yaml" | b64enc | nindent 4 }} + {{- tpl (.Files.Get "static/workflow-gke-default.yaml" ) . | b64enc | nindent 4 }} workflow-demo.yaml: |- - {{- .Files.Get "static/workflow-demo.yaml" | b64enc | nindent 4 }} + {{- tpl (.Files.Get "static/workflow-demo.yaml" ) . | b64enc | nindent 4 }} workflow-qa-demo.yaml: |- - {{- .Files.Get "static/workflow-qa-demo.yaml" | b64enc | nindent 4 }} + {{- tpl (.Files.Get "static/workflow-qa-demo.yaml" ) . | b64enc | nindent 4 }} workflow-openshift-multi.yaml: |- - {{- .Files.Get "static/workflow-openshift-multi.yaml" | b64enc | nindent 4 }} + {{- tpl (.Files.Get "static/workflow-openshift-multi.yaml" ) . | b64enc | nindent 4 }} workflow-openshift-4.yaml: |- - {{- .Files.Get "static/workflow-openshift-4.yaml" | b64enc | nindent 4 }} + {{- tpl (.Files.Get "static/workflow-openshift-4.yaml" ) . | b64enc | nindent 4 }} workflow-openshift-4-demo.yaml: |- - {{- .Files.Get "static/workflow-openshift-4-demo.yaml" | b64enc | nindent 4 }} + {{- tpl (.Files.Get "static/workflow-openshift-4-demo.yaml" ) . | b64enc | nindent 4 }} workflow-openshift-4-perf-scale.yaml: |- - {{- .Files.Get "static/workflow-openshift-4-perf-scale.yaml" | b64enc | nindent 4 }} + {{- tpl (.Files.Get "static/workflow-openshift-4-perf-scale.yaml" ) . | b64enc | nindent 4 }} workflow-eks.yaml: |- - {{- .Files.Get "static/workflow-eks.yaml" | b64enc | nindent 4 }} + {{- tpl (.Files.Get "static/workflow-eks.yaml" ) . | b64enc | nindent 4 }} workflow-aks.yaml: |- - {{- .Files.Get "static/workflow-aks.yaml" | b64enc | nindent 4 }} + {{- tpl (.Files.Get "static/workflow-aks.yaml" ) . | b64enc | nindent 4 }} workflow-openshift-aro.yaml: |- - {{- .Files.Get "static/workflow-openshift-aro.yaml" | b64enc | nindent 4 }} + {{- tpl (.Files.Get "static/workflow-openshift-aro.yaml" ) . | b64enc | nindent 4 }} workflow-openshift-rosa.yaml: |- - {{- .Files.Get "static/workflow-openshift-rosa.yaml" | b64enc | nindent 4 }} + {{- tpl (.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 }} + {{- tpl (.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 }} + {{- tpl (.Files.Get "static/workflow-openshift-ibmroks.yaml" ) . | b64enc | nindent 4 }} workflow-osd-aws.yaml: |- - {{- .Files.Get "static/workflow-osd-aws.yaml" | b64enc | nindent 4 }} + {{- tpl (.Files.Get "static/workflow-osd-aws.yaml" ) . | b64enc | nindent 4 }} workflow-osd-gcp.yaml: |- - {{- .Files.Get "static/workflow-osd-gcp.yaml" | b64enc | nindent 4 }} + {{- tpl (.Files.Get "static/workflow-osd-gcp.yaml" ) . | b64enc | nindent 4 }} {{ if ne .Values.environment "production" }} test-url-artifact.yaml: |- - {{- .Files.Get "static/test-url-artifact.yaml" | b64enc | nindent 4 }} + {{- tpl (.Files.Get "static/test-url-artifact.yaml" ) . | b64enc | nindent 4 }} test-connect-artifact.yaml: |- - {{- .Files.Get "static/test-connect-artifact.yaml" | b64enc | nindent 4 }} + {{- tpl (.Files.Get "static/test-connect-artifact.yaml" ) . | b64enc | nindent 4 }} {{ end }}