Helm chart updates for --recreate-pods (#382)

* Fix misaligned user button - fixes cloudfoundry#4316 * Temporarily add branch v3.2.1 to travis * check sso whitelist in more places Signed-off-by: Ben Berry <[email protected]> * refactor sso state checks into single function Signed-off-by: Ben Berry <[email protected]> * Update version * First pass at changelog (additional SSO fix required) * Update changelog * Fix package-lock.json * Remove v3.2.1 was .travis.taml * Remove need for --recreate-pods when upgrading * Add support for helm chart customizations * Removed change not needed * Apply recreate-pods fix to SUSE additional containers Co-authored-by: Richard Cox <[email protected]> Co-authored-by: Ben Berry <[email protected]> Co-authored-by: Richard Cox <[email protected]>
SUSE · Jun 23, 2020 · d64f5bf · d64f5bf
1 parent 8cc207d
commit d64f5bf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/custom-src/deploy/kubernetes/customize-helm.sh b/custom-src/deploy/kubernetes/customize-helm.sh
@@ -15,6 +15,11 @@ echo "Customizations folder: ${DIR}"
 echo "Chart folder         : ${CHART_PATH}"
 echo ""
 
+# ===========================================================================================
+# Copy our customization helper over the default, empty one
+# ===========================================================================================
+cp "${DIR}/__stratos.tpl" "${CHART_PATH}/templates/__stratos.tpl"
+
 # ===========================================================================================
 # Chart.yaml changes
 # ===========================================================================================
@@ -45,7 +50,6 @@ echo -e "${CYAN}Patching README.md${RESET}"
 sed -i.bak -e 's@Stratos@SUSE Stratos Console@g' ${CHART_PATH}/README.md
 
 # Change first paragraph to include Kubernetes
-console for Cloud Foundry.
 SRC="console for Cloud Foundry."
 DEST="console for Cloud Foundry and Kubernetes."
 sed -i.bak -e 's@'"${SRC}"'@'"${DEST}"'@g' ${CHART_PATH}/README.md

diff --git a/deploy/kubernetes/console/templates/chartsync.yaml b/deploy/kubernetes/console/templates/chartsync.yaml
@@ -34,6 +34,9 @@ spec:
         imagePullPolicy: {{.Values.imagePullPolicy}}
         command: ["/chartrepo"]
         args: ["serve", "--doclayer-url=mongodb://{{ .Release.Name }}-fdbdoclayer:27016", "--cafile=/etc/certs/ca.crt", "--certfile=/etc/certs/tls.crt", "--keyfile=/etc/certs/tls.key"]
+        env:
+        - name: STRATOS_IMAGE_REF
+          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
         ports:
         - name: endpoint
           containerPort: 8080

diff --git a/deploy/kubernetes/console/templates/fdbdoclayer/deployment.yaml b/deploy/kubernetes/console/templates/fdbdoclayer/deployment.yaml
@@ -52,6 +52,8 @@ spec:
         image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.fdbdoclayer}}:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         env:
+        - name: STRATOS_IMAGE_REF
+          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
         - name: FDB_COORDINATOR
           value: {{ .Release.Name }}-fdbdoclayer
         - name: FDB_LISTEN_IP
@@ -88,6 +90,8 @@ spec:
         image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.fdbserver}}:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         env:
+        - name: STRATOS_IMAGE_REF
+          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
         - name: FDB_COORDINATOR
           value: {{ .Release.Name }}-fdbdoclayer
         - name: FDB_LISTEN_IP