From ce2129928011d21b24de52ff76e3f99dfe05d0ab Mon Sep 17 00:00:00 2001
From: Andrei Kvapil <kvapss@gmail.com>
Date: Mon, 1 Sep 2025 13:05:05 +0200
Subject: [PATCH] Get rid of bitnami images

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
---
 .../virtual-machine/templates/vm-update-hook.yaml     |  2 +-
 packages/apps/vm-disk/templates/pvc-resize-hook.yaml  |  2 +-
 .../apps/vm-instance/templates/vm-update-hook.yaml    |  2 +-
 packages/extra/etcd/templates/hook/job.yaml           |  2 +-
 packages/system/dashboard/values.yaml                 | 11 +++++++++++
 packages/system/seaweedfs/templates/hook.yaml         |  2 +-
 packages/system/seaweedfs/values.yaml                 |  2 ++
 packages/system/velero/values.yaml                    |  4 ++++
 packages/system/vertical-pod-autoscaler/values.yaml   |  5 +++++
 9 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/packages/apps/virtual-machine/templates/vm-update-hook.yaml b/packages/apps/virtual-machine/templates/vm-update-hook.yaml
index aa233f95..3458b7d4 100644
--- a/packages/apps/virtual-machine/templates/vm-update-hook.yaml
+++ b/packages/apps/virtual-machine/templates/vm-update-hook.yaml
@@ -51,7 +51,7 @@ spec:
       restartPolicy: Never
       containers:
         - name: update-resources
-          image: bitnami/kubectl:latest
+          image: docker.io/alpine/k8s:1.33.4
           resources:
             requests:
               memory: "16Mi"
diff --git a/packages/apps/vm-disk/templates/pvc-resize-hook.yaml b/packages/apps/vm-disk/templates/pvc-resize-hook.yaml
index 83737452..2619ed15 100644
--- a/packages/apps/vm-disk/templates/pvc-resize-hook.yaml
+++ b/packages/apps/vm-disk/templates/pvc-resize-hook.yaml
@@ -19,7 +19,7 @@ spec:
       backoffLimit: 1
       containers:
         - name: resize
-          image: bitnami/kubectl
+          image: docker.io/alpine/k8s:1.33.4
           command: ["sh", "-xec"]
           args:
             - |
diff --git a/packages/apps/vm-instance/templates/vm-update-hook.yaml b/packages/apps/vm-instance/templates/vm-update-hook.yaml
index 61a6fec1..dca12353 100644
--- a/packages/apps/vm-instance/templates/vm-update-hook.yaml
+++ b/packages/apps/vm-instance/templates/vm-update-hook.yaml
@@ -41,7 +41,7 @@ spec:
       restartPolicy: Never
       containers:
         - name: update-resources
-          image: bitnami/kubectl:latest
+          image: docker.io/alpine/k8s:1.33.4
           resources:
             requests:
               memory: "16Mi"
diff --git a/packages/extra/etcd/templates/hook/job.yaml b/packages/extra/etcd/templates/hook/job.yaml
index 1a93e6f2..3bf2f84b 100644
--- a/packages/extra/etcd/templates/hook/job.yaml
+++ b/packages/extra/etcd/templates/hook/job.yaml
@@ -25,7 +25,7 @@ spec:
       serviceAccountName: etcd-hook
       containers:
         - name: kubectl
-          image: bitnami/kubectl:latest
+          image: docker.io/alpine/k8s:1.33.4
           command:
           - sh
           args:
diff --git a/packages/system/dashboard/values.yaml b/packages/system/dashboard/values.yaml
index 56420255..a2bc28d4 100644
--- a/packages/system/dashboard/values.yaml
+++ b/packages/system/dashboard/values.yaml
@@ -21,7 +21,18 @@ kubeapps:
       repository: dashboard
       tag: v0.36.0-alpha.1
       digest: "sha256:54906b3d2492c8603a347a5938b6db36e5ed5c4149111cae1804ac9110361947"
+  frontend:
+    image:
+      repository: bitnamilegacy/nginx
+  authProxy:
+    image:
+      repository: bitnamilegacy/oauth2-proxy
   redis:
+    image:
+      repository: bitnamilegacy/redis
+    kubectl:
+      image:
+        repository: bitnamilegacy/kubectl
     master:
       resourcesPreset: "none"
       resources:
diff --git a/packages/system/seaweedfs/templates/hook.yaml b/packages/system/seaweedfs/templates/hook.yaml
index f4d04bb9..407d180f 100644
--- a/packages/system/seaweedfs/templates/hook.yaml
+++ b/packages/system/seaweedfs/templates/hook.yaml
@@ -26,7 +26,7 @@ spec:
       serviceAccountName: seaweedfs-hook
       containers:
         - name: kubectl
-          image: bitnami/kubectl:latest
+          image: docker.io/alpine/k8s:1.33.4
           command:
           - sh
           args:
diff --git a/packages/system/seaweedfs/values.yaml b/packages/system/seaweedfs/values.yaml
index c0c5435b..8fec816e 100644
--- a/packages/system/seaweedfs/values.yaml
+++ b/packages/system/seaweedfs/values.yaml
@@ -21,6 +21,8 @@ seaweedfs:
       type: ""
   volume:
     replicas: 2
+    resizeHook:
+      image: docker.io/alpine/k8s:1.33.4
     # minimum free disk space(in percents). If free disk space lower this value - all volumes marks as ReadOnly
     minFreeSpacePercent: 5
     dataDirs:
diff --git a/packages/system/velero/values.yaml b/packages/system/velero/values.yaml
index 8a03f67b..bf980e4b 100644
--- a/packages/system/velero/values.yaml
+++ b/packages/system/velero/values.yaml
@@ -13,3 +13,7 @@ velero:
     volumeSnapshotLocation: null
     namespace: cozy-velero
     features: EnableCSI
+  kubectl:
+    image:
+      repository: docker.io/alpine/k8s
+      tag: 1.33.4
diff --git a/packages/system/vertical-pod-autoscaler/values.yaml b/packages/system/vertical-pod-autoscaler/values.yaml
index 751df1a4..51327531 100644
--- a/packages/system/vertical-pod-autoscaler/values.yaml
+++ b/packages/system/vertical-pod-autoscaler/values.yaml
@@ -4,6 +4,11 @@ vertical-pod-autoscaler:
   crds:
     enabled: false
 
+    image:
+      registry: docker.io
+      repository: alpine/k8s
+      tag: 1.33.4
+
   updater:
     resources:
       limits: