Merge pull request #441 from stakater/update-chart

remove ns and read ns from helpers

Author: hussnain612

charts/.gitkeep

@@ -68,3 +68,10 @@ Verify that CRDs are installed
     true
   {{- end -}}
 {{- end -}}
+
+{{/*
+Allow the release namespace to be overridden
+*/}}
+{{- define "ingress-monitor-controller.namespace" -}}
+{{- default .Release.Namespace .Values.namespaceOverride -}}
+{{- end -}}

charts/ingressmonitorcontroller/templates/_helpers.tpl

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "ingress-monitor-controller.fullname" . }}
-  namespace: {{ .Values.namespace | default .Release.Namespace }}
+  namespace: {{ include "ingress-monitor-controller.namespace" . }}
   labels:
     {{- include "ingress-monitor-controller.labels" . | nindent 4 }}
     control-plane: controller-manager

charts/ingressmonitorcontroller/templates/deployment.yaml

@@ -78,7 +78,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ include "ingress-monitor-controller.fullname" . }}-leader-election-role
-  namespace: {{ .Values.namespace | default .Release.Namespace }}
+  namespace: {{ include "ingress-monitor-controller.namespace" . }}
 rules:
 - apiGroups:
   - ""
@@ -109,7 +109,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ include "ingress-monitor-controller.fullname" . }}-secret-viewer-role
-  namespace: {{ .Values.namespace | default .Release.Namespace }}
+  namespace: {{ include "ingress-monitor-controller.namespace" . }}
 rules:
 - apiGroups:
   - ""

charts/ingressmonitorcontroller/templates/namespace.yaml

@@ -23,15 +23,15 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ include "ingress-monitor-controller.fullname" . }}-leader-election-rolebinding
-  namespace: {{ .Values.namespace | default .Release.Namespace }}
+  namespace: {{ include "ingress-monitor-controller.namespace" . }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: {{ include "ingress-monitor-controller.fullname" . }}-leader-election-role
 subjects:
 - kind: ServiceAccount
   name: {{ include "ingress-monitor-controller.serviceAccountName" . }}
-  namespace: {{ .Values.namespace | default .Release.Namespace }}
+  namespace: {{ include "ingress-monitor-controller.namespace" . }}
 {{- end }}
 
 {{- if .Values.rbac.secretViewerRole }}
@@ -40,15 +40,15 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ include "ingress-monitor-controller.fullname" . }}-secret-viewer-rolebinding
-  namespace: {{ .Values.namespace | default .Release.Namespace }}
+  namespace: {{ include "ingress-monitor-controller.namespace" . }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: {{ include "ingress-monitor-controller.fullname" . }}-secret-viewer-role
 subjects:
 - kind: ServiceAccount
   name: {{ include "ingress-monitor-controller.serviceAccountName" . }}
-  namespace: {{ .Values.namespace | default .Release.Namespace }}
+  namespace: {{ include "ingress-monitor-controller.namespace" . }}
 {{- end }}
 
 {{- end }}

charts/ingressmonitorcontroller/templates/role.yaml

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "ingress-monitor-controller.fullname" . }}-metrics-service
-  namespace: {{ .Values.namespace | default .Release.Namespace }}
+  namespace: {{ include "ingress-monitor-controller.namespace" . }}
   labels:
     {{- include "ingress-monitor-controller.labels" . | nindent 4 }}
 spec:

charts/ingressmonitorcontroller/templates/rolebinding.yaml

@@ -4,7 +4,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "ingress-monitor-controller.serviceAccountName" . }}
-  namespace: {{ .Values.namespace | default .Release.Namespace }}
+  namespace: {{ include "ingress-monitor-controller.namespace" . }}
   labels:
     {{- include "ingress-monitor-controller.labels" . | nindent 4 }}
     {{- if .Values.serviceAccount.labels }}

charts/ingressmonitorcontroller/templates/service.yaml

@@ -4,7 +4,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ .Values.name | default .Release.Name }}
-  namespace: {{ .Values.namespace | default .Release.Namespace }}
+  namespace: {{ include "ingress-monitor-controller.namespace" . }}
   labels:
     app: '{{ .Chart.Name }}'
     app.kubernetes.io/name: '{{ .Chart.Name }}'
@@ -24,5 +24,5 @@ spec:
         insecureSkipVerify: true
   namespaceSelector:
     matchNames:
-    - '{{ .Values.namespace | default .Release.Namespace }}'
+    - '{{ include "ingress-monitor-controller.namespace" . }}'
 {{- end }}

charts/ingressmonitorcontroller/templates/serviceaccount.yaml

@@ -24,6 +24,9 @@ nameOverride: ""
 # Full override for ingress-monitor-controller.fullname template
 fullnameOverride: ""
 
+# Same as nameOverride but for the namespace.
+namespaceOverride: ""
+
 # Specifies which namespaces IMC should have access to
 # Leave empty for full access or specify a comma separated list of namespaces to watch
 watchNamespaces: ""
@@ -87,6 +90,4 @@ env: []
 
 envFrom: []
 
-namespace: stakater-ingress-monitor-controller
-
-serviceManagedBy: helm
+serviceManagedBy: helm