From cb8280249f7a2deeadb33a54131ce1215bb61759 Mon Sep 17 00:00:00 2001 From: Kessler Dev Date: Wed, 8 Apr 2026 12:45:16 +0200 Subject: [PATCH 1/3] chore(chart): use appVersion as default image tag --- chart/Chart.yaml | 2 +- chart/templates/deployment.yaml | 2 +- chart/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 886ba48f..28fcae00 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 name: trek version: 0.1.0 description: Minimal Helm chart for TREK app -appVersion: "latest" +appVersion: "2.9.11" diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml index 0ab074ba..d79ae344 100644 --- a/chart/templates/deployment.yaml +++ b/chart/templates/deployment.yaml @@ -27,7 +27,7 @@ spec: fsGroup: 1000 containers: - name: trek - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} {{- with .Values.resources }} resources: diff --git a/chart/values.yaml b/chart/values.yaml index 47a941c7..464e6d8c 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1,7 +1,7 @@ image: repository: mauriceboe/trek - tag: latest + # tag: latest pullPolicy: IfNotPresent # Optional image pull secrets for private registries From dba655d6e8bfc54a50bfb4ff5a8b99dbf26f1889 Mon Sep 17 00:00:00 2001 From: Kessler Dev Date: Wed, 8 Apr 2026 13:01:14 +0200 Subject: [PATCH 2/3] chore: implement helm chart release automation to gh-pages --- .github/workflows/docker.yml | 6 +++-- .github/workflows/helm-release.yml | 25 +++++++++++++++++++ {chart => charts}/README.md | 0 {chart => charts/trek}/Chart.yaml | 0 {chart => charts/trek}/templates/NOTES.txt | 0 {chart => charts/trek}/templates/_helpers.tpl | 0 .../trek}/templates/configmap.yaml | 0 .../trek}/templates/deployment.yaml | 0 {chart => charts/trek}/templates/ingress.yaml | 0 {chart => charts/trek}/templates/pvc.yaml | 0 {chart => charts/trek}/templates/secret.yaml | 0 {chart => charts/trek}/templates/service.yaml | 0 {chart => charts/trek}/values.yaml | 0 13 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/helm-release.yml rename {chart => charts}/README.md (100%) rename {chart => charts/trek}/Chart.yaml (100%) rename {chart => charts/trek}/templates/NOTES.txt (100%) rename {chart => charts/trek}/templates/_helpers.tpl (100%) rename {chart => charts/trek}/templates/configmap.yaml (100%) rename {chart => charts/trek}/templates/deployment.yaml (100%) rename {chart => charts/trek}/templates/ingress.yaml (100%) rename {chart => charts/trek}/templates/pvc.yaml (100%) rename {chart => charts/trek}/templates/secret.yaml (100%) rename {chart => charts/trek}/templates/service.yaml (100%) rename {chart => charts/trek}/values.yaml (100%) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 0a7c8f38..40af54fc 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -54,14 +54,16 @@ jobs: echo "VERSION=$NEW_VERSION" >> $GITHUB_OUTPUT echo "$CURRENT → $NEW_VERSION ($BUMP)" - # Update both package.json files + # Update package.json files and Helm chart cd server && npm version "$NEW_VERSION" --no-git-tag-version && cd .. cd client && npm version "$NEW_VERSION" --no-git-tag-version && cd .. + sed -i "s/^version: .*/version: $NEW_VERSION/" charts/trek/Chart.yaml + sed -i "s/^appVersion: .*/appVersion: \"$NEW_VERSION\"/" charts/trek/Chart.yaml # Commit and tag git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" - git add server/package.json server/package-lock.json client/package.json client/package-lock.json + git add server/package.json server/package-lock.json client/package.json client/package-lock.json charts/trek/Chart.yaml git commit -m "chore: bump version to $NEW_VERSION [skip ci]" git tag "v$NEW_VERSION" git push origin main --follow-tags diff --git a/.github/workflows/helm-release.yml b/.github/workflows/helm-release.yml new file mode 100644 index 00000000..d3f93c86 --- /dev/null +++ b/.github/workflows/helm-release.yml @@ -0,0 +1,25 @@ +name: Release Helm Chart + +on: + push: + tags: + - 'v*' + +permissions: + contents: write + +jobs: + release: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Helm Chart Releaser + uses: helm/chart-releaser-action@v1.7.0 + with: + config: | + pages_branch: gh-pages + charts_dir: charts diff --git a/chart/README.md b/charts/README.md similarity index 100% rename from chart/README.md rename to charts/README.md diff --git a/chart/Chart.yaml b/charts/trek/Chart.yaml similarity index 100% rename from chart/Chart.yaml rename to charts/trek/Chart.yaml diff --git a/chart/templates/NOTES.txt b/charts/trek/templates/NOTES.txt similarity index 100% rename from chart/templates/NOTES.txt rename to charts/trek/templates/NOTES.txt diff --git a/chart/templates/_helpers.tpl b/charts/trek/templates/_helpers.tpl similarity index 100% rename from chart/templates/_helpers.tpl rename to charts/trek/templates/_helpers.tpl diff --git a/chart/templates/configmap.yaml b/charts/trek/templates/configmap.yaml similarity index 100% rename from chart/templates/configmap.yaml rename to charts/trek/templates/configmap.yaml diff --git a/chart/templates/deployment.yaml b/charts/trek/templates/deployment.yaml similarity index 100% rename from chart/templates/deployment.yaml rename to charts/trek/templates/deployment.yaml diff --git a/chart/templates/ingress.yaml b/charts/trek/templates/ingress.yaml similarity index 100% rename from chart/templates/ingress.yaml rename to charts/trek/templates/ingress.yaml diff --git a/chart/templates/pvc.yaml b/charts/trek/templates/pvc.yaml similarity index 100% rename from chart/templates/pvc.yaml rename to charts/trek/templates/pvc.yaml diff --git a/chart/templates/secret.yaml b/charts/trek/templates/secret.yaml similarity index 100% rename from chart/templates/secret.yaml rename to charts/trek/templates/secret.yaml diff --git a/chart/templates/service.yaml b/charts/trek/templates/service.yaml similarity index 100% rename from chart/templates/service.yaml rename to charts/trek/templates/service.yaml diff --git a/chart/values.yaml b/charts/trek/values.yaml similarity index 100% rename from chart/values.yaml rename to charts/trek/values.yaml From 8c7d1f8fa69bbc01f8618e11a008d1ad2b8c329e Mon Sep 17 00:00:00 2001 From: Kessler Dev Date: Wed, 8 Apr 2026 13:28:22 +0200 Subject: [PATCH 3/3] chore: use helm-publisher action for chart release --- .github/workflows/docker.yml | 15 +++++++++++++++ .github/workflows/helm-release.yml | 25 ------------------------- 2 files changed, 15 insertions(+), 25 deletions(-) delete mode 100644 .github/workflows/helm-release.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 40af54fc..9cc0e762 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -153,3 +153,18 @@ jobs: - name: Inspect manifest run: docker buildx imagetools inspect mauriceboe/trek:latest + + release-helm: + runs-on: ubuntu-latest + needs: version-bump + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + ref: main + + - name: Publish Helm chart + uses: stefanprodan/helm-gh-pages@v1.7.0 + with: + token: ${{ secrets.GITHUB_TOKEN }} + charts_dir: charts diff --git a/.github/workflows/helm-release.yml b/.github/workflows/helm-release.yml deleted file mode 100644 index d3f93c86..00000000 --- a/.github/workflows/helm-release.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Release Helm Chart - -on: - push: - tags: - - 'v*' - -permissions: - contents: write - -jobs: - release: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Helm Chart Releaser - uses: helm/chart-releaser-action@v1.7.0 - with: - config: | - pages_branch: gh-pages - charts_dir: charts