fix(helm): chart should respect -n <namespace> flag (#53)

postfinance · Oct 25, 2022 · a5a3a79 · a5a3a79
1 parent 4d4dc39
commit a5a3a79
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 deletions.
diff --git a/helm/kubenurse/templates/_helpers.tpl b/helm/kubenurse/templates/_helpers.tpl
@@ -16,3 +16,7 @@ helm.sh/chart: {{ printf "%s-%s" .Chart.Name .Chart.Version | quote }}
 {{ define "image" -}}
 {{ printf "%s:%s" .Values.daemonset.image.repository .Values.daemonset.image.tag }}
 {{- end }}
+
+{{- define "namespace" -}}
+{{- default .Release.Namespace .Values.namespace | quote -}}
+{{- end -}}
diff --git a/helm/kubenurse/templates/daemonset.yaml b/helm/kubenurse/templates/daemonset.yaml
@@ -6,7 +6,7 @@ metadata:
     app: {{ include "name" . | quote }}
 {{ include "helm-labels" . | indent 4 }}
   name: {{ include "name" . | quote }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "namespace" . }}
 spec:
   selector:
     matchLabels:

diff --git a/helm/kubenurse/templates/ingress.yaml b/helm/kubenurse/templates/ingress.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
 {{ include "common-labels" . | indent 4 }}
   name: {{ include "name" . | quote }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "namespace" . }}
 spec:
   ingressClassName: {{ .Values.ingress.className }}
   rules:

diff --git a/helm/kubenurse/templates/rbac.yaml b/helm/kubenurse/templates/rbac.yaml
@@ -3,21 +3,21 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ include "name" . | quote }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "namespace" . }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: {{ include "name" . | quote }}
 subjects:
 - kind: ServiceAccount
   name: {{ include "name" . | quote }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "namespace" . }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ include "name" . | quote }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "namespace" . }}
 rules:
 - apiGroups:
   - ""
@@ -40,7 +40,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ include "name" . | quote }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "namespace" . }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

diff --git a/helm/kubenurse/templates/service.yaml b/helm/kubenurse/templates/service.yaml
@@ -9,7 +9,7 @@ metadata:
     app: {{ include "name" . | quote }}
 {{ include "common-labels" . | indent 4 }}
   name: {{ include "name" . | quote }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "namespace" . }}
 spec:
   ports:
   - name: {{ .Values.service.name }}

diff --git a/helm/kubenurse/templates/serviceaccount.yaml b/helm/kubenurse/templates/serviceaccount.yaml
@@ -5,4 +5,4 @@ metadata:
   name: {{ .Values.serviceAccount.name }}
   labels:
 {{ include "common-labels" . | indent 6 }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "namespace" . }}
diff --git a/helm/kubenurse/templates/servicemonitor.yaml b/helm/kubenurse/templates/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "name" . | quote }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "namespace" . }}
   labels:
     {{- toYaml .Values.serviceMonitor.labels | nindent 4}}
 spec:
@@ -16,4 +16,4 @@ spec:
   selector:
     matchLabels:
 {{ include "common-labels" . | indent 6 }}
-{{- end -}}
+{{- end -}}