Skip to content

Commit 665e1b4

Browse files
committed
fix(demo-wiab): wpb-17321 allow pre_chart_process to be aware of values and fix demo build to pre_clean_values properly
1 parent c6d9772 commit 665e1b4

4 files changed

Lines changed: 34 additions & 12 deletions

File tree

offline/default-build/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ cp -r "${ROOT_DIR}"/values "${OUTPUT_DIR}"/
3838
cp -r "${ROOT_DIR}"/dashboards "${OUTPUT_DIR}"/
3939

4040
# all basic chart pre-processing tasks
41-
"${TASKS_DIR}"/pre_chart_process_0.sh "${OUTPUT_DIR}"
41+
"${TASKS_DIR}"/pre_chart_process_0.sh OUTPUT_DIR="${OUTPUT_DIR}"
4242

4343
# all extra pre chart processing tasks for this profile should come here
4444
# pre_chart_process_1.sh

offline/demo-build/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@ cp -r "${ROOT_DIR}"/values "${OUTPUT_DIR}"/
3232
cp -r "${ROOT_DIR}"/dashboards "${OUTPUT_DIR}"/
3333

3434
# removing the values/$chart directories in values directory if not required
35-
"${TASKS_DIR}"/pre_clean_values_0.sh VALUES_DIR="${OUTPUT_DIR}/values" HELM_CHART_EXCLUDE_LIST="${HELM_CHART_EXCLUDE_LIST}"
35+
"${TASKS_DIR}"/pre_clean_values_0.sh VALUES_DIR="${OUTPUT_DIR}/values" HELM_CHART_EXCLUDE_LIST="${HELM_CHART_EXCLUDE_LIST}" VALUES_TYPE="demo"
3636

3737
# all basic chart pre-processing tasks
38-
"${TASKS_DIR}"/pre_chart_process_0.sh "${OUTPUT_DIR}"
38+
"${TASKS_DIR}"/pre_chart_process_0.sh OUTPUT_DIR="${OUTPUT_DIR}" VALUES_TYPE="demo"
3939

4040
# processing the charts
4141
# here we also filter the images post processing the helm charts
4242
# pass the image names to be filtered as arguments as regex #IMAGE_EXCLUDE_LIST='brig|galley'
4343
"${TASKS_DIR}"/process_charts.sh OUTPUT_DIR="${OUTPUT_DIR}" IMAGE_EXCLUDE_LIST="quay.io/wire/federator" VALUES_TYPE="demo"
4444

4545
# all basic chart pre-processing tasks
46-
"${TASKS_DIR}"/post_chart_process_0.sh "${OUTPUT_DIR}"
46+
"${TASKS_DIR}"/post_chart_process_0.sh "${OUTPUT_DIR}" VALUES_TYPE="demo"
4747

4848
# --------------------------
4949
# building admin host containers, has dependenct on the helm charts

offline/min-build/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ cp -r "${ROOT_DIR}"/values "${OUTPUT_DIR}"/
4040
"${TASKS_DIR}"/pre_clean_values_0.sh VALUES_DIR="${OUTPUT_DIR}/values" HELM_CHART_EXCLUDE_LIST="${HELM_CHART_EXCLUDE_LIST}"
4141

4242
# all basic chart pre-processing tasks
43-
"${TASKS_DIR}"/pre_chart_process_0.sh "${OUTPUT_DIR}"
43+
"${TASKS_DIR}"/pre_chart_process_0.sh OUTPUT_DIR="${OUTPUT_DIR}"
4444

4545
# all extra pre chart processing tasks for this profile should come here
4646
# pre_chart_process_1.sh

offline/tasks/pre_chart_process_0.sh

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,40 @@
11
#!/usr/bin/env bash
2-
set -euo pipefail
2+
set -exuo pipefail
33

4-
if [[ ! $# -eq 1 ]]; then
5-
echo "usage: $0 OUTPUT-DIR" >&2
4+
# Default output dir
5+
OUTPUT_DIR=""
6+
# Default values type will expect to use prod values
7+
VALUES_TYPE="prod"
8+
9+
# Parse the arguments
10+
for arg in "$@"
11+
do
12+
case $arg in
13+
OUTPUT_DIR=*)
14+
OUTPUT_DIR="${arg#*=}"
15+
;;
16+
VALUES_TYPE=*)
17+
VALUES_TYPE="${arg#*=}"
18+
;;
19+
*)
20+
echo "Unknown argument: $arg" >&2
21+
exit 1
22+
;;
23+
esac
24+
done
25+
26+
27+
# Check if OUTPUT_DIR is set
28+
if [[ -z "$OUTPUT_DIR" ]]; then
29+
echo "usage: $0 OUTPUT_DIR=\"values-dir\" [VALUES_TYPE=\"prod|demo\"]" >&2
630
exit 1
731
fi
832

9-
OUTPUT_DIR="$1"
10-
11-
echo "Running pre-chart process script 0 in dir $OUTPUT_DIR ..."
33+
echo "Running pre-chart process script 0 in dir $OUTPUT_DIR with values type $VALUES_TYPE"
1234

1335
# Patch wire-server values.yaml to include federator
1436
# This is needed to bundle it's image.
15-
sed -i -Ee 's/federation: false/federation: true/' "${OUTPUT_DIR}"/values/wire-server/prod-values.example.yaml
37+
sed -i -Ee 's/federation: false/federation: true/' "${OUTPUT_DIR}/values/wire-server/${VALUES_TYPE}-values.example.yaml"
1638
sed -i -Ee 's/useSharedFederatorSecret: false/useSharedFederatorSecret: true/' "${OUTPUT_DIR}"/charts/wire-server/charts/federator/values.yaml
1739

1840
# drop step-certificates/.../test-connection.yaml because it lacks an image tag

0 commit comments

Comments
 (0)