DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 29 Packages Projects Releases 1 Wiki Activity

another common bugfix

Browse Source
This commit is contained in:
kjeld Schouten-Lebbing
2021-08-27 16:41:24 +02:00
parent ab272b9587
commit aea019435c
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/library/common/Chart.yaml
+1 -1
View File
@@ -18,4 +18,4 @@ maintainers:
name: common name: common
sources: null sources: null
type: library type: library
version: 6.10.2 version: 6.10.3
charts/library/common/templates/lib/controller/_container.tpl
+7 -10
View File
@@ -81,24 +81,21 @@
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if or .Values.envFrom .Values.secret }}
envFrom: envFrom:
{{- range $key, $value := .Values.envFrom }} {{- range .Values.envFrom -}}
{{- if $value.secretKeyRef }} {{- if .secretRef }}
- secretKeyRef: - secretRef:
name: {{ tpl $value.secretKeyRef.name $ | quote }} name: {{ tpl .secretRef.name $ | quote }}
{{- else if $value.configMapRef }} {{- else if .configMapRef }}
- configMapRef: - configMapRef:
name: {{ tpl $value.configMapRef.name $ | quote }} name: {{ tpl .configMapRef.name $ | quote }}
{{- else }} {{- else }}
{{- toYaml $value | nindent 4 }}
{{- end }}
{{- end }} {{- end }}
{{- end -}}
{{- if .Values.secret }} {{- if .Values.secret }}
- secretRef: - secretRef:
name: {{ include "common.names.fullname" . }} name: {{ include "common.names.fullname" . }}
{{- end }} {{- end }}
{{- end }}
{{- include "common.controller.ports" . | trim | nindent 2 }} {{- include "common.controller.ports" . | trim | nindent 2 }}
{{- with (include "common.controller.volumeMounts" . | trim) }} {{- with (include "common.controller.volumeMounts" . | trim) }}
volumeMounts: volumeMounts: