|
7 | 7 | {{- $values := $dot.Values.AsMap -}} |
8 | 8 | {{- $name := (default $dot.Chart.Name $values.nameOverride) -}} |
9 | 9 | {{- $_is_returning = true -}} |
10 | | -{{- (dict "r" (get (fromJson (include "console.cleanForK8s" (dict "a" (list $name) ))) "r")) | toJson -}} |
| 10 | +{{- (dict "r" (get (fromJson (include "console.cleanForK8s" (dict "a" (list $name)))) "r")) | toJson -}} |
11 | 11 | {{- break -}} |
12 | 12 | {{- end -}} |
13 | 13 | {{- end -}} |
|
19 | 19 | {{- $values := $dot.Values.AsMap -}} |
20 | 20 | {{- if (ne $values.fullnameOverride "") -}} |
21 | 21 | {{- $_is_returning = true -}} |
22 | | -{{- (dict "r" (get (fromJson (include "console.cleanForK8s" (dict "a" (list $values.fullnameOverride) ))) "r")) | toJson -}} |
| 22 | +{{- (dict "r" (get (fromJson (include "console.cleanForK8s" (dict "a" (list $values.fullnameOverride)))) "r")) | toJson -}} |
23 | 23 | {{- break -}} |
24 | 24 | {{- end -}} |
25 | 25 | {{- $name := (default $dot.Chart.Name $values.nameOverride) -}} |
26 | 26 | {{- if (contains $name $dot.Release.Name) -}} |
27 | 27 | {{- $_is_returning = true -}} |
28 | | -{{- (dict "r" (get (fromJson (include "console.cleanForK8s" (dict "a" (list $dot.Release.Name) ))) "r")) | toJson -}} |
| 28 | +{{- (dict "r" (get (fromJson (include "console.cleanForK8s" (dict "a" (list $dot.Release.Name)))) "r")) | toJson -}} |
29 | 29 | {{- break -}} |
30 | 30 | {{- end -}} |
31 | 31 | {{- $_is_returning = true -}} |
32 | | -{{- (dict "r" (get (fromJson (include "console.cleanForK8s" (dict "a" (list (printf "%s-%s" $dot.Release.Name $name)) ))) "r")) | toJson -}} |
| 32 | +{{- (dict "r" (get (fromJson (include "console.cleanForK8s" (dict "a" (list (printf "%s-%s" $dot.Release.Name $name))))) "r")) | toJson -}} |
33 | 33 | {{- break -}} |
34 | 34 | {{- end -}} |
35 | 35 | {{- end -}} |
|
40 | 40 | {{- $_is_returning := false -}} |
41 | 41 | {{- $chart := (printf "%s-%s" $dot.Chart.Name $dot.Chart.Version) -}} |
42 | 42 | {{- $_is_returning = true -}} |
43 | | -{{- (dict "r" (get (fromJson (include "console.cleanForK8s" (dict "a" (list (replace "+" "_" $chart)) ))) "r")) | toJson -}} |
| 43 | +{{- (dict "r" (get (fromJson (include "console.cleanForK8s" (dict "a" (list (replace "+" "_" $chart))))) "r")) | toJson -}} |
44 | 44 | {{- break -}} |
45 | 45 | {{- end -}} |
46 | 46 | {{- end -}} |
|
50 | 50 | {{- range $_ := (list 1) -}} |
51 | 51 | {{- $_is_returning := false -}} |
52 | 52 | {{- $values := $dot.Values.AsMap -}} |
53 | | -{{- $labels := (dict "helm.sh/chart" (get (fromJson (include "console.ChartLabel" (dict "a" (list $dot) ))) "r") "app.kubernetes.io/managed-by" $dot.Release.Service ) -}} |
| 53 | +{{- $labels := (dict "helm.sh/chart" (get (fromJson (include "console.ChartLabel" (dict "a" (list $dot)))) "r") "app.kubernetes.io/managed-by" $dot.Release.Service) -}} |
54 | 54 | {{- if (ne $dot.Chart.AppVersion "") -}} |
55 | 55 | {{- $_ := (set $labels "app.kubernetes.io/version" $dot.Chart.AppVersion) -}} |
56 | 56 | {{- end -}} |
57 | 57 | {{- $_is_returning = true -}} |
58 | | -{{- (dict "r" (merge (dict ) $labels (get (fromJson (include "console.SelectorLabels" (dict "a" (list $dot) ))) "r") $values.commonLabels)) | toJson -}} |
| 58 | +{{- (dict "r" (merge (dict) $labels (get (fromJson (include "console.SelectorLabels" (dict "a" (list $dot)))) "r") $values.commonLabels)) | toJson -}} |
59 | 59 | {{- break -}} |
60 | 60 | {{- end -}} |
61 | 61 | {{- end -}} |
|
65 | 65 | {{- range $_ := (list 1) -}} |
66 | 66 | {{- $_is_returning := false -}} |
67 | 67 | {{- $_is_returning = true -}} |
68 | | -{{- (dict "r" (dict "app.kubernetes.io/name" (get (fromJson (include "console.Name" (dict "a" (list $dot) ))) "r") "app.kubernetes.io/instance" $dot.Release.Name )) | toJson -}} |
| 68 | +{{- (dict "r" (dict "app.kubernetes.io/name" (get (fromJson (include "console.Name" (dict "a" (list $dot)))) "r") "app.kubernetes.io/instance" $dot.Release.Name)) | toJson -}} |
69 | 69 | {{- break -}} |
70 | 70 | {{- end -}} |
71 | 71 | {{- end -}} |
|
0 commit comments