From bd3831cc97ab4d21802b9262dda23cacdc58b16f Mon Sep 17 00:00:00 2001
From: "M. Essam" <github@messam.xyz>
Date: Wed, 17 Sep 2025 18:18:45 +0300
Subject: [PATCH] Fix/bitnami kubectl (#17)

* Replace bitnami kubectl image with SUSE image

* Allow users to specify custom kubectl image for kubernetes-nbresource creation

* Fix missed instances
---
 charts/kubernetes-operator/Chart.yaml                         | 2 +-
 .../kubernetes-operator/templates/kubernetes-nbresource.yaml  | 4 ++--
 charts/kubernetes-operator/templates/pre-delete.yaml          | 4 ++--
 charts/kubernetes-operator/values.yaml                        | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/charts/kubernetes-operator/Chart.yaml b/charts/kubernetes-operator/Chart.yaml
index 40b2bda..a1c7370 100644
--- a/charts/kubernetes-operator/Chart.yaml
+++ b/charts/kubernetes-operator/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: kubernetes-operator
 description: NetBird Kubernetes Operator
 type: application
-version: 0.1.13
+version: 0.1.14
 appVersion: "0.1.4"
diff --git a/charts/kubernetes-operator/templates/kubernetes-nbresource.yaml b/charts/kubernetes-operator/templates/kubernetes-nbresource.yaml
index 375366f..dc54293 100644
--- a/charts/kubernetes-operator/templates/kubernetes-nbresource.yaml
+++ b/charts/kubernetes-operator/templates/kubernetes-nbresource.yaml
@@ -27,7 +27,7 @@ spec:
     spec:
       initContainers:
       - name: wait-network-ready
-        image: "bitnami/kubectl:latest"
+        image: {{ .Values.ingress.kubernetesAPI.customKubectlImage | default "registry.suse.com/suse/kubectl:latest"}}
         command:
         - bash
         - -c
@@ -35,7 +35,7 @@ spec:
         - kubectl wait --for 'jsonpath={.status.networkID}' -n {{ $routerNS }} nbroutingpeer router; 
       containers:
       - name: apply-nbresource
-        image: "bitnami/kubectl:latest"
+        image: {{ .Values.ingress.kubernetesAPI.customKubectlImage | default "registry.suse.com/suse/kubectl:latest"}}
         env:
         - name: NBRESOURCE_VALUE
           value: |
diff --git a/charts/kubernetes-operator/templates/pre-delete.yaml b/charts/kubernetes-operator/templates/pre-delete.yaml
index 4a0d159..0121b19 100644
--- a/charts/kubernetes-operator/templates/pre-delete.yaml
+++ b/charts/kubernetes-operator/templates/pre-delete.yaml
@@ -22,7 +22,7 @@ spec:
     spec:
       containers:
       - name: pre-delete
-        image: "bitnami/kubectl:latest"
+        image: {{ .Values.ingress.kubernetesAPI.customKubectlImage | default "registry.suse.com/suse/kubectl:latest"}}
         args:
         - delete
         - --all
@@ -57,7 +57,7 @@ spec:
     spec:
       containers:
       - name: pre-delete
-        image: "bitnami/kubectl:latest"
+        image: {{ .Values.ingress.kubernetesAPI.customKubectlImage | default "registry.suse.com/suse/kubectl:latest"}}
         args:
         - delete
         - --all
diff --git a/charts/kubernetes-operator/values.yaml b/charts/kubernetes-operator/values.yaml
index 6bcaa17..d238055 100644
--- a/charts/kubernetes-operator/values.yaml
+++ b/charts/kubernetes-operator/values.yaml
@@ -147,6 +147,7 @@ ingress:
     # - group2
     policies: []
     # - default
+    customKubectlImage: "registry.suse.com/suse/kubectl:latest"
   router:
     # Deploy routing peer(s)
     enabled: false