Skip to content

Commit 0e7aa0b

Browse files
authored
Merge pull request #157 from projectsyn/deps/replace-bitnami
Switch from `bitnami/kubectl` to `quay.io/appuio/oc` image
2 parents dd05673 + b28b8a7 commit 0e7aa0b

4 files changed

Lines changed: 25 additions & 9 deletions

File tree

.cruft.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"template": "https://github.com/projectsyn/commodore-component-template.git",
3-
"commit": "98d16f99766e6c6d97322dbe42e058f0e2bf73d0",
3+
"commit": "56dd2ee980f197ec2c8b3977c16458e43d0c6ef2",
44
"checkout": "main",
55
"context": {
66
"cookiecutter": {
@@ -17,14 +17,15 @@
1717
"automerge_patch_v0": "n",
1818
"automerge_patch_regexp_blocklist": "",
1919
"automerge_patch_v0_regexp_allowlist": "",
20-
"automerge_minor_regexp_allowlist": "",
20+
"automerge_minor_regexp_allowlist": "^quay.io/appuio/oc$",
2121
"auto_release": "y",
2222
"copyright_holder": "VSHN AG <info@vshn.ch>",
2323
"copyright_year": "2021",
2424
"github_owner": "projectsyn",
2525
"github_name": "component-backup-k8up",
2626
"github_url": "https://github.com/projectsyn/component-backup-k8up",
27-
"_template": "https://github.com/projectsyn/commodore-component-template.git"
27+
"_template": "https://github.com/projectsyn/commodore-component-template.git",
28+
"_commit": "56dd2ee980f197ec2c8b3977c16458e43d0c6ef2"
2829
}
2930
},
3031
"directory": null

class/defaults.yml

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

2222
helmReleaseName: k8up
2323

@@ -27,7 +27,7 @@ parameters:
2727
helmValues:
2828
replicaCount: 1
2929
image: ${backup_k8up:images:k8up}
30-
cleanup: ${backup_k8up:images:kubectl}
30+
cleanup: ${backup_k8up:images:oc}
3131
priorityClassName: ${backup_k8up:priorityClass}
3232
k8up:
3333
enableLeaderElection: true

renovate.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,21 @@
3737
"automerge",
3838
"bump:patch"
3939
]
40+
},
41+
{
42+
"matchUpdateTypes": [
43+
"minor"
44+
],
45+
"automerge": true,
46+
"platformAutomerge": false,
47+
"labels": [
48+
"dependency",
49+
"automerge",
50+
"bump:minor"
51+
],
52+
"matchPackagePatterns": [
53+
"^quay.io/appuio/oc$"
54+
]
4055
}
4156
]
4257
}

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: docker.io/bitnami/kubectl:latest
103+
image: quay.io/appuio/oc:v4.18
104104
imagePullPolicy: IfNotPresent
105105
name: k8up-cleanup
106106
restartPolicy: Never

0 commit comments

Comments
 (0)