Merge pull request #57 from fgeck/namespaceOverride

Add namespaceOverride template variable
kube-vip · Jan 15, 2025 · dba1ee2 · dba1ee2
2 parents a5a6938 + 9bf1ad5
commit dba1ee2
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 7 deletions.
diff --git a/charts/kube-vip-cloud-provider/templates/_helpers.tpl b/charts/kube-vip-cloud-provider/templates/_helpers.tpl
@@ -6,6 +6,17 @@ Expand the name of the chart.
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
+{{/*
+Determine the namespace to use, allowing for a namespace override.
+*/}}
+{{- define "kube-vip-cloudprovider.namespace" -}}
+  {{- if .Values.namespaceOverride }}
+    {{- .Values.namespaceOverride }}
+  {{- else }}
+    {{- .Release.Namespace }}
+  {{- end }}
+{{- end }}
+
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).

diff --git a/charts/kube-vip-cloud-provider/templates/configmap.yaml b/charts/kube-vip-cloud-provider/templates/configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "kube-vip-cloud-provider.name" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "kube-vip-cloudprovider.namespace" . }}
 data:
 {{- range $key, $value := .Values.cm.data }}
   {{ $key }}: {{ $value | quote }}

diff --git a/charts/kube-vip-cloud-provider/templates/deployment.yaml b/charts/kube-vip-cloud-provider/templates/deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "kube-vip-cloud-provider.name" . }}
-  namespace: {{ .Release.Namespace | default "kube-system" }}
+  namespace: {{ include "kube-vip-cloudprovider.namespace" . | default "kube-system" }}
 spec:
   replicas: {{ .Values.replicasCount }}
   selector:

diff --git a/charts/kube-vip-cloud-provider/templates/rbac.yaml b/charts/kube-vip-cloud-provider/templates/rbac.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "kube-vip-cloud-provider.name" . }}
-  namespace: {{ .Release.Namespace | default "kube-system" }}
+  namespace: {{ include "kube-vip-cloudprovider.namespace" . | default "kube-system" }}
   labels:
   {{- include "kube-vip-cloud-provider.labels" . | nindent 4 }}
 ---
@@ -34,4 +34,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "kube-vip-cloud-provider.name" . }}
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ include "kube-vip-cloudprovider.namespace" . }}
diff --git a/charts/kube-vip-cloud-provider/values.yaml b/charts/kube-vip-cloud-provider/values.yaml
@@ -10,6 +10,9 @@ image:
   # Overrides the image tag whose default is the chart appVersion.
   # tag: "v0.0.4"
 
+# Custom namespace to override the namespace for the deployed resources.
+namespaceOverride: ""
+
 ## Cloud Provider ConfigMap
 ## CIDR blocks , IP ranges [start address - end address]
 ## Multiple pools by CIDR per Namespace, Multiple IP ranges per Namespace (handles overlapping ranges)

diff --git a/charts/kube-vip/templates/_helpers.tpl b/charts/kube-vip/templates/_helpers.tpl
@@ -24,6 +24,17 @@ If release name contains chart name it will be used as a full name.
 {{- end }}
 {{- end }}
 
+{{/*
+Determine the namespace to use, allowing for a namespace override.
+*/}}
+{{- define "kube-vip.namespace" -}}
+  {{- if .Values.namespaceOverride }}
+    {{- .Values.namespaceOverride }}
+  {{- else }}
+    {{- .Release.Namespace }}
+  {{- end }}
+{{- end }}
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}

diff --git a/charts/kube-vip/templates/daemonset.yaml b/charts/kube-vip/templates/daemonset.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ include "kube-vip.name" . }}
-  namespace: {{ .Release.Namespace | default "kube-system" }}
+  namespace: {{ include "kube-vip.namespace" . | default "kube-system" }}
 spec:
   selector:
     matchLabels:

diff --git a/charts/kube-vip/templates/rbac.yaml b/charts/kube-vip/templates/rbac.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "kube-vip.name" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "kube-vip.namespace" . }}
   labels:
   {{- include "kube-vip.labels" . | nindent 4 }}
 ---
@@ -33,4 +33,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ include "kube-vip.name" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "kube-vip.namespace" . }}
diff --git a/charts/kube-vip/values.yaml b/charts/kube-vip/values.yaml
@@ -55,6 +55,8 @@ extraLabels: {}
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
+# Custom namespace to override the namespace for the deployed resources.
+namespaceOverride: ""
 
 serviceAccount:
   # Specifies whether a service account should be created