From a8a206e5d4868a20dc6d2c3908d802dd8a2a5df8 Mon Sep 17 00:00:00 2001 From: Pavel Kirilin Date: Tue, 8 Jul 2025 04:10:26 +0200 Subject: [PATCH] Initial commit. --- {.github => .gitea}/workflows/release.yaml | 7 ++----- charts/py-app/templates/external-secrets.yaml | 5 +++-- charts/py-app/templates/migrators.yaml | 6 +++--- charts/py-app/values.yaml | 4 ++-- 4 files changed, 10 insertions(+), 12 deletions(-) rename {.github => .gitea}/workflows/release.yaml (71%) diff --git a/.github/workflows/release.yaml b/.gitea/workflows/release.yaml similarity index 71% rename from .github/workflows/release.yaml rename to .gitea/workflows/release.yaml index b729151..abf7351 100644 --- a/.github/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -14,9 +14,6 @@ jobs: chart: - py-app - pgbouncer - permissions: - contents: read - packages: write steps: - uses: actions/checkout@v4 - uses: azure/setup-helm@v4.2.0 @@ -26,7 +23,7 @@ jobs: run: | helm package --dependency-update ./charts/${{ matrix.chart }} helm show chart *.tgz - helm registry login -u ${{ github.actor }} -p ${{ secrets.GITHUB_TOKEN }} ghcr.io - helm push *.tgz oci://ghcr.io/intreecom/charts + helm registry login -u ${{ gitea.actor }} -p ${{ secrets.UPLOADER_PAT }} gitea.le-memese.com + helm push *.tgz oci://gitea.le-memese.com/common/charts env: HELM_EXPERIMENTAL_OCI: 1 diff --git a/charts/py-app/templates/external-secrets.yaml b/charts/py-app/templates/external-secrets.yaml index bd77142..557bcb8 100644 --- a/charts/py-app/templates/external-secrets.yaml +++ b/charts/py-app/templates/external-secrets.yaml @@ -7,8 +7,9 @@ metadata: labels: {{- include "py-app.labels" $ | nindent 4 }} annotations: - argocd.argoproj.io/hook: PreSync,Sync - argocd.argoproj.io/sync-wave: "-1" + "helm.sh/hook": pre-install,pre-upgrade + "helm.sh/hook-delete-policy": before-hook-creation + "helm.sh/hook-weight": "-1" spec: refreshInterval: {{ default "1h" $val.refreshInterval }} secretStoreRef: diff --git a/charts/py-app/templates/migrators.yaml b/charts/py-app/templates/migrators.yaml index 0be022c..5cf8255 100644 --- a/charts/py-app/templates/migrators.yaml +++ b/charts/py-app/templates/migrators.yaml @@ -5,12 +5,12 @@ apiVersion: batch/v1 kind: Job metadata: - generateName: "{{ include "py-app.fullname" $ }}-{{ $name }}-mj" + name: "{{ include "py-app.fullname" $ }}-{{ $name }}-mj" labels: {{- include "py-app.labels" $ | nindent 4 }} annotations: - argocd.argoproj.io/hook: PreSync - argocd.argoproj.io/hook-delete-policy: HookSucceeded + "helm.sh/hook": pre-install,pre-upgrade + "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded {{- with $val.annotations }} {{- toYaml . | nindent 4 }} {{- end }} diff --git a/charts/py-app/values.yaml b/charts/py-app/values.yaml index 822c490..047a18c 100644 --- a/charts/py-app/values.yaml +++ b/charts/py-app/values.yaml @@ -20,7 +20,7 @@ migrators: {} # pg: # # Job's additional annotations # annotations: -# argocd.argoproj.io/sync-wave: "5" +# "helm.sh/hook-weight": "-1" # command: ["alembic", "upgrade", "head"] # # You can specify limits for every migrator Job. # resources: {} @@ -137,4 +137,4 @@ limitRange: # cpu: 50m # memory: 500Mi # type: Container -extraManifests: [] \ No newline at end of file +extraManifests: []