Skip to content

Commit d0d69e0

Browse files
tommartensentommartensen
authored
ROX-22818: Move automation-flavor image version to a Chart annotation (#1203)
1 parent 3f27514 commit d0d69e0

19 files changed

+207
-208
lines changed

‎chart/infra-server/Chart.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ sources:
88
- https://github.com/stackrox/infra
99
annotations:
1010
acsDemoVersion: 4.3.4
11+
automationFlavorsVersion: 0.10.4
1112
ocpCredentialsMode: Passthrough

‎chart/infra-server/static/test-connect-artifact.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
break
3737
fi
3838
done
39-
echo {{ workflow.name }} {{ workflow.uid }} > /tmp/connect
39+
echo {{ "{{" }} workflow.name {{ "}}" }} {{ "{{" }} workflow.uid {{ "}}" }} > /tmp/connect
4040
4141
- name: wait
4242
suspend: {}
@@ -53,4 +53,3 @@ spec:
5353
break
5454
fi
5555
done
56-

‎chart/infra-server/static/test-url-artifact.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
break
3737
fi
3838
done
39-
echo {{ workflow.name }} {{ workflow.uid }} > /tmp/url
39+
echo {{ "{{" }} workflow.name {{ "}}" }} {{ "{{" }} workflow.uid {{ "}}" }} > /tmp/url
4040
4141
- name: wait
4242
suspend: {}
@@ -53,4 +53,3 @@ spec:
5353
break
5454
fi
5555
done
56-

‎chart/infra-server/static/workflow-aks.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ spec:
4848
archive:
4949
tar: {}
5050
container:
51-
image: quay.io/stackrox-io/ci:automation-flavors-aks-0.10.1
51+
image: quay.io/stackrox-io/ci:automation-flavors-aks-{{ .Chart.Annotations.automationFlavorsVersion }}
5252
imagePullPolicy: Always
5353
command:
5454
- entrypoint
5555
args:
5656
- create
57-
- "{{workflow.parameters.name}}"
57+
- '{{ "{{" }}workflow.parameters.name{{ "}}" }}'
5858
- srox-temp-dev-test
5959
env:
6060
- name: AZURE_SP_USERNAME
@@ -73,15 +73,15 @@ spec:
7373
name: azure-secrets
7474
key: AZURE_SP_TENANT
7575
- name: NODE_COUNT
76-
value: "{{workflow.parameters.nodes}}"
76+
value: '{{ "{{" }}workflow.parameters.nodes{{ "}}" }}'
7777
- name: INSTANCE_TYPE
78-
value: "{{workflow.parameters.machine-type}}"
78+
value: '{{ "{{" }}workflow.parameters.machine-type{{ "}}" }}'
7979
- name: K8S_VERSION
80-
value: "{{workflow.parameters.k8s-version}}"
80+
value: '{{ "{{" }}workflow.parameters.k8s-version{{ "}}" }}'
8181
- name: NETWORK_PLUGIN
82-
value: "{{workflow.parameters.network-plugin}}"
82+
value: '{{ "{{" }}workflow.parameters.network-plugin{{ "}}" }}'
8383
- name: NETWORK_POLICY
84-
value: "{{workflow.parameters.network-policy}}"
84+
value: '{{ "{{" }}workflow.parameters.network-policy{{ "}}" }}'
8585
- name: CREATION_SOURCE
8686
value: "infra"
8787
volumeMounts:
@@ -96,13 +96,13 @@ spec:
9696

9797
- name: destroy
9898
container:
99-
image: quay.io/stackrox-io/ci:automation-flavors-aks-0.10.1
99+
image: quay.io/stackrox-io/ci:automation-flavors-aks-{{ .Chart.Annotations.automationFlavorsVersion }}
100100
imagePullPolicy: Always
101101
command:
102102
- entrypoint
103103
args:
104104
- destroy
105-
- "{{workflow.parameters.name}}"
105+
- '{{ "{{" }}workflow.parameters.name{{ "}}" }}'
106106
- srox-temp-dev-test
107107
env:
108108
- name: AZURE_SP_USERNAME

‎chart/infra-server/static/workflow-demo.yaml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
arguments:
3838
artifacts:
3939
- name: roxctl
40-
from: "{{steps.roxctl.outputs.artifacts.roxctl}}"
40+
from: '{{ "{{" }}steps.roxctl.outputs.artifacts.roxctl{{ "}}" }}'
4141

4242
- - name: wait
4343
template: wait
@@ -49,9 +49,9 @@ spec:
4949
arguments:
5050
artifacts:
5151
- name: tfstate
52-
from: "{{workflow.outputs.artifacts.global-tfstate}}"
52+
from: '{{ "{{" }}workflow.outputs.artifacts.global-tfstate{{ "}}" }}'
5353
- name: tfvars
54-
from: "{{workflow.outputs.artifacts.global-tfvars}}"
54+
from: '{{ "{{" }}workflow.outputs.artifacts.global-tfvars{{ "}}" }}'
5555

5656
- name: roxctl
5757
activeDeadlineSeconds: 120
@@ -60,7 +60,7 @@ spec:
6060
- name: roxctl
6161
path: /tmp/roxctl
6262
container:
63-
image: "{{workflow.parameters.main-image}}"
63+
image: '{{ "{{" }}workflow.parameters.main-image{{ "}}" }}'
6464
imagePullPolicy: Always
6565
command:
6666
- cp
@@ -120,22 +120,22 @@ spec:
120120
none: {}
121121

122122
container:
123-
image: quay.io/stackrox-io/ci:automation-flavors-demo-0.9.13
123+
image: quay.io/stackrox-io/ci:automation-flavors-demo-{{ .Chart.Annotations.automationFlavorsVersion }}
124124
imagePullPolicy: Always
125125
command:
126126
- /usr/bin/entrypoint
127127
args:
128128
- create
129-
- "--name={{workflow.parameters.name}}"
130-
- "--main-image={{workflow.parameters.main-image}}"
131-
- "--central-db-image={{workflow.parameters.central-db-image}}"
129+
- --name={{ "{{" }}workflow.parameters.name{{ "}}" }}
130+
- --main-image={{ "{{" }}workflow.parameters.main-image{{ "}}" }}
131+
- --central-db-image={{ "{{" }}workflow.parameters.central-db-image{{ "}}" }}
132132
- --gcp-project=acs-team-temp-dev
133133
- --dns-gcp-project=acs-team-temp-dev
134134
- --creation-source=infra
135-
- --k8s-version={{workflow.parameters.k8s-version}}
136-
- --enable-psps={{workflow.parameters.enable-psps}}
137-
- --gcp-region={{workflow.parameters.gcp-region}}
138-
- --gcp-zone={{workflow.parameters.gcp-zone}}
135+
- --k8s-version={{ "{{" }}workflow.parameters.k8s-version{{ "}}" }}
136+
- --enable-psps={{ "{{" }}workflow.parameters.enable-psps{{ "}}" }}
137+
- --gcp-region={{ "{{" }}workflow.parameters.gcp-region{{ "}}" }}
138+
- --gcp-zone={{ "{{" }}workflow.parameters.gcp-zone{{ "}}" }}
139139
volumeMounts:
140140
- name: credentials
141141
mountPath: /tmp/google-credentials.json
@@ -188,7 +188,7 @@ spec:
188188
path: /data/tfvars
189189
optional: true
190190
container:
191-
image: quay.io/stackrox-io/ci:automation-flavors-demo-0.9.13
191+
image: quay.io/stackrox-io/ci:automation-flavors-demo-{{ .Chart.Annotations.automationFlavorsVersion }}
192192
imagePullPolicy: Always
193193
command:
194194
- /usr/bin/entrypoint

‎chart/infra-server/static/workflow-eks.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ spec:
4343
archive:
4444
tar: {}
4545
container:
46-
image: quay.io/stackrox-io/ci:automation-flavors-eks-0.6.9
46+
image: quay.io/stackrox-io/ci:automation-flavors-eks-{{ .Chart.Annotations.automationFlavorsVersion }}
4747
imagePullPolicy: Always
4848
command:
4949
- entrypoint
5050
args:
5151
- create
52-
- "{{workflow.parameters.name}}"
52+
- '{{ "{{" }}workflow.parameters.name{{ "}}" }}'
5353
env:
5454
- name: AWS_ACCESS_KEY_ID
5555
valueFrom:
@@ -62,17 +62,17 @@ spec:
6262
name: aws-access-secrets
6363
key: AWS_SECRET_ACCESS_KEY
6464
- name: NODE_COUNT
65-
value: "{{workflow.parameters.nodes}}"
65+
value: '{{ "{{" }}workflow.parameters.nodes{{ "}}" }}'
6666
- name: INSTANCE_TYPE
67-
value: "{{workflow.parameters.machine-type}}"
67+
value: '{{ "{{" }}workflow.parameters.machine-type{{ "}}" }}'
6868
- name: K8S_VERSION
69-
value: "{{workflow.parameters.k8s-version}}"
69+
value: '{{ "{{" }}workflow.parameters.k8s-version{{ "}}" }}'
7070
- name: USER_ARNS
71-
value: "{{workflow.parameters.user-arns}}"
71+
value: '{{ "{{" }}workflow.parameters.user-arns{{ "}}" }}'
7272
- name: CREATION_SOURCE
7373
value: "infra"
7474
- name: REGION
75-
value: "{{workflow.parameters.region}}"
75+
value: '{{ "{{" }}workflow.parameters.region{{ "}}" }}'
7676

7777
volumeMounts:
7878
- name: data
@@ -87,13 +87,13 @@ spec:
8787
- name: destroy
8888
activeDeadlineSeconds: 3600
8989
container:
90-
image: quay.io/stackrox-io/ci:automation-flavors-eks-0.6.9
90+
image: quay.io/stackrox-io/ci:automation-flavors-eks-{{ .Chart.Annotations.automationFlavorsVersion }}
9191
command:
9292
- entrypoint
9393
imagePullPolicy: Always
9494
args:
9595
- destroy
96-
- "{{workflow.parameters.name}}"
96+
- '{{ "{{" }}workflow.parameters.name{{ "}}" }}'
9797
env:
9898
- name: AWS_ACCESS_KEY_ID
9999
valueFrom:

‎chart/infra-server/static/workflow-gke-default.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
arguments:
3636
parameters:
3737
- name: name
38-
value: "{{steps.create.outputs.parameters.cluster_name}}"
38+
value: '{{ "{{" }}steps.create.outputs.parameters.cluster_name{{ "}}" }}'
3939

4040
- name: create
4141
activeDeadlineSeconds: 3600
@@ -60,21 +60,21 @@ spec:
6060
valueFrom:
6161
path: /outputs/cluster_name
6262
container:
63-
image: quay.io/stackrox-io/ci:automation-flavors-gke-default-0.9.21
63+
image: quay.io/stackrox-io/ci:automation-flavors-gke-default-{{ .Chart.Annotations.automationFlavorsVersion }}
6464
imagePullPolicy: Always
6565
command:
6666
- /usr/bin/entrypoint
6767
args:
6868
- create
69-
- "--name={{workflow.parameters.name}}"
70-
- "--nodes={{workflow.parameters.nodes}}"
71-
- "--machine-type={{workflow.parameters.machine-type}}"
69+
- --name={{ "{{" }}workflow.parameters.name{{ "}}" }}
70+
- --nodes={{ "{{" }}workflow.parameters.nodes{{ "}}" }}
71+
- --machine-type={{ "{{" }}workflow.parameters.machine-type{{ "}}" }}
7272
- --gcp-project=acs-team-temp-dev
7373
- --creation-source=infra
74-
- --k8s-version={{workflow.parameters.k8s-version}}
75-
- --pod-security-policy={{workflow.parameters.pod-security-policy}}
76-
- --gcp-image-type={{workflow.parameters.gcp-image-type}}
77-
- --gcp-zone={{workflow.parameters.gcp-zone}}
74+
- --k8s-version={{ "{{" }}workflow.parameters.k8s-version{{ "}}" }}
75+
- --pod-security-policy={{ "{{" }}workflow.parameters.pod-security-policy{{ "}}" }}
76+
- --gcp-image-type={{ "{{" }}workflow.parameters.gcp-image-type{{ "}}" }}
77+
- --gcp-zone={{ "{{" }}workflow.parameters.gcp-zone{{ "}}" }}
7878
volumeMounts:
7979
- name: credentials
8080
mountPath: /tmp
@@ -85,15 +85,15 @@ spec:
8585
- name: destroy
8686
activeDeadlineSeconds: 3600
8787
container:
88-
image: quay.io/stackrox-io/ci:automation-flavors-gke-default-0.9.21
88+
image: quay.io/stackrox-io/ci:automation-flavors-gke-default-{{ .Chart.Annotations.automationFlavorsVersion }}
8989
imagePullPolicy: Always
9090
command:
9191
- /usr/bin/entrypoint
9292
args:
9393
- destroy
94-
- "--name={{workflow.parameters.name}}"
94+
- --name={{ "{{" }}workflow.parameters.name{{ "}}" }}
9595
- --gcp-project=acs-team-temp-dev
96-
- --gcp-zone={{workflow.parameters.gcp-zone}}
96+
- --gcp-zone={{ "{{" }}workflow.parameters.gcp-zone{{ "}}" }}
9797
volumeMounts:
9898
- name: credentials
9999
mountPath: /tmp

0 commit comments

Comments
 (0)