add value valuesAreBase64Encoded to indicate whether secret values ar…

…e already encoded (#20)
estafette · Nov 11, 2019 · 227d578 · 227d578
1 parent a38c583
commit 227d578
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.estafette.yaml b/.estafette.yaml
@@ -10,9 +10,9 @@ version:
   semver:
     major: 1
     minor: 2
-    patch: 1
+    patch: 2
     labelTemplate: '{{branch}}-{{auto}}'
-    releaseBranch: 1.2.1
+    releaseBranch: 1.2.2
 
 stages:
   build-lint-and-package:

diff --git a/helm/estafette-gke-node-pool-shifter/templates/secret.yaml b/helm/estafette-gke-node-pool-shifter/templates/secret.yaml
@@ -13,5 +13,9 @@ metadata:
 type: Opaque
 {{- if not .Values.secret.useGcpServiceAccountAnnotation }}
 data:
+  {{- if .Values.valuesAreBase64Encoded }}
+  service-account-key.json: {{.Values.secret.googleServiceAccountKeyfileJson | toString}}
+  {{- else }}
   service-account-key.json: {{.Values.secret.googleServiceAccountKeyfileJson | toString | b64enc}}
+  {{- end }}
 {{- end }}
diff --git a/helm/estafette-gke-node-pool-shifter/values.yaml b/helm/estafette-gke-node-pool-shifter/values.yaml
@@ -19,6 +19,9 @@ nodePoolTo: node-pool-b
 nodePoolFromMinNode: 0
 
 secret:
+  # if set to true the values are already base64 encoded when provided, otherwise the template performs the base64 encoding
+  valuesAreBase64Encoded: false
+
   # when using estafette-gcp-service account controller to fetch key files, set this to true and leave googleServiceAccountKeyfileJson empty
   useGcpServiceAccountAnnotation: false