From b90038ea4c62f626136a64755f15d2448018c633 Mon Sep 17 00:00:00 2001 From: Caesar2011 Date: Sun, 17 May 2026 21:39:10 +0200 Subject: [PATCH] Added chart version --- .gitea/workflows/build.yml | 14 +++++++++++--- web/charts/factorio-signal-exporter/Chart.yaml | 2 +- .../templates/db-statefulset.yaml | 6 ------ .../templates/deployment.yaml | 1 + web/charts/factorio-signal-exporter/values.yaml | 2 +- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 67b77a4..e007824 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -17,6 +17,9 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Install Helm + uses: azure/setup-helm@v4 + - name: Log in to Gitea Container Registry uses: docker/login-action@v3 with: @@ -44,12 +47,17 @@ jobs: cache-to: type=inline - name: Package Helm chart - run: helm package web/charts/factorio-signal-exporter + run: | + SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7) + helm package web/charts/factorio-signal-exporter \ + --version "0.0.0-${SHORT_SHA}" \ + --app-version "${SHORT_SHA}" - name: Push Helm chart to Gitea run: | - curl -u ${{ secrets.GITEA_USERNAME }}:${{ secrets.GITEA_TOKEN }} \ + SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7) + curl -u ${{ secrets.REGISTRY_USERNAME }}:${{ secrets.REGISTRY_TOKEN }} \ -X POST \ https://${{ env.REGISTRY }}/api/packages/sebse/helm/api/charts \ - -F "chart=@factorio-signal-exporter-0.1.0.tgz" \ + -F "chart=@factorio-signal-exporter-0.0.0-${SHORT_SHA}.tgz" \ --fail-with-body \ No newline at end of file diff --git a/web/charts/factorio-signal-exporter/Chart.yaml b/web/charts/factorio-signal-exporter/Chart.yaml index 4473887..366d0b2 100644 --- a/web/charts/factorio-signal-exporter/Chart.yaml +++ b/web/charts/factorio-signal-exporter/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: factorio-signal-exporter description: Factorio Signal Exporter — Next.js dashboard with TimescaleDB type: application -version: 0.1.0 +version: 0.0.0-dev appVersion: "latest" \ No newline at end of file diff --git a/web/charts/factorio-signal-exporter/templates/db-statefulset.yaml b/web/charts/factorio-signal-exporter/templates/db-statefulset.yaml index de3f503..65a2416 100644 --- a/web/charts/factorio-signal-exporter/templates/db-statefulset.yaml +++ b/web/charts/factorio-signal-exporter/templates/db-statefulset.yaml @@ -26,12 +26,6 @@ spec: env: - name: POSTGRES_USER value: {{ .Values.db.user | quote }} - - name: POSTGRES_PASSWORD - valueFrom: - secretKeyRef: - name: {{ include "factorio-signal-exporter.secretName" . }} - key: DATABASE_URL - optional: false - name: POSTGRES_PASSWORD value: {{ .Values.db.password | quote }} - name: POSTGRES_DB diff --git a/web/charts/factorio-signal-exporter/templates/deployment.yaml b/web/charts/factorio-signal-exporter/templates/deployment.yaml index f6df85a..6f64aee 100644 --- a/web/charts/factorio-signal-exporter/templates/deployment.yaml +++ b/web/charts/factorio-signal-exporter/templates/deployment.yaml @@ -13,6 +13,7 @@ spec: metadata: labels: {{- include "factorio-signal-exporter.selectorLabels" . | nindent 8 }} + app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: diff --git a/web/charts/factorio-signal-exporter/values.yaml b/web/charts/factorio-signal-exporter/values.yaml index 0634709..6d50edd 100644 --- a/web/charts/factorio-signal-exporter/values.yaml +++ b/web/charts/factorio-signal-exporter/values.yaml @@ -20,7 +20,7 @@ db: name: factorio port: 5432 storage: 10Gi - storageClassName: "" # leave empty for cluster default + storageClassName: "" service: type: ClusterIP