Skip to content

Commit 4ca5600

Browse files
authored
Optionally include backoffice when installing wire-server helm chart (#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
1 parent 13fa067 commit 4ca5600

File tree

7 files changed

+20
-3
lines changed

7 files changed

+20
-3
lines changed

changelog.d/2-features/backoffice

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
charts/wire-server: Optionally include backoffice

changelog.d/3-bug-fixes/backoffice

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
charts/backoffice: Fix version of frontend and auto-bump version of stern on every release

charts/backoffice/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ replicaCount: 1
22
images:
33
frontend:
44
repository: quay.io/wire/backoffice-frontend
5-
tag: 2.93.0
5+
tag: 2.87.0
66
pullPolicy: IfNotPresent
77
stern:
88
repository: quay.io/wire/stern
9-
tag: 2.93.0
9+
tag: do-not-use
1010
pullPolicy: IfNotPresent
1111
service:
1212
internalPort: 8080

charts/wire-server/requirements.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ dependencies:
1515
########################
1616
## wire-servers/services
1717
########################
18+
- name: backoffice
19+
version: "0.0.42"
20+
repository: "file://../backoffice"
21+
tags:
22+
- backoffice
23+
- haskellServices
24+
- services
1825
- name: cannon
1926
version: "0.0.42"
2027
repository: "file://../cannon"

charts/wire-server/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ tags:
1111
legalhold: false
1212
federator: false # see also galley.config.enableFederator and brig.config.enableFederator
1313
sftd: false
14+
backoffice: false

hack/bin/set-chart-image-version.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ do
1212
if [[ "$chart" == "nginz" ]]; then
1313
# nginz has a different docker tag indentation
1414
sed -i "s/^ tag: .*/ tag: $docker_tag/g" "$CHARTS_DIR/$chart/values.yaml"
15+
elif [[ "$chart" == "backoffice" ]]; then
16+
# There are two images at the same level and we want update only stern.
17+
sed -i "s/tag: do-not-use/tag: $docker_tag/g" "$CHARTS_DIR/$chart/values.yaml"
1518
else
1619
sed -i "s/^ tag: .*/ tag: $docker_tag/g" "$CHARTS_DIR/$chart/values.yaml"
1720
fi

hack/bin/set-wire-server-image-version.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,9 @@ for chart in "${charts[@]}"; do
1212
sed -i "s/^ tag: .*/ tag: $target_version/g" "$CHARTS_DIR/$chart/values.yaml"
1313
done
1414

15-
#special case nginz
15+
# special case nginz
1616
sed -i "s/^ tag: .*/ tag: $target_version/g" "$CHARTS_DIR/nginz/values.yaml"
17+
18+
# special case backoffice as there are two images at the same level and we want
19+
# update only one.
20+
sed -i "s/tag: do-not-use/tag: $target_version/g" "$CHARTS_DIR/backoffice/values.yaml"

0 commit comments

Comments
 (0)