From 56f8fb0724a1d915f43dccfa0fb3b15bbb259111 Mon Sep 17 00:00:00 2001 From: mohitrajain <20745774+mohitrajain@users.noreply.github.com> Date: Wed, 10 Sep 2025 10:51:56 +0200 Subject: [PATCH 1/7] update: try build with webapp patch on 5.14 backend --- .github/workflows/offline.yml | 42 +------------------------------ offline/tasks/proc_pull_charts.sh | 2 +- 2 files changed, 2 insertions(+), 42 deletions(-) diff --git a/.github/workflows/offline.yml b/.github/workflows/offline.yml index 2f07076e6..61a32ad27 100644 --- a/.github/workflows/offline.yml +++ b/.github/workflows/offline.yml @@ -32,25 +32,6 @@ jobs: echo ::set-output name=UPLOAD_NAME::$GITHUB_SHA # echo ::set-output name=UPLOAD_NAME::${SOURCE_TAG:-$GITHUB_SHA} - # min profile build - - name: Process the min profile build - run: ./offline/min-build/build.sh - env: - GPG_PRIVATE_KEY: '${{ secrets.GPG_PRIVATE_KEY }}' - DOCKER_LOGIN: '${{ secrets.DOCKER_LOGIN }}' - - - name: Copy min build assets tarball to S3 - run: | - # Upload tarball for each profile by specifying their OUTPUT_TAR path - aws s3 cp offline/min-build/output/assets.tgz s3://public.wire.com/artifacts/wire-server-deploy-static-min-${{ steps.upload_name.outputs.UPLOAD_NAME }}.tgz - echo "Uploaded to: https://s3-$AWS_REGION.amazonaws.com/public.wire.com/artifacts/wire-server-deploy-static-min-${{ steps.upload_name.outputs.UPLOAD_NAME }}.tgz" - # remove the archives from the build to optimize the space on the server - rm -rf offline/min-build/output/* - env: - AWS_ACCESS_KEY_ID: '${{ secrets.AWS_ACCESS_KEY_ID }}' - AWS_SECRET_ACCESS_KEY: '${{ secrets.AWS_SECRET_ACCESS_KEY }}' - AWS_REGION: "eu-west-1" - # deafult profile build - name: Process the default profile build run: ./offline/default-build/build.sh @@ -64,28 +45,7 @@ jobs: aws s3 cp offline/default-build/output/assets.tgz s3://public.wire.com/artifacts/wire-server-deploy-static-${{ steps.upload_name.outputs.UPLOAD_NAME }}.tgz echo "Uploaded to: https://s3-$AWS_REGION.amazonaws.com/public.wire.com/artifacts/wire-server-deploy-static-${{ steps.upload_name.outputs.UPLOAD_NAME }}.tgz" # remove the archives from the build to optimize the space on the server - rm offline/default-build/output/containers-helm.tar - env: - AWS_ACCESS_KEY_ID: '${{ secrets.AWS_ACCESS_KEY_ID }}' - AWS_SECRET_ACCESS_KEY: '${{ secrets.AWS_SECRET_ACCESS_KEY }}' - AWS_REGION: "eu-west-1" - - # demo profile build - - name: Process the demo profile build - run: ./offline/demo-build/build.sh - env: - GPG_PRIVATE_KEY: '${{ secrets.GPG_PRIVATE_KEY }}' - DOCKER_LOGIN: '${{ secrets.DOCKER_LOGIN }}' - - - name: Copy demo build assets tarball to S3 and clean up - run: | - # Upload tarball for each profile by specifying their OUTPUT_TAR path - aws s3 cp offline/demo-build/output/assets.tgz s3://public.wire.com/artifacts/wire-server-deploy-static-demo-${{ steps.upload_name.outputs.UPLOAD_NAME }}.tgz - echo "Uploaded to: https://s3-$AWS_REGION.amazonaws.com/public.wire.com/artifacts/wire-server-deploy-static-demo-${{ steps.upload_name.outputs.UPLOAD_NAME }}.tgz" - # remove the assets from the build to optimize the space on the server - rm -rf offline/demo-build/output/* - # removing everything except assets.tgz as it is not required anymore in the further builds - find offline/default-build/output/ -mindepth 1 -maxdepth 1 ! -name 'assets.tgz' -exec rm -r {} + + # rm offline/default-build/output/containers-helm.tar env: AWS_ACCESS_KEY_ID: '${{ secrets.AWS_ACCESS_KEY_ID }}' AWS_SECRET_ACCESS_KEY: '${{ secrets.AWS_SECRET_ACCESS_KEY }}' diff --git a/offline/tasks/proc_pull_charts.sh b/offline/tasks/proc_pull_charts.sh index f1d3b0ad5..cdf562490 100755 --- a/offline/tasks/proc_pull_charts.sh +++ b/offline/tasks/proc_pull_charts.sh @@ -83,5 +83,5 @@ pull_charts() { echo "Pulling charts done." } -wire_build="https://raw.githubusercontent.com/wireapp/wire-builds/refs/heads/q2-2025/build.json" +wire_build="https://raw.githubusercontent.com/wireapp/wire-builds/0ed27ef439f741d1e7313af69349c7bba8f7047b/build.json" wire_build_chart_release "$wire_build" | pull_charts From 6eb20bd23878575bd65cfffec4d26c3d7e4c0f1f Mon Sep 17 00:00:00 2001 From: mohitrajain <20745774+mohitrajain@users.noreply.github.com> Date: Wed, 10 Sep 2025 10:53:14 +0200 Subject: [PATCH 2/7] update: enable pipelines on 5.14 --- .github/workflows/offline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/offline.yml b/.github/workflows/offline.yml index 61a32ad27..25d6a2523 100644 --- a/.github/workflows/offline.yml +++ b/.github/workflows/offline.yml @@ -1,9 +1,9 @@ on: push: - branches: [master, develop] + branches: [master, "5.14"] tags: [ v* ] pull_request: - branches: [master, develop] + branches: [master, "5.14"] jobs: offline: name: Prepare offline package From da970f417ecd6e2506901e6ce8efb5231b1db02a Mon Sep 17 00:00:00 2001 From: mohitrajain <20745774+mohitrajain@users.noreply.github.com> Date: Wed, 10 Sep 2025 11:00:01 +0200 Subject: [PATCH 3/7] update: fix postgresql demo package images --- values/postgresql/demo-secrets.example.yaml | 8 ++++++++ values/postgresql/demo-values.example.yaml | 10 ++++++++++ 2 files changed, 18 insertions(+) create mode 100644 values/postgresql/demo-secrets.example.yaml create mode 100644 values/postgresql/demo-values.example.yaml diff --git a/values/postgresql/demo-secrets.example.yaml b/values/postgresql/demo-secrets.example.yaml new file mode 100644 index 000000000..bcfd4baea --- /dev/null +++ b/values/postgresql/demo-secrets.example.yaml @@ -0,0 +1,8 @@ +# TODO: look deeper into requirements and make a solid, commented secrets example file +# TODO: better secret handling +postgresql: + auth: + username: wire-server + password: verysecurepassword + database: wire-server + postgresPassword: verysecurepassword diff --git a/values/postgresql/demo-values.example.yaml b/values/postgresql/demo-values.example.yaml new file mode 100644 index 000000000..fcf671496 --- /dev/null +++ b/values/postgresql/demo-values.example.yaml @@ -0,0 +1,10 @@ +# This chart is meant to be used in ephemeral deployments, such as demo environments. +# TODO: look deeper into requirements and make a solid, commented values example file +postgresql: + primary: + persistence: + enabled: false + volumePermissions: + image: + repository: bitnami/os-shell + tag: 12-debian-12-r46 From c3bd30f4eedc3442b3e28670451a481cf066864b Mon Sep 17 00:00:00 2001 From: mohitrajain <20745774+mohitrajain@users.noreply.github.com> Date: Wed, 10 Sep 2025 11:10:51 +0200 Subject: [PATCH 4/7] update: don't process postgresql chart --- offline/default-build/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/offline/default-build/build.sh b/offline/default-build/build.sh index d4b5d6286..b6a77acc1 100755 --- a/offline/default-build/build.sh +++ b/offline/default-build/build.sh @@ -26,7 +26,7 @@ TASKS_DIR="${SCRIPT_DIR}/../tasks" # -------------------------- # pulling the charts, charts to be skipped are passed as arguments HELM_CHART_EXCLUDE_LIST -"${TASKS_DIR}"/proc_pull_charts.sh OUTPUT_DIR="${OUTPUT_DIR}" # HELM_CHART_EXCLUDE_LIST="inbucket,wire-server-enterprise,coturn" +"${TASKS_DIR}"/proc_pull_charts.sh OUTPUT_DIR="${OUTPUT_DIR}" HELM_CHART_EXCLUDE_LIST="inbucket,wire-server-enterprise,postgresql" # copy local copy of values from root directory to output directory cp -r "${ROOT_DIR}"/values "${OUTPUT_DIR}"/ From ff27a13e90675d091303aaa5511a7967607eead1 Mon Sep 17 00:00:00 2001 From: mohitrajain Date: Mon, 15 Sep 2025 10:43:48 +0200 Subject: [PATCH 5/7] update: enable min pipelines on 5.14 --- .github/workflows/offline-min.yml | 56 +++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 .github/workflows/offline-min.yml diff --git a/.github/workflows/offline-min.yml b/.github/workflows/offline-min.yml new file mode 100644 index 000000000..71e39ffe0 --- /dev/null +++ b/.github/workflows/offline-min.yml @@ -0,0 +1,56 @@ +on: + push: + branches: [5.14*] + paths-ignore: + - '*.md' + - '**/*.md' + pull_request: + branches: [5.14*] + paths-ignore: + - '*.md' + - '**/*.md' +jobs: + offline: + name: Prepare min offline package + # Useful to skip expensive CI when writing docs + if: "!contains(github.event.head_commit.message, 'skip ci')" + runs-on: + group: wire-server-deploy + steps: + - uses: actions/checkout@v2 + with: + submodules: true + - uses: cachix/install-nix-action@v27 + - uses: cachix/cachix-action@v15 + with: + name: wire-server + signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}" + + - name: Install nix environment + run: nix-env -f default.nix -iA env + + - name: Get upload name + id: upload_name + run: | + # FIXME: Tag with a nice release name using the github tag... + # SOURCE_TAG=${GITHUB_REF#refs/tags/} + echo ::set-output name=UPLOAD_NAME::$GITHUB_SHA + # echo ::set-output name=UPLOAD_NAME::${SOURCE_TAG:-$GITHUB_SHA} + + - name: Process the min profile build + run: ./offline/min-build/build.sh + env: + GPG_PRIVATE_KEY: '${{ secrets.GPG_PRIVATE_KEY }}' + DOCKER_LOGIN: '${{ secrets.DOCKER_LOGIN }}' + + - name: Copy min build assets tarball to S3 + run: | + # Upload tarball for each profile by specifying their OUTPUT_TAR path + aws s3 cp offline/min-build/output/assets.tgz s3://public.wire.com/artifacts/wire-server-deploy-static-min-${{ steps.upload_name.outputs.UPLOAD_NAME }}.tgz + echo "Uploaded to: https://s3-$AWS_REGION.amazonaws.com/public.wire.com/artifacts/wire-server-deploy-static-min-${{ steps.upload_name.outputs.UPLOAD_NAME }}.tgz" + # remove the archives from the build to optimize the space on the server + rm -rf offline/min-build/output/* + env: + AWS_ACCESS_KEY_ID: '${{ secrets.AWS_ACCESS_KEY_ID }}' + AWS_SECRET_ACCESS_KEY: '${{ secrets.AWS_SECRET_ACCESS_KEY }}' + AWS_REGION: "eu-west-1" From f8264756211712023200144e878d25af2cba8ed2 Mon Sep 17 00:00:00 2001 From: mohitrajain Date: Tue, 16 Sep 2025 17:17:29 +0200 Subject: [PATCH 6/7] update: test new build.json --- offline/tasks/proc_pull_charts.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/offline/tasks/proc_pull_charts.sh b/offline/tasks/proc_pull_charts.sh index cdf562490..55195e2f8 100755 --- a/offline/tasks/proc_pull_charts.sh +++ b/offline/tasks/proc_pull_charts.sh @@ -83,5 +83,5 @@ pull_charts() { echo "Pulling charts done." } -wire_build="https://raw.githubusercontent.com/wireapp/wire-builds/0ed27ef439f741d1e7313af69349c7bba8f7047b/build.json" +wire_build="https://raw.githubusercontent.com/wireapp/wire-builds/ab2f729b10065d42fa2bf5adc9f97d545610c1e9/build.json" wire_build_chart_release "$wire_build" | pull_charts From 388a6d56312c7b13c03e5ae3094b3e54fe5aacd3 Mon Sep 17 00:00:00 2001 From: mohitrajain Date: Thu, 18 Sep 2025 10:47:46 +0200 Subject: [PATCH 7/7] fix(5.14): sync coturn values --- .github/workflows/offline-min.yml | 5 ----- values/coturn/prod-secrets.example.yaml | 3 +++ values/coturn/prod-values.example.yaml | 4 +--- 3 files changed, 4 insertions(+), 8 deletions(-) create mode 100644 values/coturn/prod-secrets.example.yaml diff --git a/.github/workflows/offline-min.yml b/.github/workflows/offline-min.yml index 71e39ffe0..b1d979e4a 100644 --- a/.github/workflows/offline-min.yml +++ b/.github/workflows/offline-min.yml @@ -4,11 +4,6 @@ on: paths-ignore: - '*.md' - '**/*.md' - pull_request: - branches: [5.14*] - paths-ignore: - - '*.md' - - '**/*.md' jobs: offline: name: Prepare min offline package diff --git a/values/coturn/prod-secrets.example.yaml b/values/coturn/prod-secrets.example.yaml new file mode 100644 index 000000000..973d868de --- /dev/null +++ b/values/coturn/prod-secrets.example.yaml @@ -0,0 +1,3 @@ +secrets: + zrestSecrets: + - "" diff --git a/values/coturn/prod-values.example.yaml b/values/coturn/prod-values.example.yaml index 973d868de..e38f8a3a0 100644 --- a/values/coturn/prod-values.example.yaml +++ b/values/coturn/prod-values.example.yaml @@ -1,3 +1 @@ -secrets: - zrestSecrets: - - "" +# using upstream values for coturn helm \ No newline at end of file