From de6380528fc517a24ffc9ac2bd2caca582ed9117 Mon Sep 17 00:00:00 2001 From: Stefan Gersmann Date: Wed, 22 Oct 2025 18:29:30 +0200 Subject: [PATCH 1/2] fix: don't use generated name for hook Using the generated name at least for a PostDelete hook was problematic, created too many jobs. I think in the case of ArgoCD hooks, we want the names to be unique? --- parcellab/common/Chart.yaml | 2 +- parcellab/common/templates/_job.tpl | 8 +++----- parcellab/monolith/values.yaml | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/parcellab/common/Chart.yaml b/parcellab/common/Chart.yaml index 7eda4bcf..20138a20 100644 --- a/parcellab/common/Chart.yaml +++ b/parcellab/common/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: common description: A Helm chart library for parcelLab charts type: library -version: 1.2.0 +version: 1.2.1 maintainers: - name: parcelLab email: engineering@parcellab.com diff --git a/parcellab/common/templates/_job.tpl b/parcellab/common/templates/_job.tpl index ee592e3b..76f69ca6 100644 --- a/parcellab/common/templates/_job.tpl +++ b/parcellab/common/templates/_job.tpl @@ -6,13 +6,11 @@ apiVersion: batch/v1 kind: Job metadata: + name: {{ $name }} {{- if $job.hook }} - generateName: {{ $name }}- annotations: - argocd.argoproj.io/hook: {{ default "Skip" $job.hook }} - argocd.argoproj.io/hook-delete-policy: {{ default "HookSucceeded" $job.hookDeletePolicy }} - {{- else }} - name: {{ $name }} + argocd.argoproj.io/hook: {{ (default "Skip" $job.hook) | quote }} + argocd.argoproj.io/hook-delete-policy: {{ (default "BeforeHookCreation" $job.hookDeletePolicy) | quote }} {{- end }} labels: {{- include "common.labels" $componentValues | nindent 4 }} diff --git a/parcellab/monolith/values.yaml b/parcellab/monolith/values.yaml index 3ab267d7..a4e9df5c 100644 --- a/parcellab/monolith/values.yaml +++ b/parcellab/monolith/values.yaml @@ -124,7 +124,7 @@ job: jobs: [] # - name: migrate # hook: PreSync -# hookDeletePolicy: HookSucceeded +# hookDeletePolicy: HookFailed # command: # - /bin/sh # - -c From 6852ee25a60d9e9163d43fb1f84eeac8ace619b7 Mon Sep 17 00:00:00 2001 From: Stefan Gersmann Date: Thu, 23 Oct 2025 15:18:33 +0200 Subject: [PATCH 2/2] chore: bump chart versions --- parcellab/common/Chart.yaml | 2 +- parcellab/cronjob/Chart.yaml | 2 +- parcellab/microservice/Chart.yaml | 2 +- parcellab/worker-group/Chart.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/parcellab/common/Chart.yaml b/parcellab/common/Chart.yaml index 20138a20..da7e0dbe 100644 --- a/parcellab/common/Chart.yaml +++ b/parcellab/common/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: common description: A Helm chart library for parcelLab charts type: library -version: 1.2.1 +version: 1.2.2 maintainers: - name: parcelLab email: engineering@parcellab.com diff --git a/parcellab/cronjob/Chart.yaml b/parcellab/cronjob/Chart.yaml index 5294651a..7eff6a05 100644 --- a/parcellab/cronjob/Chart.yaml +++ b/parcellab/cronjob/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: cronjob description: Single cron job -version: 0.4.0 +version: 0.4.1 dependencies: - name: common version: "*" diff --git a/parcellab/microservice/Chart.yaml b/parcellab/microservice/Chart.yaml index bb832b08..9445b295 100644 --- a/parcellab/microservice/Chart.yaml +++ b/parcellab/microservice/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: microservice description: Simple microservice -version: 0.4.0 +version: 0.4.1 dependencies: - name: common version: "*" diff --git a/parcellab/worker-group/Chart.yaml b/parcellab/worker-group/Chart.yaml index d422b2f5..533d6ede 100644 --- a/parcellab/worker-group/Chart.yaml +++ b/parcellab/worker-group/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: worker-group description: Set of workers that do not expose a service -version: 0.3.0 +version: 0.3.1 dependencies: - name: common version: "*"