Merge pull request #169 from paullatzelsperger/fix/168_helm_chart_azu…

…re_keyvault Fix: `vault.azure.clientsecret` and `vault.azure.certificate` should be null if not configured
eclipse-tractusx · Mar 30, 2023 · 0cc6d68 · 0cc6d68
2 parents 6707719 + d77e627
commit 0cc6d68
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -315,10 +315,16 @@ spec:
               value: {{ .Values.vault.azure.tenant | required ".Values.vault.azure.tenant is required" | quote }}
             - name: "EDC_VAULT_NAME"
               value: {{ .Values.vault.azure.name | required ".Values.vault.azure.name is required" | quote }}
+            # only set the env var if config value not null
+            {{- if .Values.vault.azure.secret }}
             - name: "EDC_VAULT_CLIENTSECRET"
               value: {{ .Values.vault.azure.secret | quote }}
+            {{- end }}
+            # only set the env var if config value not null
+            {{- if .Values.vault.azure.certificate }}
             - name: "EDC_VAULT_CERTIFICATE"
               value: {{ .Values.vault.azure.certificate | quote }}
+            {{- end }}
           {{- end }}
 
             #####################

diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
@@ -509,8 +509,8 @@ vault:
     name: ""
     client: ""
     tenant: ""
-    secret: ""
-    certificate: ""
+    secret:
+    certificate:
   secretNames:
     transferProxyTokenSignerPrivateKey: transfer-proxy-token-signer-private-key
     transferProxyTokenSignerPublicKey: transfer-proxy-token-signer-public-key