Skip to content

Commit b51cc7e

Browse files
committed
Remove separate cleanup image
All required binaries are now present in the main k8up image, no need for external images.
1 parent 1a5370d commit b51cc7e

3 files changed

Lines changed: 2 additions & 10 deletions

File tree

class/defaults.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ parameters:
1414
repository: k8up-io/k8up
1515
tag: v2.13.1
1616
pullPolicy: IfNotPresent
17-
oc:
18-
registry: quay.io
19-
repository: appuio/oc
20-
tag: v4.19
2117

2218
helmReleaseName: k8up
2319

@@ -27,7 +23,6 @@ parameters:
2723
helmValues:
2824
replicaCount: 1
2925
image: ${backup_k8up:images:k8up}
30-
cleanup: ${backup_k8up:images:oc}
3126
priorityClassName: ${backup_k8up:priorityClass}
3227
k8up:
3328
enableLeaderElection: true

docs/modules/ROOT/pages/references/parameters.adoc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The default K8up Helm chart version to use.
1717
type:: dict
1818
default:: See `class/defaults.yml`
1919

20-
The default Docker image location and tag to use for K8up (key `k8up`) and kubectl (key `kubectl`).
20+
The default Docker image location and tag to use for K8up (key `k8up`).
2121

2222
Entries in this dict should be dictionaries with keys `registry`, `repository`, and `tag`.
2323
This structure provides the basis for https://syn.tools/syn/SDDs/0017-maintenance-with-renovate.html[dependency maintenance with Renovate].
@@ -26,9 +26,6 @@ Please customize K8up image location and tag in this dict instead of directly in
2626

2727
The value of `k8up.tag` in this dict is used by the component to select the CRD YAML to download.
2828

29-
The component passes field `kubectl` to the Helm chart in value `cleanup`.
30-
This allows users to control which container image is used by the cleanup job.
31-
3229
== `helmValues`
3330

3431
[horizontal]

tests/golden/defaults/backup-k8up/backup-k8up/01_k8up_helmchart/k8up/templates/cleanup-hook.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ spec:
100100
command:
101101
- sh
102102
- -c
103-
image: quay.io/appuio/oc:v4.19
103+
image: ghcr.io/k8up-io/k8up:v2.13.1
104104
imagePullPolicy: IfNotPresent
105105
name: k8up-cleanup
106106
restartPolicy: Never

0 commit comments

Comments
 (0)