Merge pull request #240 from projectsyn/deps/replace-bitnami

simu · web-flow · commit d8c9e3f59c78 · 2025-07-29T15:47:47.000+02:00
Switch from `bitnami/kubectl` to `quay.io/appuio/oc` image
diff --git a/.cruft.json b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/projectsyn/commodore-component-template.git",
-  "commit": "98d16f99766e6c6d97322dbe42e058f0e2bf73d0",
+  "commit": "56dd2ee980f197ec2c8b3977c16458e43d0c6ef2",
   "checkout": "main",
   "context": {
     "cookiecutter": {
@@ -17,14 +17,15 @@
       "automerge_patch_v0": "n",
       "automerge_patch_regexp_blocklist": "",
       "automerge_patch_v0_regexp_allowlist": "",
-      "automerge_minor_regexp_allowlist": "",
+      "automerge_minor_regexp_allowlist": "^quay.io/appuio/oc$",
       "auto_release": "y",
       "copyright_holder": "VSHN AG <info@vshn.ch>",
       "copyright_year": "2021",
       "github_owner": "projectsyn",
       "github_name": "component-argocd",
       "github_url": "https://github.com/projectsyn/component-argocd",
-      "_template": "https://github.com/projectsyn/commodore-component-template.git"
+      "_template": "https://github.com/projectsyn/commodore-component-template.git",
+      "_commit": "56dd2ee980f197ec2c8b3977c16458e43d0c6ef2"
     }
   },
   "directory": null
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -32,10 +32,10 @@ parameters:
     http_credentials_secret_name: catalog-http-credentials
 
     images:
-      kubectl:
-        registry: docker.io
-        repository: bitnami/kubectl
-        tag: '1.30.7@sha256:1249fc292e84a38575ee0cadc3e28dcd7ddf5a3a4e5da401b1a8599e8ac52a1b'
+      oc:
+        registry: quay.io
+        repository: appuio/oc
+        tag: v4.18
       kapitan:
         registry: docker.io
         repository: kapicorp/kapitan
diff --git a/component/argocd.jsonnet b/component/argocd.jsonnet
@@ -468,7 +468,7 @@ local tls_cronjob =
             spec+: {
               containers_: {
                 refresh: kube.Container('refresh') {
-                  image: common.render_image('kubectl'),
+                  image: common.render_image('oc', include_tag=true),
                   command: [
                     'kubectl',
                     'delete',
diff --git a/component/hooks.jsonnet b/component/hooks.jsonnet
@@ -60,7 +60,7 @@ local createJob(jobName, hook, args) = kube.Job(jobName) {
         containers_+: {
           annotate_argocd: kube.Container(jobName) {
             workingDir: '/home',
-            image: common.render_image('kubectl', include_tag=true),
+            image: common.render_image('oc', include_tag=true),
             command: [ 'kubectl' ],
             args: args,
             env: [
diff --git a/renovate.json b/renovate.json
@@ -37,6 +37,21 @@
         "automerge",
         "bump:patch"
       ]
+    },
+    {
+      "matchUpdateTypes": [
+        "minor"
+      ],
+      "automerge": true,
+      "platformAutomerge": false,
+      "labels": [
+        "dependency",
+        "automerge",
+        "bump:minor"
+      ],
+      "matchPackagePatterns": [
+        "^quay.io/appuio/oc$"
+      ]
     }
   ]
 }
diff --git a/tests/golden/defaults/argocd/argocd/25_hooks/hooks.yaml b/tests/golden/defaults/argocd/argocd/25_hooks/hooks.yaml
@@ -83,7 +83,7 @@ spec:
           env:
             - name: HOME
               value: /home
-          image: docker.io/bitnami/kubectl:1.30.7@sha256:1249fc292e84a38575ee0cadc3e28dcd7ddf5a3a4e5da401b1a8599e8ac52a1b
+          image: quay.io/appuio/oc:v4.18
           imagePullPolicy: IfNotPresent
           name: argocd-post-sync
           ports: []
diff --git a/tests/golden/defaults/argocd/argocd/30_argocd/10_refresh_argocd_tls.yaml b/tests/golden/defaults/argocd/argocd/30_argocd/10_refresh_argocd_tls.yaml
@@ -74,7 +74,7 @@ spec:
               env:
                 - name: HOME
                   value: /home/refresh
-              image: docker.io/bitnami/kubectl
+              image: quay.io/appuio/oc:v4.18
               imagePullPolicy: IfNotPresent
               name: refresh
               ports: []
diff --git a/tests/golden/https-catalog/argocd/argocd/25_hooks/hooks.yaml b/tests/golden/https-catalog/argocd/argocd/25_hooks/hooks.yaml
@@ -83,7 +83,7 @@ spec:
           env:
             - name: HOME
               value: /home
-          image: docker.io/bitnami/kubectl:1.30.7@sha256:1249fc292e84a38575ee0cadc3e28dcd7ddf5a3a4e5da401b1a8599e8ac52a1b
+          image: quay.io/appuio/oc:v4.18
           imagePullPolicy: IfNotPresent
           name: argocd-post-sync
           ports: []
diff --git a/tests/golden/https-catalog/argocd/argocd/30_argocd/10_refresh_argocd_tls.yaml b/tests/golden/https-catalog/argocd/argocd/30_argocd/10_refresh_argocd_tls.yaml
@@ -74,7 +74,7 @@ spec:
               env:
                 - name: HOME
                   value: /home/refresh
-              image: docker.io/bitnami/kubectl
+              image: quay.io/appuio/oc:v4.18
               imagePullPolicy: IfNotPresent
               name: refresh
               ports: []
diff --git a/tests/golden/openshift/argocd/argocd/25_hooks/hooks.yaml b/tests/golden/openshift/argocd/argocd/25_hooks/hooks.yaml
@@ -83,7 +83,7 @@ spec:
           env:
             - name: HOME
               value: /home
-          image: docker.io/bitnami/kubectl:1.30.7@sha256:1249fc292e84a38575ee0cadc3e28dcd7ddf5a3a4e5da401b1a8599e8ac52a1b
+          image: quay.io/appuio/oc:v4.18
           imagePullPolicy: IfNotPresent
           name: argocd-post-sync
           ports: []
diff --git a/tests/golden/openshift/argocd/argocd/30_argocd/10_refresh_argocd_tls.yaml b/tests/golden/openshift/argocd/argocd/30_argocd/10_refresh_argocd_tls.yaml
@@ -74,7 +74,7 @@ spec:
               env:
                 - name: HOME
                   value: /home/refresh
-              image: docker.io/bitnami/kubectl
+              image: quay.io/appuio/oc:v4.18
               imagePullPolicy: IfNotPresent
               name: refresh
               ports: []
diff --git a/tests/golden/params/argocd/argocd/25_hooks/hooks.yaml b/tests/golden/params/argocd/argocd/25_hooks/hooks.yaml
@@ -83,7 +83,7 @@ spec:
           env:
             - name: HOME
               value: /home
-          image: docker.io/bitnami/kubectl:1.30.7@sha256:1249fc292e84a38575ee0cadc3e28dcd7ddf5a3a4e5da401b1a8599e8ac52a1b
+          image: quay.io/appuio/oc:v4.18
           imagePullPolicy: IfNotPresent
           name: argocd-post-sync
           ports: []
diff --git a/tests/golden/params/argocd/argocd/30_argocd/10_refresh_argocd_tls.yaml b/tests/golden/params/argocd/argocd/30_argocd/10_refresh_argocd_tls.yaml
@@ -74,7 +74,7 @@ spec:
               env:
                 - name: HOME
                   value: /home/refresh
-              image: docker.io/bitnami/kubectl
+              image: quay.io/appuio/oc:v4.18
               imagePullPolicy: IfNotPresent
               name: refresh
               ports: []
diff --git a/tests/golden/prometheus/argocd/argocd/25_hooks/hooks.yaml b/tests/golden/prometheus/argocd/argocd/25_hooks/hooks.yaml
@@ -83,7 +83,7 @@ spec:
           env:
             - name: HOME
               value: /home
-          image: docker.io/bitnami/kubectl:1.30.7@sha256:1249fc292e84a38575ee0cadc3e28dcd7ddf5a3a4e5da401b1a8599e8ac52a1b
+          image: quay.io/appuio/oc:v4.18
           imagePullPolicy: IfNotPresent
           name: argocd-post-sync
           ports: []
diff --git a/tests/golden/prometheus/argocd/argocd/30_argocd/10_refresh_argocd_tls.yaml b/tests/golden/prometheus/argocd/argocd/30_argocd/10_refresh_argocd_tls.yaml
@@ -74,7 +74,7 @@ spec:
               env:
                 - name: HOME
                   value: /home/refresh
-              image: docker.io/bitnami/kubectl
+              image: quay.io/appuio/oc:v4.18
               imagePullPolicy: IfNotPresent
               name: refresh
               ports: []
diff --git a/tests/golden/syn-teams/argocd/argocd/25_hooks/hooks.yaml b/tests/golden/syn-teams/argocd/argocd/25_hooks/hooks.yaml
@@ -83,7 +83,7 @@ spec:
           env:
             - name: HOME
               value: /home
-          image: docker.io/bitnami/kubectl:1.30.7@sha256:1249fc292e84a38575ee0cadc3e28dcd7ddf5a3a4e5da401b1a8599e8ac52a1b
+          image: quay.io/appuio/oc:v4.18
           imagePullPolicy: IfNotPresent
           name: argocd-post-sync
           ports: []
diff --git a/tests/golden/syn-teams/argocd/argocd/30_argocd/10_refresh_argocd_tls.yaml b/tests/golden/syn-teams/argocd/argocd/30_argocd/10_refresh_argocd_tls.yaml
@@ -74,7 +74,7 @@ spec:
               env:
                 - name: HOME
                   value: /home/refresh
-              image: docker.io/bitnami/kubectl
+              image: quay.io/appuio/oc:v4.18
               imagePullPolicy: IfNotPresent
               name: refresh
               ports: []

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,21 @@`
`37`	`37`	`"automerge",`
`38`	`38`	`"bump:patch"`
`39`	`39`	`]`
	`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`	`+ ]`
`40`	`55`	`}`
`41`	`56`	`]`
`42`	`57`	`}`