Skip to content

Commit 88a4ff8

Browse files
authored
Merge pull request #168 from projectsyn/commodore-renovate/patch-backup-k8up
Update Helm release k8up to v4.8.6
2 parents 81bdaed + b51cc7e commit 88a4ff8

9 files changed

Lines changed: 17 additions & 25 deletions

File tree

class/defaults.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,14 @@ parameters:
66
charts:
77
k8up:
88
source: https://k8up-io.github.io/k8up
9-
version: 4.8.5
9+
version: 4.8.6
1010

1111
images:
1212
k8up:
1313
registry: ghcr.io
1414
repository: k8up-io/k8up
15-
tag: v2.13.0
15+
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
app.kubernetes.io/instance: k8up
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/name: k8up
12-
helm.sh/chart: k8up-4.8.5
12+
helm.sh/chart: k8up-4.8.6
1313
name: cleanup-service-account
1414
---
1515
apiVersion: rbac.authorization.k8s.io/v1
@@ -23,7 +23,7 @@ metadata:
2323
app.kubernetes.io/instance: k8up
2424
app.kubernetes.io/managed-by: Helm
2525
app.kubernetes.io/name: k8up
26-
helm.sh/chart: k8up-4.8.5
26+
helm.sh/chart: k8up-4.8.6
2727
name: k8up-cleanup-roles
2828
namespace: syn-backup-k8up
2929
rules:
@@ -53,7 +53,7 @@ metadata:
5353
app.kubernetes.io/instance: k8up
5454
app.kubernetes.io/managed-by: Helm
5555
app.kubernetes.io/name: k8up
56-
helm.sh/chart: k8up-4.8.5
56+
helm.sh/chart: k8up-4.8.6
5757
name: cleanup-rolebinding
5858
roleRef:
5959
apiGroup: rbac.authorization.k8s.io
@@ -75,7 +75,7 @@ metadata:
7575
app.kubernetes.io/instance: k8up
7676
app.kubernetes.io/managed-by: Helm
7777
app.kubernetes.io/name: k8up
78-
helm.sh/chart: k8up-4.8.5
78+
helm.sh/chart: k8up-4.8.6
7979
name: k8up-cleanup
8080
spec:
8181
template:
@@ -88,7 +88,7 @@ spec:
8888
containers:
8989
- args:
9090
- |
91-
#!/bin/bash
91+
set -eo pipefail
9292
9393
NAMESPACES=$(kubectl get namespace -ojson | jq -r '.items[].metadata.name')
9494
@@ -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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/instance: k8up
66
app.kubernetes.io/managed-by: Helm
77
app.kubernetes.io/name: k8up
8-
helm.sh/chart: k8up-4.8.5
8+
helm.sh/chart: k8up-4.8.6
99
name: k8up
1010
roleRef:
1111
apiGroup: rbac.authorization.k8s.io

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/instance: k8up
66
app.kubernetes.io/managed-by: Helm
77
app.kubernetes.io/name: k8up
8-
helm.sh/chart: k8up-4.8.5
8+
helm.sh/chart: k8up-4.8.6
99
name: k8up
1010
spec:
1111
replicas: 1
@@ -24,7 +24,7 @@ spec:
2424
- operator
2525
env:
2626
- name: BACKUP_IMAGE
27-
value: ghcr.io/k8up-io/k8up:v2.13.0
27+
value: ghcr.io/k8up-io/k8up:v2.13.1
2828
- name: TZ
2929
value: Etc/UTC
3030
- name: BACKUP_ENABLE_LEADER_ELECTION
@@ -43,7 +43,7 @@ spec:
4343
value: k8up.io/backupcommand
4444
- name: BACKUP_BACKOFFLIMIT
4545
value: '2'
46-
image: ghcr.io/k8up-io/k8up:v2.13.0
46+
image: ghcr.io/k8up-io/k8up:v2.13.1
4747
imagePullPolicy: IfNotPresent
4848
livenessProbe:
4949
httpGet:

tests/golden/defaults/backup-k8up/backup-k8up/01_k8up_helmchart/k8up/templates/executor-clusterrole.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/instance: k8up
66
app.kubernetes.io/managed-by: Helm
77
app.kubernetes.io/name: k8up
8-
helm.sh/chart: k8up-4.8.5
8+
helm.sh/chart: k8up-4.8.6
99
name: k8up-executor
1010
rules:
1111
- apiGroups:

tests/golden/defaults/backup-k8up/backup-k8up/01_k8up_helmchart/k8up/templates/operator-clusterrole.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/instance: k8up
66
app.kubernetes.io/managed-by: Helm
77
app.kubernetes.io/name: k8up
8-
helm.sh/chart: k8up-4.8.5
8+
helm.sh/chart: k8up-4.8.6
99
name: k8up-manager
1010
rules:
1111
- apiGroups:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/instance: k8up
66
app.kubernetes.io/managed-by: Helm
77
app.kubernetes.io/name: k8up
8-
helm.sh/chart: k8up-4.8.5
8+
helm.sh/chart: k8up-4.8.6
99
name: k8up-metrics
1010
spec:
1111
ports:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ metadata:
55
app.kubernetes.io/instance: k8up
66
app.kubernetes.io/managed-by: Helm
77
app.kubernetes.io/name: k8up
8-
helm.sh/chart: k8up-4.8.5
8+
helm.sh/chart: k8up-4.8.6
99
name: k8up

0 commit comments

Comments
 (0)