Skip to content

Commit e47d197

Browse files
petewallpetewall
authored
Equivalent templates but removes break and continue, which are only on newer versions of Helm (#1170)
Signed-off-by: Pete Wall <[email protected]>
1 parent 538fe77 commit e47d197

File tree

2 files changed

+52
-60
lines changed

2 files changed

+52
-60
lines changed

‎charts/k8s-monitoring/charts/feature-integrations/templates/secrets/_helpers.tpl

+26-30
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@ create
2222
{{- define "secrets.getSecretFromRef" -}}
2323
{{- $value := .object -}}
2424
{{- range $pathPart := (regexSplit "\\." (printf "%sFrom" .key) -1) -}} {{/* "path.to.auth.password" --> ["path", "to", "auth" "passwordFrom"] */}}
25-
{{- if not $pathPart -}}
26-
{{- continue -}}
27-
{{- else if hasKey $value $pathPart -}}
28-
{{- $value = (index $value $pathPart) -}}
29-
{{- else -}}
30-
{{- $value = "" -}}
31-
{{- break -}}
25+
{{- if $pathPart -}}
26+
{{- if and (not (kindIs "string" $value)) (hasKey $value $pathPart) -}}
27+
{{- $value = (index $value $pathPart) -}}
28+
{{- else -}}
29+
{{- $value = "" -}}
30+
{{- end -}}
3231
{{- end -}}
3332
{{- end -}}
3433
{{- $value -}}
@@ -40,13 +39,12 @@ create
4039
{{- $value := .object -}}
4140
{{- $defaultKey := (( regexSplit "\\." .key -1) | last) -}} {{/* "path.to.auth.password" --> "password" */}}
4241
{{- range $pathPart := (regexSplit "\\." (printf "%sKey" .key) -1) -}} {{/* "path.to.auth.password" --> ["path", "to", "auth" "passwordKey"] */}}
43-
{{- if not $pathPart -}}
44-
{{- continue -}}
45-
{{- else if hasKey $value $pathPart -}}
46-
{{- $value = (index $value $pathPart) -}}
47-
{{- else -}}
48-
{{- $value = $defaultKey -}}
49-
{{- break -}}
42+
{{- if $pathPart -}}
43+
{{- if and (not (kindIs "string" $value)) (hasKey $value $pathPart) -}}
44+
{{- $value = (index $value $pathPart) -}}
45+
{{- else -}}
46+
{{- $value = $defaultKey -}}
47+
{{- end -}}
5048
{{- end -}}
5149
{{- end -}}
5250
{{- $value -}}
@@ -58,13 +56,12 @@ create
5856
{{- $found := true}}
5957
{{- $value := .object -}}
6058
{{- range $pathPart := (regexSplit "\\." (printf "%sKey" .key) -1) -}} {{/* "path.to.auth.password" --> ["path", "to", "auth" "passwordKey"] */}}
61-
{{- if not $pathPart -}}
62-
{{- continue -}}
63-
{{- else if hasKey $value $pathPart -}}
64-
{{- $value = (index $value $pathPart) -}}
65-
{{- else -}}
66-
{{- $found = false -}}
67-
{{- break -}}
59+
{{- if $pathPart -}}
60+
{{- if and (not (kindIs "string" $value)) (hasKey $value $pathPart) -}}
61+
{{- $value = (index $value $pathPart) -}}
62+
{{- else -}}
63+
{{- $found = false -}}
64+
{{- end -}}
6865
{{- end -}}
6966
{{- end -}}
7067
{{- $found -}}
@@ -75,13 +72,12 @@ create
7572
{{- define "secrets.getSecretValue" }}
7673
{{- $value := .object -}}
7774
{{- range $pathPart := (regexSplit "\\." .key -1) -}} {{/* "path.to.auth.password" --> ["path", "to", "auth" "password"] */}}
78-
{{- if not $pathPart -}}
79-
{{- continue -}}
80-
{{- else if hasKey $value $pathPart -}}
81-
{{- $value = (index $value $pathPart) -}}
82-
{{- else -}}
83-
{{- $value = "" -}}
84-
{{- break -}}
75+
{{- if $pathPart -}}
76+
{{- if and (not (kindIs "string" $value)) (hasKey $value $pathPart) -}}
77+
{{- $value = (index $value $pathPart) -}}
78+
{{- else -}}
79+
{{- $value = "" -}}
80+
{{- end -}}
8581
{{- end -}}
8682
{{- end -}}
8783
{{- $value -}}
@@ -129,9 +125,9 @@ remote.kubernetes.secret.{{ include "helper.alloy_name" .object.name }}.data[{{
129125
{{- $keyDefined := include "secrets.isSecretKeyDefined" (dict "object" $ "key" $secret) -}}
130126
{{- $value := include "secrets.getSecretValue" (dict "object" $ "key" $secret) -}}
131127
{{- if (eq $secretType "external") }}
132-
{{- if eq $keyDefined "true" }}{{- $usesK8sSecret = true }}{{ break }}{{- end }}
128+
{{- if eq $keyDefined "true" }}{{- $usesK8sSecret = true }}{{- end }}
133129
{{- else }}
134-
{{- if and $value (not $ref) }}{{- $usesK8sSecret = true }}{{ break }}{{- end }}
130+
{{- if and $value (not $ref) }}{{- $usesK8sSecret = true }}{{- end }}
135131
{{- end }}
136132
{{- end }}
137133
{{- $usesK8sSecret -}}

‎charts/k8s-monitoring/templates/secrets/_helpers.tpl

+26-30
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@ create
2222
{{- define "secrets.getSecretFromRef" -}}
2323
{{- $value := .object -}}
2424
{{- range $pathPart := (regexSplit "\\." (printf "%sFrom" .key) -1) -}} {{/* "path.to.auth.password" --> ["path", "to", "auth" "passwordFrom"] */}}
25-
{{- if not $pathPart -}}
26-
{{- continue -}}
27-
{{- else if hasKey $value $pathPart -}}
28-
{{- $value = (index $value $pathPart) -}}
29-
{{- else -}}
30-
{{- $value = "" -}}
31-
{{- break -}}
25+
{{- if $pathPart -}}
26+
{{- if and (not (kindIs "string" $value)) (hasKey $value $pathPart) -}}
27+
{{- $value = (index $value $pathPart) -}}
28+
{{- else -}}
29+
{{- $value = "" -}}
30+
{{- end -}}
3231
{{- end -}}
3332
{{- end -}}
3433
{{- $value -}}
@@ -40,13 +39,12 @@ create
4039
{{- $value := .object -}}
4140
{{- $defaultKey := (( regexSplit "\\." .key -1) | last) -}} {{/* "path.to.auth.password" --> "password" */}}
4241
{{- range $pathPart := (regexSplit "\\." (printf "%sKey" .key) -1) -}} {{/* "path.to.auth.password" --> ["path", "to", "auth" "passwordKey"] */}}
43-
{{- if not $pathPart -}}
44-
{{- continue -}}
45-
{{- else if hasKey $value $pathPart -}}
46-
{{- $value = (index $value $pathPart) -}}
47-
{{- else -}}
48-
{{- $value = $defaultKey -}}
49-
{{- break -}}
42+
{{- if $pathPart -}}
43+
{{- if and (not (kindIs "string" $value)) (hasKey $value $pathPart) -}}
44+
{{- $value = (index $value $pathPart) -}}
45+
{{- else -}}
46+
{{- $value = $defaultKey -}}
47+
{{- end -}}
5048
{{- end -}}
5149
{{- end -}}
5250
{{- $value -}}
@@ -58,13 +56,12 @@ create
5856
{{- $found := true}}
5957
{{- $value := .object -}}
6058
{{- range $pathPart := (regexSplit "\\." (printf "%sKey" .key) -1) -}} {{/* "path.to.auth.password" --> ["path", "to", "auth" "passwordKey"] */}}
61-
{{- if not $pathPart -}}
62-
{{- continue -}}
63-
{{- else if hasKey $value $pathPart -}}
64-
{{- $value = (index $value $pathPart) -}}
65-
{{- else -}}
66-
{{- $found = false -}}
67-
{{- break -}}
59+
{{- if $pathPart -}}
60+
{{- if and (not (kindIs "string" $value)) (hasKey $value $pathPart) -}}
61+
{{- $value = (index $value $pathPart) -}}
62+
{{- else -}}
63+
{{- $found = false -}}
64+
{{- end -}}
6865
{{- end -}}
6966
{{- end -}}
7067
{{- $found -}}
@@ -75,13 +72,12 @@ create
7572
{{- define "secrets.getSecretValue" }}
7673
{{- $value := .object -}}
7774
{{- range $pathPart := (regexSplit "\\." .key -1) -}} {{/* "path.to.auth.password" --> ["path", "to", "auth" "password"] */}}
78-
{{- if not $pathPart -}}
79-
{{- continue -}}
80-
{{- else if hasKey $value $pathPart -}}
81-
{{- $value = (index $value $pathPart) -}}
82-
{{- else -}}
83-
{{- $value = "" -}}
84-
{{- break -}}
75+
{{- if $pathPart -}}
76+
{{- if and (not (kindIs "string" $value)) (hasKey $value $pathPart) -}}
77+
{{- $value = (index $value $pathPart) -}}
78+
{{- else -}}
79+
{{- $value = "" -}}
80+
{{- end -}}
8581
{{- end -}}
8682
{{- end -}}
8783
{{- $value -}}
@@ -129,9 +125,9 @@ remote.kubernetes.secret.{{ include "helper.alloy_name" .object.name }}.data[{{
129125
{{- $keyDefined := include "secrets.isSecretKeyDefined" (dict "object" $ "key" $secret) -}}
130126
{{- $value := include "secrets.getSecretValue" (dict "object" $ "key" $secret) -}}
131127
{{- if (eq $secretType "external") }}
132-
{{- if eq $keyDefined "true" }}{{- $usesK8sSecret = true }}{{ break }}{{- end }}
128+
{{- if eq $keyDefined "true" }}{{- $usesK8sSecret = true }}{{- end }}
133129
{{- else }}
134-
{{- if and $value (not $ref) }}{{- $usesK8sSecret = true }}{{ break }}{{- end }}
130+
{{- if and $value (not $ref) }}{{- $usesK8sSecret = true }}{{- end }}
135131
{{- end }}
136132
{{- end }}
137133
{{- $usesK8sSecret -}}

0 commit comments

Comments
 (0)