Allow override installation job's behavior only through annotations

.github/workflows/release-rc.yml

@@ -32,7 +32,7 @@ jobs:
   release:
     needs: check-rc
     if: ${{ needs.check-rc.outputs.rc == 'true' }}
-    uses: .github/workflows/release.yml
+    uses: ./.github/workflows/release.yml
+    secrets: inherit
     with:
-      secrets: inherit
       mark_as_latest: false

.github/workflows/release.yml

@@ -5,11 +5,13 @@ on:
     inputs:
       mark_as_latest:
         type: boolean
+        description: 'Whether to mark the chart as the latest release'
         required: false
         default: true
   workflow_dispatch:
     inputs:
       mark_as_latest:
+        description: 'Whether to mark the chart as the latest release'
         type: boolean
         required: false
         default: true

charts/port-ocean/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: port-ocean
 description: A Helm chart for Port Ocean integrations
 type: application
-version: 0.11.0
+version: 0.11.1-rc.2
 appVersion: "0.1.0"
 home: https://getport.io/
 sources:

charts/port-ocean/templates/cron-job/_helpers.yml

@@ -11,3 +11,18 @@ Supports optional custom naming via workload.cron.initContainer.serviceAccount.n
 {{- printf "%s-job-query" $prefix | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 {{- end }}
+
+{{/*
+Get installation resync job name
+*/}}
+{{- define "port-ocean.installationResyncJobName" -}}
+{{- printf "init-sync-%s" .Release.Name }}
+{{- end }}
+
+{{/*
+Get installation triggered job name
+*/}}
+{{- define "port-ocean.installationTriggeredJobName" -}}
+{{- $jobName := (print (randAlphaNum 4) "-" .Release.Revision) | lower }}
+{{- printf "init-sync-%s" $jobName }}
+{{- end }}

charts/port-ocean/templates/cron-job/installation-resync-job.yml

@@ -1,14 +1,13 @@
-{{- $resyncOnInstall := (.Values.workload.cron).resyncOnInstall | default true }}
-{{- $resyncOnUpgrade := (.Values.workload.cron).resyncOnUpgrade | default true }}
-{{- if and (eq .Values.workload.kind "CronJob") (or $resyncOnInstall $resyncOnUpgrade) }}
-{{- $jobName := (print (randAlphaNum 4) "-" .Release.Revision) | lower }}
+{{- $shouldResyncOnInstall := and (.Values.workload.cron.resyncOnInstall) (eq .Release.Revision 1) }}
+{{- $shouldResyncOnUpgrade := and (.Values.workload.cron.resyncOnUpgrade) (gt .Release.Revision 1) }}
+{{- if and (eq .Values.workload.kind "CronJob") (or $shouldResyncOnInstall $shouldResyncOnUpgrade) }}
 apiVersion: batch/v1
 kind: Job
 metadata:
   annotations:
     helm.sh/hook: post-install, post-upgrade
     helm.sh/hook-delete-policy: hook-succeeded, hook-failed
-  name: init-sync-{{ .Release.Name }}-{{ $jobName }}
+  name: {{ include "port-ocean.installationResyncJobName" . }}
 spec:
   ttlSecondsAfterFinished: 600
   activeDeadlineSeconds: 180
@@ -27,6 +26,6 @@ spec:
                   name: {{ include "port-ocean.cron.job-query-rbac-prefix" . }}-sa-token
                   key: token
           args:
-            - kubectl create job --from=cronjob/{{ include "port-ocean.cronJobName" . }} init-sync-{{ $jobName }} --token=$TOKEN
+            - kubectl create job --from=cronjob/{{ include "port-ocean.cronJobName" . }} {{ include "port-ocean.installationTriggeredJobName" . }} --token=$TOKEN
       restartPolicy: Never
 {{- end }}