accept encoded secret (#121)

* accept encoded secret * accept encoded secret
SAP · Jan 9, 2022 · b7d9cb2 · b7d9cb2
1 parent d617b24
commit b7d9cb2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/sapbtp-operator-charts/templates/secret-tls.yml b/sapbtp-operator-charts/templates/secret-tls.yml
@@ -6,6 +6,11 @@ metadata:
   namespace: {{ .Release.Namespace }}
 type: kubernetes.io/tls
 data:
+  {{- if .Values.manager.secret.b64encoded }}
+  tls.crt: {{ .Values.manager.secret.tls.crt }}
+  tls.key: {{ .Values.manager.secret.tls.key }}
+  {{- else}}
   tls.crt: {{ .Values.manager.secret.tls.crt | b64enc }}
   tls.key: {{ .Values.manager.secret.tls.key | b64enc }}
+  {{- end }}
 {{- end }}
diff --git a/sapbtp-operator-charts/templates/secret.yml b/sapbtp-operator-charts/templates/secret.yml
@@ -6,19 +6,16 @@ metadata:
   namespace: {{ .Release.Namespace }}
 type: Opaque
 data:
-  {{- if .Values.manager.secret.clientid }}
+  {{- if .Values.manager.secret.b64encoded }}
+  clientid: {{ .Values.manager.secret.clientid | quote }}
+  clientsecret: {{ .Values.manager.secret.clientsecret | quote }}
+  url: {{ .Values.manager.secret.url | quote }}
+  tokenurl: {{ .Values.manager.secret.tokenurl | quote }}
+  {{- else}}
   clientid: {{ .Values.manager.secret.clientid | b64enc | quote }}
-  {{- end }}
-  {{- if .Values.manager.secret.clientsecret }}
   clientsecret: {{ .Values.manager.secret.clientsecret | b64enc | quote }}
-  {{- end }}
-  {{- if .Values.manager.secret.url }}
   url: {{ .Values.manager.secret.url | b64enc | quote }}
-  {{- end }}
-  {{- if .Values.manager.secret.tokenurl }}
   tokenurl: {{ .Values.manager.secret.tokenurl | b64enc | quote }}
   {{- end }}
-  {{- if .Values.manager.secret.tokenurlsuffix }}
   tokenurlsuffix: {{ .Values.manager.secret.tokenurlsuffix | b64enc | quote }}
-  {{- end }}
 {{ end }}
diff --git a/sapbtp-operator-charts/values.yaml b/sapbtp-operator-charts/values.yaml
@@ -11,6 +11,7 @@ manager:
     repository: ghcr.io/sap/sap-btp-service-operator/controller
     tag: master
   secret:
+    b64encoded: false
     enabled: true
     tls:
       crt: