diff --git a/custom-src/deploy/kubernetes/customize-helm.sh b/custom-src/deploy/kubernetes/customize-helm.sh index 6284fe6c35..e57c571440 100755 --- 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 index 2acedc0bca..1eeab2affd 100644 --- 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 index 63cdb0e7e8..4a1a02e06d 100644 --- 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