From a19c435b80c3730815b8e473b8246386ef95bd2f Mon Sep 17 00:00:00 2001 From: "christian.huth" Date: Mon, 2 Mar 2026 10:03:02 +0100 Subject: [PATCH 1/3] make kubectl image configurable --- charts/netbird-operator-config/Chart.yaml | 2 +- .../templates/kubernetes-nbresource.yaml | 4 ++-- charts/netbird-operator-config/values.yaml | 11 +++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/charts/netbird-operator-config/Chart.yaml b/charts/netbird-operator-config/Chart.yaml index d1781cc..05b11f4 100644 --- a/charts/netbird-operator-config/Chart.yaml +++ b/charts/netbird-operator-config/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: netbird-operator-config description: NetBird Operator Configuration type: application -version: 0.1.0 +version: 0.1.1 appVersion: "0.2.0" diff --git a/charts/netbird-operator-config/templates/kubernetes-nbresource.yaml b/charts/netbird-operator-config/templates/kubernetes-nbresource.yaml index 5241185..85bd0d8 100644 --- a/charts/netbird-operator-config/templates/kubernetes-nbresource.yaml +++ b/charts/netbird-operator-config/templates/kubernetes-nbresource.yaml @@ -24,7 +24,7 @@ spec: spec: initContainers: - name: wait-network-ready - image: "netbirdio/kubectl:latest" + image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default latest }} command: - sh - -c @@ -32,7 +32,7 @@ spec: - kubectl wait --for 'jsonpath={.status.networkID}' -n {{ $routerNS }} nbroutingpeer router; containers: - name: apply-nbresource - image: "netbirdio/kubectl:latest" + image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default latest }} env: - name: NBRESOURCE_VALUE value: | diff --git a/charts/netbird-operator-config/values.yaml b/charts/netbird-operator-config/values.yaml index b9c187a..96fce77 100644 --- a/charts/netbird-operator-config/values.yaml +++ b/charts/netbird-operator-config/values.yaml @@ -55,3 +55,14 @@ serviceAccount: create: true name: "" annotations: {} + +# This sets the container image more information can be found here: https://kubernetes.io/docs/concepts/containers/images/ +image: + # Set operator image registry + registry: docker.io + # Set operator image repository + repository: netbirdio/kubectl + # This sets the pull policy for images. + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: latest From 567856bf967c6d637700d2ea9561e75db5810ea9 Mon Sep 17 00:00:00 2001 From: "christian.huth" Date: Mon, 2 Mar 2026 10:04:14 +0100 Subject: [PATCH 2/3] wrap latest in quotation marks --- .../templates/kubernetes-nbresource.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/netbird-operator-config/templates/kubernetes-nbresource.yaml b/charts/netbird-operator-config/templates/kubernetes-nbresource.yaml index 85bd0d8..7c3acfe 100644 --- a/charts/netbird-operator-config/templates/kubernetes-nbresource.yaml +++ b/charts/netbird-operator-config/templates/kubernetes-nbresource.yaml @@ -24,7 +24,7 @@ spec: spec: initContainers: - name: wait-network-ready - image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default latest }} + image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default "latest" }} command: - sh - -c @@ -32,7 +32,7 @@ spec: - kubectl wait --for 'jsonpath={.status.networkID}' -n {{ $routerNS }} nbroutingpeer router; containers: - name: apply-nbresource - image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default latest }} + image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default "latest" }} env: - name: NBRESOURCE_VALUE value: | From 1230d4cae4cc8a4ee340014b542d83400225d2ef Mon Sep 17 00:00:00 2001 From: "christian.huth" Date: Mon, 2 Mar 2026 10:05:11 +0100 Subject: [PATCH 3/3] remove pullPolicy --- charts/netbird-operator-config/values.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/charts/netbird-operator-config/values.yaml b/charts/netbird-operator-config/values.yaml index 96fce77..24e8df6 100644 --- a/charts/netbird-operator-config/values.yaml +++ b/charts/netbird-operator-config/values.yaml @@ -62,7 +62,5 @@ image: registry: docker.io # Set operator image repository repository: netbirdio/kubectl - # This sets the pull policy for images. - pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: latest