Skip to content

Commit

Permalink
Optionally include backoffice when installing wire-server helm chart (#…
Browse files Browse the repository at this point in the history
…2490)

* charts/backoffice: Fix docker tag for backoffice-frontend

* charts/wire-server: Add backoffice

Ensure that scripts can handle updating stern version in the backoffice chart
  • Loading branch information
akshaymankar authored Jun 15, 2022
1 parent 13fa067 commit 4ca5600
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 3 deletions.
1 change: 1 addition & 0 deletions changelog.d/2-features/backoffice
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
charts/wire-server: Optionally include backoffice
1 change: 1 addition & 0 deletions changelog.d/3-bug-fixes/backoffice
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
charts/backoffice: Fix version of frontend and auto-bump version of stern on every release
4 changes: 2 additions & 2 deletions charts/backoffice/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ replicaCount: 1
images:
frontend:
repository: quay.io/wire/backoffice-frontend
tag: 2.93.0
tag: 2.87.0
pullPolicy: IfNotPresent
stern:
repository: quay.io/wire/stern
tag: 2.93.0
tag: do-not-use
pullPolicy: IfNotPresent
service:
internalPort: 8080
Expand Down
7 changes: 7 additions & 0 deletions charts/wire-server/requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ dependencies:
########################
## wire-servers/services
########################
- name: backoffice
version: "0.0.42"
repository: "file://../backoffice"
tags:
- backoffice
- haskellServices
- services
- name: cannon
version: "0.0.42"
repository: "file://../cannon"
Expand Down
1 change: 1 addition & 0 deletions charts/wire-server/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ tags:
legalhold: false
federator: false # see also galley.config.enableFederator and brig.config.enableFederator
sftd: false
backoffice: false
3 changes: 3 additions & 0 deletions hack/bin/set-chart-image-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ do
if [[ "$chart" == "nginz" ]]; then
# nginz has a different docker tag indentation
sed -i "s/^ tag: .*/ tag: $docker_tag/g" "$CHARTS_DIR/$chart/values.yaml"
elif [[ "$chart" == "backoffice" ]]; then
# There are two images at the same level and we want update only stern.
sed -i "s/tag: do-not-use/tag: $docker_tag/g" "$CHARTS_DIR/$chart/values.yaml"
else
sed -i "s/^ tag: .*/ tag: $docker_tag/g" "$CHARTS_DIR/$chart/values.yaml"
fi
Expand Down
6 changes: 5 additions & 1 deletion hack/bin/set-wire-server-image-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,9 @@ for chart in "${charts[@]}"; do
sed -i "s/^ tag: .*/ tag: $target_version/g" "$CHARTS_DIR/$chart/values.yaml"
done

#special case nginz
# special case nginz
sed -i "s/^ tag: .*/ tag: $target_version/g" "$CHARTS_DIR/nginz/values.yaml"

# special case backoffice as there are two images at the same level and we want
# update only one.
sed -i "s/tag: do-not-use/tag: $target_version/g" "$CHARTS_DIR/backoffice/values.yaml"

0 comments on commit 4ca5600

Please sign in to comment.