Skip to content

Commit 9e96031

Browse files
battermannblackheaven
authored andcommitted
WPB-18320 make hardcoded images in helm charts configurable via values yaml (#5015)
1 parent 5ec784a commit 9e96031

File tree

10 files changed

+28
-5
lines changed

10 files changed

+28
-5
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
The following Helm charts changed in this branch:
2+
- `charts/demo-smtp`
3+
- `charts/fake-aws-ses`
4+
- `charts/fake-aws-sns`
5+
- `charts/legalhold`
6+
7+
Image field overrides are supported via split values (`repository` + `tag`) in the changed charts.
8+
There are backward incompatibilities if old string-style image overrides are still used.

changelog.d/5-internal/WPB-18320

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Made hard coded images in helm charts configurable

charts/demo-smtp/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
app: {{ template "demo-smtp.name" . }}
2929
containers:
3030
- name: {{ .Chart.Name }}
31-
image: "{{ .Values.image }}"
31+
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
3232
env:
3333
{{- range $key, $val := .Values.envVars }}
3434
- name: {{ $key }}

charts/demo-smtp/values.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
fullnameOverride: demo-smtp
22
replicaCount: 1
3-
image: "quay.io/wire/ixdotai-smtp:v0.5.2"
3+
image:
4+
repository: quay.io/wire/ixdotai-smtp
5+
tag: v0.5.2
46

57
service:
68
port: 25

charts/fake-aws-ses/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ spec:
4444
resources:
4545
{{ toYaml .Values.resources | indent 12 }}
4646
- name: initiate-fake-aws-ses
47-
image: mesosphere/aws-cli:1.14.5
47+
image: "{{ .Values.awsCliImage.repository }}:{{ .Values.awsCliImage.tag }}"
4848
command: [/bin/sh]
4949
args:
5050
- -c

charts/fake-aws-ses/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ image:
22
repository: localstack/localstack
33
tag: 0.8.7
44

5+
awsCliImage:
6+
repository: mesosphere/aws-cli
7+
tag: 1.14.5
8+
59
service:
610
internalPort: 4579
711
externalPort: 4569

charts/fake-aws-sns/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ spec:
4444
resources:
4545
{{ toYaml .Values.resources | indent 12 }}
4646
- name: initiate-fake-aws-sns
47-
image: mesosphere/aws-cli:1.14.5
47+
image: "{{ .Values.awsCliImage.repository }}:{{ .Values.awsCliImage.tag }}"
4848
command: [/bin/sh]
4949
args:
5050
- -c

charts/fake-aws-sns/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ image:
22
repository: localstack/localstack
33
tag: 0.8.7
44

5+
awsCliImage:
6+
repository: mesosphere/aws-cli
7+
tag: 1.14.5
8+
59
service:
610
internalPort: 4575
711
externalPort: 4575

charts/legalhold/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
restartPolicy: Always
2828
containers:
2929
- name: hold
30-
image: quay.io/wire/legalhold:1.0.2
30+
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
3131
imagePullPolicy: IfNotPresent
3232

3333
resources:

charts/legalhold/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
# The shared secret that the backend uses to authenticate to legalhold
1515
# serviceToken: ""
1616

17+
image:
18+
repository: quay.io/wire/legalhold
19+
tag: 1.0.2
20+
1721
podSecurityContext:
1822
allowPrivilegeEscalation: false
1923
capabilities:

0 commit comments

Comments
 (0)