|
79 | 79 | {{- end -}} |
80 | 80 | {{- if (ne (toJson $kafka.sasl) "null") -}} |
81 | 81 | {{- $_ := (set $cfg "sasl" (mustMergeOverwrite (dict) (dict "enabled" true "username" $kafka.sasl.username "mechanism" (toString $kafka.sasl.mechanism)))) -}} |
| 82 | +{{- if (ne (toJson $kafka.sasl.passwordSecretRef) "null") -}} |
82 | 83 | {{- $_ := (get (fromJson (include "console.configMapper.addEnv" (dict "a" (list $m "KAFKA_SASL_PASSWORD" $kafka.sasl.passwordSecretRef)))) "r") -}} |
83 | 84 | {{- end -}} |
| 85 | +{{- end -}} |
84 | 86 | {{- $_is_returning = true -}} |
85 | 87 | {{- (dict "r" $cfg) | toJson -}} |
86 | 88 | {{- break -}} |
|
104 | 106 | {{- end -}} |
105 | 107 | {{- if (ne (toJson $schema.sasl) "null") -}} |
106 | 108 | {{- $_ := (set $cfg "authentication" (mustMergeOverwrite (dict) (dict "basic" (mustMergeOverwrite (dict) (dict "username" $schema.sasl.username))))) -}} |
107 | | -{{- $_ := (get (fromJson (include "console.configMapper.addEnv" (dict "a" (list $m "SCHEMAREGISTRY_AUTHENTICATION_BASIC_PASSWORD" $schema.sasl.passwordSecretRef)))) "r") -}} |
| 109 | +{{- $_ := (get (fromJson (include "console.configMapper.addEnv" (dict "a" (list $m "SCHEMAREGISTRY_AUTHENTICATION_BASIC_PASSWORD" $schema.sasl.password)))) "r") -}} |
108 | 110 | {{- $_ := (get (fromJson (include "console.configMapper.addEnv" (dict "a" (list $m "SCHEMAREGISTRY_AUTHENTICATION_BEARERTOKEN" $schema.sasl.token)))) "r") -}} |
109 | 111 | {{- end -}} |
110 | 112 | {{- $_is_returning = true -}} |
|
127 | 129 | {{- if $tls.insecureSkipTlsVerify -}} |
128 | 130 | {{- $_ := (set $out "insecureSkipTlsVerify" $tls.insecureSkipTlsVerify) -}} |
129 | 131 | {{- end -}} |
130 | | -{{- $ca_7 := (get (fromJson (include "console.volumes.MaybeAdd" (dict "a" (list $m.Volumes $tls.caCertSecretRef)))) "r") -}} |
| 132 | +{{- $ca_7 := (get (fromJson (include "console.volumes.MaybeAdd" (dict "a" (list $m.Volumes $tls.caCert)))) "r") -}} |
131 | 133 | {{- if (ne (toJson $ca_7) "null") -}} |
132 | 134 | {{- $_ := (set $out "caFilepath" $ca_7) -}} |
133 | 135 | {{- end -}} |
134 | | -{{- $cert_8 := (get (fromJson (include "console.volumes.MaybeAddSecret" (dict "a" (list $m.Volumes $tls.certSecretRef)))) "r") -}} |
| 136 | +{{- $cert_8 := (get (fromJson (include "console.volumes.MaybeAddSecret" (dict "a" (list $m.Volumes $tls.cert)))) "r") -}} |
135 | 137 | {{- if (ne (toJson $cert_8) "null") -}} |
136 | 138 | {{- $_ := (set $out "certFilepath" $cert_8) -}} |
137 | 139 | {{- end -}} |
138 | | -{{- $key_9 := (get (fromJson (include "console.volumes.MaybeAddSecret" (dict "a" (list $m.Volumes $tls.keySecretRef)))) "r") -}} |
| 140 | +{{- $key_9 := (get (fromJson (include "console.volumes.MaybeAddSecret" (dict "a" (list $m.Volumes $tls.key)))) "r") -}} |
139 | 141 | {{- if (ne (toJson $key_9) "null") -}} |
140 | 142 | {{- $_ := (set $out "keyFilepath" $key_9) -}} |
141 | 143 | {{- end -}} |
|
148 | 150 | {{- define "console.configMapper.addEnv" -}} |
149 | 151 | {{- $m := (index .a 0) -}} |
150 | 152 | {{- $name := (index .a 1) -}} |
151 | | -{{- $ref := (index .a 2) -}} |
| 153 | +{{- $secretRef := (index .a 2) -}} |
152 | 154 | {{- range $_ := (list 1) -}} |
153 | 155 | {{- $_is_returning := false -}} |
| 156 | +{{- if (or (eq (toJson $secretRef) "null") (eq (toJson $secretRef.secretKeyRef) "null")) -}} |
| 157 | +{{- $_is_returning = true -}} |
| 158 | +{{- (dict "r" (list)) | toJson -}} |
| 159 | +{{- break -}} |
| 160 | +{{- end -}} |
| 161 | +{{- $ref := $secretRef.secretKeyRef -}} |
154 | 162 | {{- if (or (eq $ref.key "") (eq $ref.name "")) -}} |
155 | 163 | {{- $_is_returning = true -}} |
156 | 164 | {{- (dict "r" (list)) | toJson -}} |
|
179 | 187 | {{- $skr_11 := $ref.secretKeyRef -}} |
180 | 188 | {{- if (ne (toJson $skr_11) "null") -}} |
181 | 189 | {{- $_is_returning = true -}} |
182 | | -{{- (dict "r" (get (fromJson (include "console.volumes.MaybeAddSecret" (dict "a" (list $v (mustMergeOverwrite (dict "name" "") (dict "name" $skr_11.name "key" $skr_11.key)))))) "r")) | toJson -}} |
| 190 | +{{- (dict "r" (get (fromJson (include "console.volumes.MaybeAddSecret" (dict "a" (list $v (mustMergeOverwrite (dict) (dict "secretKeyRef" (mustMergeOverwrite (dict "key" "") (mustMergeOverwrite (dict) (dict "name" $skr_11.name)) (dict "key" $skr_11.key)))))))) "r")) | toJson -}} |
183 | 191 | {{- break -}} |
184 | 192 | {{- end -}} |
185 | 193 | {{- $_is_returning = true -}} |
|
198 | 206 | {{- (dict "r" (coalesce nil)) | toJson -}} |
199 | 207 | {{- break -}} |
200 | 208 | {{- end -}} |
201 | | -{{- $_236___ok_12 := (get (fromJson (include "_shims.dicttest" (dict "a" (list $v.ConfigMaps $ref.name (coalesce nil))))) "r") -}} |
202 | | -{{- $_ := (index $_236___ok_12 0) -}} |
203 | | -{{- $ok_12 := (index $_236___ok_12 1) -}} |
| 209 | +{{- $_245___ok_12 := (get (fromJson (include "_shims.dicttest" (dict "a" (list $v.ConfigMaps $ref.name (coalesce nil))))) "r") -}} |
| 210 | +{{- $_ := (index $_245___ok_12 0) -}} |
| 211 | +{{- $ok_12 := (index $_245___ok_12 1) -}} |
204 | 212 | {{- if (not $ok_12) -}} |
205 | 213 | {{- $_ := (set $v.ConfigMaps $ref.name (dict)) -}} |
206 | 214 | {{- end -}} |
|
213 | 221 |
|
214 | 222 | {{- define "console.volumes.MaybeAddSecret" -}} |
215 | 223 | {{- $v := (index .a 0) -}} |
216 | | -{{- $ref := (index .a 1) -}} |
| 224 | +{{- $secretRef := (index .a 1) -}} |
217 | 225 | {{- range $_ := (list 1) -}} |
218 | 226 | {{- $_is_returning := false -}} |
| 227 | +{{- if (or (eq (toJson $secretRef) "null") (eq (toJson $secretRef.secretKeyRef) "null")) -}} |
| 228 | +{{- $_is_returning = true -}} |
| 229 | +{{- (dict "r" (coalesce nil)) | toJson -}} |
| 230 | +{{- break -}} |
| 231 | +{{- end -}} |
| 232 | +{{- $ref := $secretRef.secretKeyRef -}} |
219 | 233 | {{- if (or (eq (toJson $ref) "null") ((and (eq $ref.key "") (eq $ref.name "")))) -}} |
220 | 234 | {{- $_is_returning = true -}} |
221 | 235 | {{- (dict "r" (coalesce nil)) | toJson -}} |
222 | 236 | {{- break -}} |
223 | 237 | {{- end -}} |
224 | | -{{- $_248___ok_13 := (get (fromJson (include "_shims.dicttest" (dict "a" (list $v.Secrets $ref.name (coalesce nil))))) "r") -}} |
225 | | -{{- $_ := (index $_248___ok_13 0) -}} |
226 | | -{{- $ok_13 := (index $_248___ok_13 1) -}} |
| 238 | +{{- $_262___ok_13 := (get (fromJson (include "_shims.dicttest" (dict "a" (list $v.Secrets $ref.name (coalesce nil))))) "r") -}} |
| 239 | +{{- $_ := (index $_262___ok_13 0) -}} |
| 240 | +{{- $ok_13 := (index $_262___ok_13 1) -}} |
227 | 241 | {{- if (not $ok_13) -}} |
228 | 242 | {{- $_ := (set $v.Secrets $ref.name (dict)) -}} |
229 | 243 | {{- end -}} |
|
0 commit comments