Merge branch '1522-re-run-create-kustomization-variables-configmaps-script-on-change' into 'main'

Resolve "Re-run create-kustomization-variables-configmaps-script on change"

Closes #1522

See merge request !1894

flux2/cluster/base/migration-scripts.yaml

@@ -12,6 +12,11 @@ spec:
     name: stackspin
   path: ./flux2/core/base/migration-scripts
   prune: true
+  # We want to be able to re-run Jobs. By changing an immutable field of the
+  # Job *and* having this force setting, flux will delete and recreate the Job,
+  # making it run again. Apparently anything in `spec.template` is immutable,
+  # so we can just change a label in `spec.template.metadata.labels`.
+  force: true
   wait: true
   postBuild:
     substituteFrom:

flux2/core/base/migration-scripts/create-kustomization-variables-configmaps-job.yaml

@@ -9,6 +9,13 @@ metadata:
   namespace: flux-system
 spec:
   template:
+    metadata:
+      labels:
+        # We set this label because this is an immutable property of the Job.
+        # Combined with the `spec.force: true` property on the Kustomization
+        # that manages this Job, flux should recreate this Job whenever we
+        # change this label, making the Job run again on existing clusters.
+        stackspin.net/stackspin-version: "2.4"
     spec:
       serviceAccountName: stackspin-upgrade
       containers: