|
@@ -4,7 +4,7 @@ Retrieve true/false if certificate is available in ixCertificates
|
|
|
{{- define "common.resources.cert_present" -}}
|
|
|
{{- $values := . -}}
|
|
|
{{- include "common.schema.validateKeys" (dict "values" . "checkKeys" (list "commonCertOptions")) -}}
|
|
|
-{{- hasKey $values.ixCertificates $values.commonCertOptions.certKeyName -}}
|
|
|
+{{- hasKey $values.Values.ixCertificates ($values.commonCertOptions.certKeyName | toString) -}}
|
|
|
{{- end -}}
|
|
|
|
|
|
|
|
@@ -14,8 +14,9 @@ Retrieve certificate from variable name
|
|
|
{{- define "common.resources.cert" -}}
|
|
|
{{- $values := . -}}
|
|
|
{{- include "common.schema.validateKeys" (dict "values" . "checkKeys" (list "commonCertOptions")) -}}
|
|
|
-{{- if hasKey $values.ixCertificates $values.commonCertOptions.certKeyName -}}
|
|
|
-{{- $cert := get $values.ixCertificates $values.commonCertOptions.certKeyName -}}
|
|
|
+{{- $certKey := ($values.commonCertOptions.certKeyName | toString) -}}
|
|
|
+{{- if hasKey $values.Values.ixCertificates $certKey -}}
|
|
|
+{{- $cert := get $values.Values.ixCertificates $certKey -}}
|
|
|
{{- if $values.commonCertOptions.publicKey -}}
|
|
|
{{ $cert.certificate }}
|
|
|
{{- else -}}
|