From c86ef5c5304e04ed9dfd11753ba4eaee9d7e7b70 Mon Sep 17 00:00:00 2001
From: "M. Essam" <github@messam.xyz>
Date: Wed, 17 Dec 2025 12:23:52 +0200
Subject: [PATCH] Fix helm chart releaser multiple charts separate version
 (#84)

---
 .github/workflows/helm.yml                                    | 2 +-
 .../templates/kubernetes-nbresource.yaml                      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml
index 3fd7246..6793b0e 100644
--- a/.github/workflows/helm.yml
+++ b/.github/workflows/helm.yml
@@ -40,4 +40,4 @@ jobs:
           charts_dir: helm
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          CR_RELEASE_NAME_TEMPLATE: "helm-v{{ .Version }}"
+          CR_RELEASE_NAME_TEMPLATE: "helm-{{ .Name }}-v{{ .Version }}"
diff --git a/helm/netbird-operator-config/templates/kubernetes-nbresource.yaml b/helm/netbird-operator-config/templates/kubernetes-nbresource.yaml
index aef1a5f..8143358 100644
--- a/helm/netbird-operator-config/templates/kubernetes-nbresource.yaml
+++ b/helm/netbird-operator-config/templates/kubernetes-nbresource.yaml
@@ -1,6 +1,6 @@
-{{- if and .Values.ingress.enabled .Values.ingress.kubernetesAPI.enabled }}
+{{- if and .Values.enabled .Values.kubernetesAPI.enabled }}
 {{- $routerNS := .Release.Namespace }}
-{{- if .Values.ingress.namespacedNetworks }}
+{{- if .Values.namespacedNetworks }}
 {{- $routerNS = "default" }}
 {{- end }}
 apiVersion: batch/v1