Skip to content

Commit 5e11139

Browse files
reixdRainer 'rei' Schuth
andauthored
[cronjobs] Refactor secret naming using slugify function in cronjobs … (#25)
Co-authored-by: Rainer 'rei' Schuth <rainer.schuth@digital-results-international.com>
1 parent ed7efbb commit 5e11139

3 files changed

Lines changed: 3 additions & 8 deletions

File tree

charts/cronjobs/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: v2
33
name: cronjobs
44
description: A generic helm cronjob chart for kubernetes
55
type: application
6-
version: 1.6.0
6+
version: 1.6.1
77
appVersion: latest
88
home: https://github.com/klicktipp/helm-charts
99
keywords:

charts/cronjobs/templates/cronjob.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ spec:
109109
- name: {{ $key }}
110110
valueFrom:
111111
secretKeyRef:
112-
name: {{ include "cronjobs.fullname" $ }}-{{ $job_name }}-envvars
112+
name: {{ include "com.klicktipp.slugify-volume-name" (list (include "cronjobs.fullname" $) $job_name "envvars") }}
113113
key: {{ $key }}
114114
{{- end }}
115115
resources:
@@ -204,10 +204,5 @@ spec:
204204
secret:
205205
secretName: {{ $secret.secretName }}
206206
{{- end }}
207-
{{- if and $job (hasKey $job "secretEnv") $job.secretEnv }}
208-
- name: {{ include "cronjobs.fullname" $ }}-{{ $job_name }}-envvars
209-
secret:
210-
secretName: {{ include "cronjobs.fullname" $ }}-{{ $job_name }}-envvars
211-
{{- end }}
212207
{{- end }} {{/* # end if check $job */}}
213208
{{- end }} {{/* # end range $job */}}

charts/cronjobs/templates/secrets.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ data:
5252
apiVersion: v1
5353
kind: Secret
5454
metadata:
55-
name: {{ include "cronjobs.fullname" $ }}-{{ $job_name }}-envvars
55+
name: {{ include "com.klicktipp.slugify-volume-name" (list (include "cronjobs.fullname" $) $job_name "envvars") }}
5656
labels:
5757
{{- include "cronjobs.labels" $ | nindent 4 }}
5858
{{- with $.Values.commonLabels }}

0 commit comments

Comments
 (0)