From 4668447aa60b5190f90a8a53546151df4ec4ed11 Mon Sep 17 00:00:00 2001 From: dafyy321-pixel Date: Fri, 25 Sep 2026 18:52:02 +0800 Subject: [PATCH] fix(helm): pin application images to chart version (#3669) Co-authored-by: dafyy321-pixel --- .github/workflows/helm.yml | 62 +++++++++++++++++++++++++++++++++++++ helm/README.md | 11 ++++++- helm/templates/_helpers.tpl | 8 +++-- helm/values.yaml | 8 ++--- 4 files changed, 82 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/helm.yml diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml new file mode 100644 index 00000000..693e63ec --- /dev/null +++ b/.github/workflows/helm.yml @@ -0,0 +1,62 @@ +name: Helm + +on: + push: + branches: + - main + paths: + - "helm/**" + - ".github/workflows/helm.yml" + pull_request: + paths: + - "helm/**" + - ".github/workflows/helm.yml" + +permissions: + contents: read + +jobs: + chart: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v6 + + - name: Set up Helm + uses: azure/setup-helm@v4 + with: + version: v3.19.0 + + - name: Lint chart + run: helm lint ./helm + + - name: Verify application image tags + shell: bash + run: | + set -euo pipefail + + render_image() { + local template="$1" + shift + helm template weknora ./helm \ + --show-only "$template" \ + --set secrets.dbPassword=test \ + --set secrets.redisPassword=test \ + --set secrets.jwtSecret=test \ + "$@" \ + | awk '$1 == "image:" { print $2; exit }' + } + + app_image="$(render_image templates/app.yaml)" + frontend_image="$(render_image templates/frontend.yaml)" + docreader_image="$(render_image templates/docreader.yaml)" + app_tag="${app_image##*:}" + + test "${frontend_image##*:}" = "$app_tag" + test "${docreader_image##*:}" = "$app_tag" + + frontend_override="$(render_image templates/frontend.yaml --set frontend.image.tag=ui-test)" + docreader_override="$(render_image templates/docreader.yaml --set docreader.image.tag=reader-test)" + + test "$frontend_override" = "wechatopenai/weknora-ui:ui-test" + test "$docreader_override" = "wechatopenai/weknora-docreader:reader-test" diff --git a/helm/README.md b/helm/README.md index fddd3556..16b17f14 100644 --- a/helm/README.md +++ b/helm/README.md @@ -179,7 +179,16 @@ helm install weknora ./helm \ | `frontend.enabled` | Enable frontend | `true` | | `frontend.replicaCount` | Number of replicas | `1` | | `frontend.image.repository` | Image repository | `wechatopenai/weknora-ui` | -| `frontend.image.tag` | Image tag | `latest` | +| `frontend.image.tag` | Image tag | `""` (uses appVersion) | + +### DocReader + +| Parameter | Description | Default | +|-----------|-------------|---------| +| `docreader.enabled` | Enable DocReader | `true` | +| `docreader.replicaCount` | Number of replicas | `1` | +| `docreader.image.repository` | Image repository | `wechatopenai/weknora-docreader` | +| `docreader.image.tag` | Image tag | `""` (uses appVersion) | ### PostgreSQL (ParadeDB) diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl index c8e75363..9ed75eae 100644 --- a/helm/templates/_helpers.tpl +++ b/helm/templates/_helpers.tpl @@ -114,16 +114,20 @@ Defaults to Chart.appVersion if tag is not specified. {{/* Return the frontend image with tag. +Defaults to Chart.appVersion if tag is not specified. */}} {{- define "weknora.frontend.image" -}} -{{- printf "%s:%s" .Values.frontend.image.repository .Values.frontend.image.tag }} +{{- $tag := default .Chart.AppVersion .Values.frontend.image.tag }} +{{- printf "%s:%s" .Values.frontend.image.repository $tag }} {{- end }} {{/* Return the docreader image with tag. +Defaults to Chart.appVersion if tag is not specified. */}} {{- define "weknora.docreader.image" -}} -{{- printf "%s:%s" .Values.docreader.image.repository .Values.docreader.image.tag }} +{{- $tag := default .Chart.AppVersion .Values.docreader.image.tag }} +{{- printf "%s:%s" .Values.docreader.image.repository $tag }} {{- end }} {{/* diff --git a/helm/values.yaml b/helm/values.yaml index e558ac21..19c1b853 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -159,8 +159,8 @@ frontend: image: # -- Image repository repository: wechatopenai/weknora-ui - # -- Image tag - tag: latest + # -- Image tag (defaults to Chart.appVersion if empty) + tag: "" # -- Image pull policy pullPolicy: IfNotPresent @@ -206,8 +206,8 @@ docreader: image: # -- Image repository repository: wechatopenai/weknora-docreader - # -- Image tag - tag: latest + # -- Image tag (defaults to Chart.appVersion if empty) + tag: "" # -- Image pull policy pullPolicy: IfNotPresent