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

Switch from `bitnami/kubectl` to `quay.io/appuio/oc` image

Author: simu

.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 <[email protected]>",
       "copyright_year": "2021",
       "github_owner": "projectsyn",
       "github_name": "component-vcluster",
       "github_url": "https://github.com/projectsyn/component-vcluster",
-      "_template": "https://github.com/projectsyn/commodore-component-template.git"
+      "_template": "https://github.com/projectsyn/commodore-component-template.git",
+      "_commit": "56dd2ee980f197ec2c8b3977c16458e43d0c6ef2"
     }
   },
   "directory": null

class/defaults.yml

@@ -20,10 +20,10 @@ parameters:
         registry: ghcr.io
         image: loft-sh/vcluster-oss
         tag: "0.24.1"
-      kubectl:
-        registry: docker.io
-        image: bitnami/kubectl
-        tag: "1.32.1"
+      oc:
+        registry: quay.io
+        image: appuio/oc
+        tag: v4.18
 
     storage:
       persistence: auto

component/ocp-route.libsonnet

@@ -63,7 +63,7 @@ local routePatchJob = function(name, secretName, host)
           serviceAccountName: serviceAccount.metadata.name,
           containers_+: {
             create_route: kube.Container(name) {
-              image: common.formatImage(params.images.kubectl),
+              image: common.formatImage(params.images.oc),
               workingDir: '/export',
               command: [ 'sh' ],
               args: [ '-eu', '-c', script ],

component/post-setup.libsonnet

@@ -19,7 +19,7 @@ local synthesize = function(name, secretName, url)
         spec+: {
           containers_+: {
             patch_crds: kube.Container(jobName) {
-              image: common.formatImage(params.images.kubectl),
+              image: common.formatImage(params.images.oc),
               workingDir: '/export',
               command: [ 'sh' ],
               args: [ '-eu', '-c', importstr './scripts/synthesize.sh', '--', url ],

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$"
+      ]
     }
   ]
 }

tests/golden/oidc/oidc/oidc/11_synthesize.yaml

@@ -52,7 +52,7 @@ spec:
               value: /export
             - name: VCLUSTER_SERVER_URL
               value: https://oidc:443
-          image: docker.io/bitnami/kubectl:1.32.1
+          image: quay.io/appuio/oc:v4.18
           imagePullPolicy: IfNotPresent
           name: oidc-synthesize
           ports: []