Add post-upgrade hook to helm installer job in case of upgrade

charts/pega/charts/installer/templates/_helpers.tpl

@@ -1,5 +1,6 @@
 {{- define "pegaVolumeInstall" }}pega-volume-installer{{- end }}
 {{- define "pegaInstallConfig" }}pega-installer-config{{- end }}
+{{- define "pegaUpgradelConfig" }}pega-upgrade-config{{- end }}
 {{- define "pegaDBInstall" -}}pega-db-install{{- end -}}
 {{- define "pegaDBCustomUpgrade" -}}pega-db-custom-upgrade{{- end -}}
 {{- define "pegaDBOOPRulesUpgrade" -}}pega-db-ooprules-upgrade{{- end -}}
@@ -98,4 +99,4 @@
   - name: KUBERNETES_SERVICE_PORT
     value: {{ $apiserver.httpsServicePort | quote }}
 {{- end }}
-{{- end }}
+{{- end }}

charts/pega/charts/installer/templates/_pega-installer-job.tpl

@@ -6,12 +6,19 @@ metadata:
   name: {{ .name }}
   namespace: {{ .root.Release.Namespace }}
   annotations:
-{{- if and (eq .root.Values.waitForJobCompletion "true") (or (eq .root.Values.global.actions.execute "install") (eq .root.Values.global.actions.execute "upgrade")) }}
-    # Forces Helm to wait for the install or upgrade to complete.
-    "helm.sh/hook": post-install
+{{- if  (eq .root.Values.waitForJobCompletion "true")   }}
     "helm.sh/hook-weight": "0"
     "helm.sh/hook-delete-policy": before-hook-creation
+{{- if  (eq .root.Values.global.actions.execute "install") }}
+    # Forces Helm to wait for the install to complete.
+    "helm.sh/hook": post-install
+{{- end }}
+{{- if (eq .root.Values.global.actions.execute "upgrade") }}
+    # Forces Helm to wait for the upgrade to complete.
+    "helm.sh/hook": post-install, post-upgrade
+{{- end }}
 {{- end }}
+
 {{- if .root.Values.global.pegaJob }}{{- if .root.Values.global.pegaJob.annotations }}
 {{ toYaml .root.Values.global.pegaJob.annotations | indent 4 }}
 {{- end }}{{- end }}

charts/pega/charts/installer/templates/pega-installer-config.yaml

@@ -1,3 +1,7 @@
-{{ if or (eq (include "performInstall" .) "true") (eq (include "performUpgrade" .) "true") }}
+{{ if (eq (include "performInstall" .) "true") }}
 {{ template "pega.installer.config" dict "root" $ "dbType" .Values.global.jdbc.dbType "name" (include "pegaInstallConfig" .) "mode" (include "installerConfig" .) }}
-{{ end }}
+{{ end }}
+
+{{ if (eq (include "performUpgrade" .) "true") }}
+{{ template "pega.installer.config" dict "root" $ "dbType" .Values.global.jdbc.dbType "name" (include "pegaUpgradelConfig" .) "mode" (include "installerConfig" .) }}
+{{ end }}