From cad98f7a59f46907e23163fbb1f39f5e449fbe2d Mon Sep 17 00:00:00 2001
From: bcmmbaga <bethuelmbaga12@gmail.com>
Date: Wed, 4 Feb 2026 18:04:50 +0300
Subject: [PATCH] Refactor init container commands to use sh instead of bash

---
 .../templates/kubernetes-nbresource.yaml              |  6 +++---
 .../templates/kubernetes-nbresource.yaml              | 11 ++++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/charts/kubernetes-operator/templates/kubernetes-nbresource.yaml b/charts/kubernetes-operator/templates/kubernetes-nbresource.yaml
index 9554d04..3448f74 100644
--- a/charts/kubernetes-operator/templates/kubernetes-nbresource.yaml
+++ b/charts/kubernetes-operator/templates/kubernetes-nbresource.yaml
@@ -29,10 +29,10 @@ spec:
       - name: wait-network-ready
         image: "netbirdio/kubectl:latest"
         command:
-        - bash
+        - sh
         - -c
         args:
-        - kubectl wait --for 'jsonpath={.status.networkID}' -n {{ $routerNS }} nbroutingpeer router; 
+        - kubectl wait --for 'jsonpath={.status.networkID}' -n {{ $routerNS }} nbroutingpeer router;
       containers:
       - name: apply-nbresource
         image: "netbirdio/kubectl:latest"
@@ -62,7 +62,7 @@ spec:
               tcpPorts:
               - 443
         command:
-        - bash
+        - sh
         - -c
         args:
         - kubectl delete NBResource --ignore-not-found -n default kubernetes; export NETWORK_ID=$(kubectl get NBRoutingPeer -n {{ $routerNS }} router -o 'jsonpath={.status.networkID}'); echo "$NBRESOURCE_VALUE" | envsubst | kubectl apply -f -
diff --git a/charts/netbird-operator-config/templates/kubernetes-nbresource.yaml b/charts/netbird-operator-config/templates/kubernetes-nbresource.yaml
index 8143358..5241185 100644
--- a/charts/netbird-operator-config/templates/kubernetes-nbresource.yaml
+++ b/charts/netbird-operator-config/templates/kubernetes-nbresource.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.enabled .Values.kubernetesAPI.enabled }}
+{{- if .Values.kubernetesAPI.enabled }}
 {{- $routerNS := .Release.Namespace }}
 {{- if .Values.namespacedNetworks }}
 {{- $routerNS = "default" }}
@@ -21,18 +21,15 @@ spec:
       labels:
         app.kubernetes.io/component: operator
         {{- include "netbird-operator-config.labels" . | nindent 8 }}
-        {{- with .Values.operator.podLabels }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
     spec:
       initContainers:
       - name: wait-network-ready
         image: "netbirdio/kubectl:latest"
         command:
-        - bash
+        - sh
         - -c
         args:
-        - kubectl wait --for 'jsonpath={.status.networkID}' -n {{ $routerNS }} nbroutingpeer router; 
+        - kubectl wait --for 'jsonpath={.status.networkID}' -n {{ $routerNS }} nbroutingpeer router;
       containers:
       - name: apply-nbresource
         image: "netbirdio/kubectl:latest"
@@ -62,7 +59,7 @@ spec:
               tcpPorts:
               - 443
         command:
-        - bash
+        - sh
         - -c
         args:
         - kubectl delete NBResource --ignore-not-found -n default kubernetes; export NETWORK_ID=$(kubectl get NBRoutingPeer -n {{ $routerNS }} router -o 'jsonpath={.status.networkID}'); echo "$NBRESOURCE_VALUE" | envsubst | kubectl apply -f -