Skip to content

Commit 7225027

Browse files
sf1tzparttor
authored andcommitted
Templatize imagePullSecret names in deployment
Also, update examples
1 parent a9cc35f commit 7225027

File tree

8 files changed

+27
-4
lines changed

8 files changed

+27
-4
lines changed

examples/app/templates/secret-ca.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ metadata:
66
{{- include "app.labels" . | nindent 4 }}
77
data:
88
ca.crt: {{ required "secretCa.caCrt is required" .Values.secretCa.caCrt | b64enc
9-
| quote }}
9+
| quote }}
10+
type: opaque

examples/app/templates/secret-vars.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ data:
1010
VAR2: {{ required "secretVars.var2 is required" .Values.secretVars.var2 | b64enc
1111
| quote }}
1212
stringData:
13-
str: {{ required "secretVars.str is required" .Values.secretVars.str | quote }}
13+
str: {{ required "secretVars.str is required" .Values.secretVars.str | quote }}
14+
type: opaque

examples/operator/templates/deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ spec:
7474
subPath: controller_manager_config.yaml
7575
- mountPath: /my.ca
7676
name: secret-volume
77+
imagePullSecrets:
78+
- name: {{ include "operator.fullname" . }}-secret-registry-credentials
7779
securityContext:
7880
runAsNonRoot: true
7981
serviceAccountName: {{ include "operator.fullname" . }}-controller-manager

examples/operator/templates/secret-ca.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ metadata:
66
{{- include "operator.labels" . | nindent 4 }}
77
data:
88
ca.crt: {{ required "secretCa.caCrt is required" .Values.secretCa.caCrt | b64enc
9-
| quote }}
9+
| quote }}
10+
type: opaque
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
apiVersion: v1
2+
kind: Secret
3+
metadata:
4+
name: {{ include "operator.fullname" . }}-secret-registry-credentials
5+
labels:
6+
{{- include "operator.labels" . | nindent 4 }}
7+
data:
8+
.dockerconfigjson: {{ required "secretRegistryCredentials.dockerconfigjson is required"
9+
.Values.secretRegistryCredentials.dockerconfigjson | b64enc | quote }}
10+
type: kubernetes.io/dockerconfigjson

examples/operator/templates/secret-vars.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ data:
88
VAR1: {{ required "secretVars.var1 is required" .Values.secretVars.var1 | b64enc
99
| quote }}
1010
VAR2: {{ required "secretVars.var2 is required" .Values.secretVars.var2 | b64enc
11-
| quote }}
11+
| quote }}
12+
type: opaque

examples/operator/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ pvc:
4242
storageRequest: 2Gi
4343
secretCa:
4444
caCrt: ""
45+
secretRegistryCredentials:
46+
dockerconfigjson: ""
4547
secretVars:
4648
var1: ""
4749
var2: ""

pkg/processor/deployment/deployment.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,11 @@ func processPodSpec(name string, appMeta helmify.AppMetadata, pod *corev1.PodSpe
213213
}
214214
}
215215
pod.ServiceAccountName = appMeta.TemplatedName(pod.ServiceAccountName)
216+
217+
for i, s := range pod.ImagePullSecrets {
218+
pod.ImagePullSecrets[i].Name = appMeta.TemplatedName(s.Name)
219+
}
220+
216221
return values, nil
217222
}
218223

0 commit comments

Comments
 (0)