Merge pull request #11 from estafette/adjust-helm-chart

Adjust Helm chart and installation instructions
estafette · Nov 30, 2018 · 0e7a5ff · 0e7a5ff
2 parents 497ff81 + 52385ba
commit 0e7a5ff
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -28,10 +28,22 @@ the GCloud API. See [documentation](https://developers.google.com/identity/proto
 ### Deploy with Helm
 
 ```
-brew install kubernetes-helm
-helm init --history-max 25 --upgrade
-helm package chart/estafette-gke-node-pool-shifter --version 1.0.11
-helm upgrade estafette-gke-node-pool-shifter estafette-gke-node-pool-shifter-1.0.11.tgz --namespace estafette --install --set rbac.create=true --set googleServiceAccount=$(./google_service_account.json | base64)
+# Prepare Helm/Tiller
+$ kubectl create sa tiller -n kube-system
+$ helm init --service-account tiller
+$ kubectl create clusterrolebinding tiller \
+    --clusterrole=cluster-admin \
+    --serviceaccount=kube-system:tiller
+
+# Install
+$ helm upgrade estafette-gke-node-pool-shifter \
+    --namespace estafette \
+    --install \
+    --set rbac.create=true \
+    --set-file googleServiceAccount=./google_service_account.json \
+    --set nodePool.from=default-pool \
+    --set nodePool.to=preemptible-pool \
+    chart/estafette-gke-node-pool-shifter
 ```
 
 ### Deploy without Helm

diff --git a/chart/estafette-gke-node-pool-shifter/templates/secret.yaml b/chart/estafette-gke-node-pool-shifter/templates/secret.yaml
@@ -9,5 +9,4 @@ metadata:
     {{- end }}
 type: Opaque
 data:
-  # Waiting for https://github.com/kubernetes/helm/issues/1754
-  google-service-account.json: {{ .Values.googleServiceAccount }}
+  google-service-account.json: {{ .Values.googleServiceAccount | b64enc }}