Skip to content

Commit c9a1d4e

Browse files
authored
Allow for passing in a raw string for the defaultTags (#98)
1 parent 25a23c0 commit c9a1d4e

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

charts/k8s-pvc-tagger/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ keywords:
1616
sources:
1717
- https://github.com/mtougeron/k8s-pvc-tagger
1818

19-
version: 2.1.1
19+
version: 2.2.0
2020
appVersion: v1.1.0

charts/k8s-pvc-tagger/templates/deployment.yaml

+6-2
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,18 @@ spec:
3333
- --annotation-prefix={{ .Values.annotationPrefix }}
3434
{{- end }}
3535
{{- if .Values.defaultTags }}
36-
- --default-tags={{ tpl (.Values.defaultTags) $ | toJson }}
36+
{{- if kindIs "string" .Values.defaultTags }}
37+
- '--default-tags={{ tpl (.Values.defaultTags) $ }}'
38+
{{- else }}
39+
- '--default-tags={{ tpl (.Values.defaultTags | toJson) $ }}'
40+
{{- end }}
3741
{{- end }}
3842
{{- if .Values.watchNamespace }}
3943
- --watch-namespace={{ .Values.watchNamespace }}
4044
{{- end }}
4145
{{- range $key, $value := .Values.extraArgs }}
4246
{{- if $value }}
43-
- --{{ $key }}={{ $value }}
47+
- --{{ $key }}={{ tpl $value $ }}
4448
{{- else }}
4549
- --{{ $key }}
4650
{{- end }}

0 commit comments

Comments
 (0)