diff --git a/charts/pulsar/templates/bookkeeper-cluster-initialize.yaml b/charts/pulsar/templates/bookkeeper-cluster-initialize.yaml old mode 100644 new mode 100755 index 21ba2cca..4966e2a7 --- a/charts/pulsar/templates/bookkeeper-cluster-initialize.yaml +++ b/charts/pulsar/templates/bookkeeper-cluster-initialize.yaml @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # -{{- if or .Release.IsInstall .Values.initialize }} +{{- if or (and .Values.useReleaseStatus .Release.IsInstall) .Values.initialize }} {{- if .Values.components.bookkeeper }} apiVersion: batch/v1 kind: Job diff --git a/charts/pulsar/templates/pulsar-cluster-initialize.yaml b/charts/pulsar/templates/pulsar-cluster-initialize.yaml old mode 100644 new mode 100755 index b222453e..6a67703f --- a/charts/pulsar/templates/pulsar-cluster-initialize.yaml +++ b/charts/pulsar/templates/pulsar-cluster-initialize.yaml @@ -17,7 +17,7 @@ # under the License. # -{{- if or .Release.IsInstall .Values.initialize }} +{{- if or (and .Values.useReleaseStatus .Release.IsInstall) .Values.initialize }} {{- if .Values.components.broker }} apiVersion: batch/v1 kind: Job diff --git a/charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml b/charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml old mode 100644 new mode 100755 index 419391fe..e670af7c --- a/charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml +++ b/charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml @@ -17,7 +17,7 @@ # under the License. # -{{- if or .Release.IsInstall .Values.initialize }} +{{- if or (and .Values.useReleaseStatus .Release.IsInstall) .Values.initialize }} {{- if .Values.components.pulsar_manager }} apiVersion: batch/v1 kind: Job @@ -28,7 +28,7 @@ metadata: {{- include "pulsar.standardLabels" . | nindent 4 }} component: {{ .Values.pulsar_manager.component }}-init spec: - {{- if or .Values.job.ttl.enabled (semverCompare ">=1.23-0" .Capabilities.KubeVersion.Version) }} + {{- if and .Values.job.ttl.enabled (semverCompare ">=1.23-0" .Capabilities.KubeVersion.Version) }} ttlSecondsAfterFinished: {{ .Values.job.ttl.secondsAfterFinished | default 600 }} {{- end }} template: diff --git a/charts/pulsar/values.yaml b/charts/pulsar/values.yaml old mode 100644 new mode 100755 index f64c050b..7c3c203a --- a/charts/pulsar/values.yaml +++ b/charts/pulsar/values.yaml @@ -36,7 +36,8 @@ clusterDomain: cluster.local ## Set to true on install initialize: false - +## Set useReleaseStatus to false if you're deploying this chart using a system that doesn't track .Release.IsInstall or .Release.IsUpgrade (like argocd) +useReleaseStatus: true ## Set cluster name # clusterName: