From 51bf77348bfca24230920cdf57bbfb1f41a5a39c Mon Sep 17 00:00:00 2001 From: bcmmbaga Date: Wed, 11 Feb 2026 18:04:30 +0300 Subject: [PATCH 1/2] sync helm charts --- .../templates/kubernetes-nbresource.yaml | 6 +++--- helm/kubernetes-operator/values.yaml | 2 +- .../templates/kubernetes-nbresource.yaml | 11 ++++------- .../netbird-operator-config/templates/nbpolicies.yaml | 2 +- .../templates/nbroutingpeers.yaml | 2 +- helm/netbird-operator-config/templates/rbac.yaml | 2 +- helm/netbird-operator-config/values.yaml | 2 +- 7 files changed, 12 insertions(+), 15 deletions(-) diff --git a/helm/kubernetes-operator/templates/kubernetes-nbresource.yaml b/helm/kubernetes-operator/templates/kubernetes-nbresource.yaml index 9554d04..3448f74 100644 --- a/helm/kubernetes-operator/templates/kubernetes-nbresource.yaml +++ b/helm/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/helm/kubernetes-operator/values.yaml b/helm/kubernetes-operator/values.yaml index 4355a2c..9bf315c 100644 --- a/helm/kubernetes-operator/values.yaml +++ b/helm/kubernetes-operator/values.yaml @@ -203,4 +203,4 @@ general: # General labels, applied to all created K8s resources labels: {} # acme_com_managed_by: platform-engineering - # acme_com_owned_by: release-engineering \ No newline at end of file + # acme_com_owned_by: release-engineering diff --git a/helm/netbird-operator-config/templates/kubernetes-nbresource.yaml b/helm/netbird-operator-config/templates/kubernetes-nbresource.yaml index 8143358..5241185 100644 --- a/helm/netbird-operator-config/templates/kubernetes-nbresource.yaml +++ b/helm/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 - diff --git a/helm/netbird-operator-config/templates/nbpolicies.yaml b/helm/netbird-operator-config/templates/nbpolicies.yaml index c86e76f..4dd0733 100644 --- a/helm/netbird-operator-config/templates/nbpolicies.yaml +++ b/helm/netbird-operator-config/templates/nbpolicies.yaml @@ -27,4 +27,4 @@ spec: {{- if hasKey $v "bidirectional" }} bidirectional: {{ $v.bidirectional }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/netbird-operator-config/templates/nbroutingpeers.yaml b/helm/netbird-operator-config/templates/nbroutingpeers.yaml index eaa1d74..940938f 100644 --- a/helm/netbird-operator-config/templates/nbroutingpeers.yaml +++ b/helm/netbird-operator-config/templates/nbroutingpeers.yaml @@ -80,4 +80,4 @@ spec: {{- end }} {{- end }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/netbird-operator-config/templates/rbac.yaml b/helm/netbird-operator-config/templates/rbac.yaml index 678ef16..56f2ea6 100644 --- a/helm/netbird-operator-config/templates/rbac.yaml +++ b/helm/netbird-operator-config/templates/rbac.yaml @@ -42,4 +42,4 @@ roleRef: subjects: - kind: ServiceAccount name: {{ include "netbird-operator-config.serviceAccountName" . }} - namespace: {{ .Release.Namespace }} \ No newline at end of file + namespace: {{ .Release.Namespace }} diff --git a/helm/netbird-operator-config/values.yaml b/helm/netbird-operator-config/values.yaml index 2bf1cd0..b9c187a 100644 --- a/helm/netbird-operator-config/values.yaml +++ b/helm/netbird-operator-config/values.yaml @@ -54,4 +54,4 @@ kubernetesAPI: serviceAccount: create: true name: "" - annotations: {} \ No newline at end of file + annotations: {} From 3ddd11d9d21952eb635f13703fef329e4cd75624 Mon Sep 17 00:00:00 2001 From: bcmmbaga Date: Wed, 11 Feb 2026 19:30:20 +0300 Subject: [PATCH 2/2] bump operator version to v0.2.1 --- helm/kubernetes-operator/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/kubernetes-operator/Chart.yaml b/helm/kubernetes-operator/Chart.yaml index ca9b941..80357f4 100644 --- a/helm/kubernetes-operator/Chart.yaml +++ b/helm/kubernetes-operator/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: kubernetes-operator description: NetBird Kubernetes Operator type: application -version: 0.2.0 -appVersion: "0.2.0" +version: 0.2.1 +appVersion: "0.2.1"