Skip to content

Commit d733590

Browse files
authored
Merge pull request #28 from kevinscholz/fix-var-check-in-secret-template
Fix empty check in secret.yaml template
2 parents 9e76e4e + b710510 commit d733590

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

  • helm/designate-certmanager-webhook/templates
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if (.Values.openstack.username) and (ne .Values.openstack.username "") and (.Values.openstack.password) and (ne .Values.openstack.password "") }}
1+
{{- if and .Values.openstack.username .Values.openstack.password }}
22
apiVersion: v1
33
kind: Secret
44
metadata:
@@ -10,22 +10,22 @@ metadata:
1010
heritage: {{ .Release.Service | quote }}
1111
type: Opaque
1212
data:
13-
{{- if (.Values.openstack.username) and (ne .Values.openstack.username "") }}
13+
{{- if .Values.openstack.username }}
1414
OS_USERNAME: {{ .Values.openstack.username | b64enc | quote }}
1515
{{- end }}
16-
{{- if (.Values.openstack.password) and (ne .Values.openstack.password "") }}
16+
{{- if .Values.openstack.password }}
1717
OS_PASSWORD: {{ .Values.openstack.password | b64enc | quote }}
1818
{{- end }}
19-
{{- if (.Values.openstack.project_id) and (ne .Values.openstack.project_id "") }}
19+
{{- if .Values.openstack.project_id }}
2020
OS_PROJECT_ID: {{ .Values.openstack.project_id | b64enc | quote }}
2121
{{- end }}
22-
{{- if (.Values.openstack.region_name) and (ne .Values.openstack.region_name "") }}
22+
{{- if .Values.openstack.region_name }}
2323
OS_REGION_NAME: {{ .Values.openstack.region_name | b64enc | quote }}
2424
{{- end }}
25-
{{- if (.Values.openstack.auth_url) and (ne .Values.openstack.auth_url "") }}
25+
{{- if .Values.openstack.auth_url }}
2626
OS_AUTH_URL: {{ .Values.openstack.auth_url | b64enc | quote }}
2727
{{- end }}
28-
{{- if (.Values.openstack.domain_name) and (ne .Values.openstack.domain_name "") }}
28+
{{- if .Values.openstack.domain_name }}
2929
OS_DOMAIN_NAME: {{ .Values.openstack.domain_name | b64enc | quote }}
3030
{{- end }}
3131
{{- end }}

0 commit comments

Comments
 (0)