Skip to content

Commit

Permalink
Helm chart updates for --recreate-pods (#382)
Browse files Browse the repository at this point in the history
* 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 <ben.berry@gsa.gov>

* refactor sso state checks into single function

Signed-off-by: Ben Berry <ben.berry@gsa.gov>

* 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 <richard.cox@suse.com>
Co-authored-by: Ben Berry <ben.berry@gsa.gov>
Co-authored-by: Richard Cox <richard-cox@users.noreply.github.com>
  • Loading branch information
4 people committed Jun 23, 2020
1 parent 8cc207d commit d64f5bf
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
6 changes: 5 additions & 1 deletion custom-src/deploy/kubernetes/customize-helm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ===========================================================================================
Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions deploy/kubernetes/console/templates/chartsync.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit d64f5bf

Please sign in to comment.