Merge pull request #5 from nokia/helm-102

Helm 102 - Add Namespace

deployments/helm/.helmignore

@@ -21,3 +21,4 @@
 .idea/
 *.tmproj
 .vscode/
+.github

deployments/helm/templates/_helpers.tpl

@@ -23,6 +23,18 @@ If release name contains chart name it will be used as a full name.
 {{- end }}
 {{- end }}
 
+{{/*
+Allow the release namespace to be overridden for multi-namespace deployments in combined charts
+*/}}
+{{- define "beyla.namespace" -}}
+{{- if .Values.namespaceOverride }}
+{{- .Values.namespaceOverride }}
+{{- else }}
+{{- .Release.Namespace }}
+{{- end }}
+{{- end }}
+
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}

deployments/helm/templates/cluster-role-binding.yaml

@@ -17,4 +17,4 @@ roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: {{ include "beyla.fullname" . }}
-{{- end }}
+{{- end }}

deployments/helm/templates/cluster-role.yaml

@@ -16,4 +16,4 @@ rules:
   - apiGroups: [""]
     resources: ["pods"]
     verbs: ["list", "watch"]
-{{- end }}
+{{- end }}

deployments/helm/templates/daemon-set.yml

@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ include "beyla.fullname" . }}
+  namespace: {{ include "beyla.namespace" .}}
   labels:
     {{- include "beyla.labels" . | nindent 2 }}
   {{- with .Values.annotations }}

deployments/helm/templates/serviceaccount.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "beyla.serviceAccountName" . }}
+  namespace: {{ include "beyla.namespace" .}}
   labels:
     {{- include "beyla.labels" . | nindent 4 }}
     {{- with .Values.serviceAccount.labels }}

deployments/helm/values.yaml

@@ -5,8 +5,11 @@ image:
   tag: "main"
 
 imagePullSecrets: []
+
 nameOverride: ""
 fullnameOverride: ""
+## Override the deployment namespace
+namespaceOverride: ""
 
 ## DaemonSet annotations
 # annotations: {}