Merge pull request #130 from projectsyn/cleanup-job-image-helm-param

Use Helm value to configure cleanup job image
projectsyn · Nov 21, 2023 · 29618e4 · 29618e4
2 parents c59af88 + f262186
commit 29618e4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 33 deletions.
diff --git a/class/backup-k8up.yml b/class/backup-k8up.yml
@@ -39,6 +39,3 @@ parameters:
         - type: jsonnet
           filter: postprocess/optional_global_config.jsonnet
           path: ${_instance}/01_k8up_helmchart/k8up/templates
-        - type: jsonnet
-          filter: postprocess/cleanup-job.jsonnet
-          path: ${_instance}/01_k8up_helmchart/k8up/templates
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -23,6 +23,7 @@ parameters:
     helmValues:
       replicaCount: 1
       image: ${backup_k8up:images:k8up}
+      cleanup: ${backup_k8up:images:kubectl}
       k8up:
         enableLeaderElection: true
         timezone: "Etc/UTC"

diff --git a/docs/modules/ROOT/pages/references/parameters.adoc b/docs/modules/ROOT/pages/references/parameters.adoc
@@ -26,8 +26,8 @@ Please customize K8up image location and tag in this dict instead of directly in
 
 The value of `k8up.tag` in this dict is used by the component to select the CRD YAML to download.
 
-The component uses the contents of field `kubectl` to patch the Helm chart's cleanup job.
-This allows users to configure a custom location for the `kubectl` image used by the job.
+The component passes field `kubectl` to the Helm chart in value `cleanup`.
+This allows users to control which container image is used by the cleanup job.
 
 == `helmValues`
 

diff --git a/postprocess/cleanup-job.jsonnet b/postprocess/cleanup-job.jsonnet