Create a unique setup/update Job name per release version

README.md

@@ -529,7 +529,10 @@ helm uninstall temporaltest
 
 ## Upgrading
 
-To upgrade your cluster, upgrade your database schema (if the release includes schema changes), and then use `helm upgrade` command to perform a rolling upgrade of your installation.
+To upgrade your cluster:
+
+* Upgrade your database schema (if `schema.update.enabled` is `false`)
+* Run `helm upgrade` command to perform a rolling upgrade of your installation
 
 Note:
 * Not supported: running newer binaries with an older schema.
@@ -539,6 +542,8 @@ Example:
 
 ### Upgrade Schema
 
+**These steps are only required if `schema.update.enabled` is `false`**. If schema update is enabled the Helm chart will do this for you.
+
 Here are examples of commands you can use to upgrade the "default" schema in your "bring your own" Cassandra database.
 
 Upgrade default schema:

charts/temporal/templates/server-job.yaml

@@ -1,16 +1,17 @@
 {{- if or $.Values.schema.createDatabase.enabled $.Values.schema.setup.enabled $.Values.schema.update.enabled }}
+{{- $semVer := semver $.Chart.AppVersion }}
+{{- $jobName := include "temporal.componentname" (list $ (printf "schema-%d-%d-rev-%d" $semVer.Major $semVer.Minor .Release.Revision)) }}
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ include "temporal.componentname" (list $ (printf "schema-%d" .Release.Revision | replace "." "-")) }}
+  name: {{ $jobName }}
   labels:
     {{- include "temporal.resourceLabels" (list $ "database" "") | nindent 4 }}
 spec:
   backoffLimit: {{ $.Values.schema.setup.backoffLimit }}
-  ttlSecondsAfterFinished: 86400
   template:
     metadata:
-      name: {{ include "temporal.componentname" (list $ (printf "schema-%d" .Release.Revision | replace "." "-")) }}
+      name: {{ $jobName }}
       labels:
         {{- include "temporal.resourceLabels" (list $ "database" "") | nindent 8 }}
         {{- with $.Values.schema.podLabels }}