From c83da527dbfae16d37b1daaf06dff46d1b04234c Mon Sep 17 00:00:00 2001 From: Doug Baggett Date: Fri, 22 Mar 2024 14:49:01 -0700 Subject: [PATCH 1/2] making .ReleasIsInstall optional for init jobs --- charts/pulsar/templates/bookkeeper-cluster-initialize.yaml | 2 +- charts/pulsar/templates/pulsar-cluster-initialize.yaml | 2 +- .../pulsar/templates/pulsar-manager-cluster-initialize.yaml | 4 ++-- charts/pulsar/values.yaml | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) mode change 100644 => 100755 charts/pulsar/templates/bookkeeper-cluster-initialize.yaml mode change 100644 => 100755 charts/pulsar/templates/pulsar-cluster-initialize.yaml mode change 100644 => 100755 charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml mode change 100644 => 100755 charts/pulsar/values.yaml 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..5fbbc365 --- 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 (or .Release.IsInstall .Values.initialize)) .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..f9a87aad --- 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 (or .Release.IsInstall .Values.initialize)) .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..51f22bf3 --- 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 (or .Release.IsInstall .Values.initialize)) .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: From 30cb1edb111399ad55483bf0cd56712792d89016 Mon Sep 17 00:00:00 2001 From: Doug Baggett Date: Mon, 25 Mar 2024 11:37:57 -0700 Subject: [PATCH 2/2] initialize simplifying an if condition based on feedback --- charts/pulsar/templates/bookkeeper-cluster-initialize.yaml | 2 +- charts/pulsar/templates/pulsar-cluster-initialize.yaml | 2 +- charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/pulsar/templates/bookkeeper-cluster-initialize.yaml b/charts/pulsar/templates/bookkeeper-cluster-initialize.yaml index 5fbbc365..4966e2a7 100755 --- 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 (and .Values.useReleaseStatus (or .Release.IsInstall .Values.initialize)) .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 index f9a87aad..6a67703f 100755 --- 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 (and .Values.useReleaseStatus (or .Release.IsInstall .Values.initialize)) .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 index 51f22bf3..e670af7c 100755 --- 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 (and .Values.useReleaseStatus (or .Release.IsInstall .Values.initialize)) .Values.initialize }} +{{- if or (and .Values.useReleaseStatus .Release.IsInstall) .Values.initialize }} {{- if .Values.components.pulsar_manager }} apiVersion: batch/v1 kind: Job