From 604bfe028d1460fce16aa2b923829655d1a89564 Mon Sep 17 00:00:00 2001 From: M Essam Hamed Date: Tue, 25 Nov 2025 20:39:32 +0200 Subject: [PATCH 1/2] Fix helm chart releaser multiple charts separate version --- .github/workflows/helm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 }}" From 8b98fa862fec864af704c69343b8c71a80c615ac Mon Sep 17 00:00:00 2001 From: M Essam Hamed Date: Tue, 25 Nov 2025 20:52:03 +0200 Subject: [PATCH 2/2] Copy fix from helms repo --- .../templates/kubernetes-nbresource.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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