Skip to content

Commit dd98d35

Browse files
committed
fix: fix injecting configmap
1 parent 89aa855 commit dd98d35

3 files changed

Lines changed: 2 additions & 6 deletions

File tree

charts/common/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ maintainers:
77
- email: alex@kharkevich.org
88
name: Alexander Kharkevich
99
name: common
10-
version: 2.1.3
10+
version: 2.1.4

charts/common/templates/_container.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@ lifecycle:
2222
{{- end }}
2323
{{- end }}
2424
envFrom:
25-
{{- $configmapTemplate := (print $.Template.BasePath "/configmap.yaml") -}}
26-
{{- if hasKey (dict $.Template.Templates) $configmapTemplate -}}
25+
{{- $configmapTemplate := (print $.Template.BasePath "/configmap.yaml") }}
2726
- configMapRef:
2827
name: {{ template "common.fullname" . }}
29-
{{- end -}}
3028
{{ include "common.envvar.shared.configs" . | indent 2 }}
3129
{{ include "common.envvar.shared.secrets" . | indent 2 }}
3230
{{- if eq $healthCheck.kind "tcp" }}

charts/common/templates/_metadata_annotations.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ Any valid hook may be passed in. Separate multiple hooks with a ",".
2121
{{- $extended := default (dict) .Values.solution -}}
2222
{{- $lifecycle := default (dict) .Values.lifecycle -}}
2323
{{- $configmapTemplate := (print $.Template.BasePath "/configmap.yaml") -}}
24-
{{- if hasKey (dict $.Template.Templates) $configmapTemplate -}}
2524
checksum/config: {{ include $configmapTemplate . | sha256sum | trunc 63}}
26-
{{- end -}}
2725
{{- $prometheus := default (dict) .Values.prometheus -}}
2826
{{- if $prometheus }}
2927
prometheus.io/scrape: "true"

0 commit comments

Comments
 (0)