PMM-13725 Allow specifying namespace. (#483)

* PMM-13725 Allow specifying namespace.

* PMM-13725 update helm chart version.

Author: BupycHuk

charts/pmm/templates/_helpers.tpl

@@ -30,6 +30,13 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
+{{/*
+Allows overriding the install namespace in combined charts.
+*/}}
+{{- define "pmm.namespace" -}}
+{{- default .Release.Namespace .Values.namespaceOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
 {{/*
 Common labels
 */}}

charts/pmm/templates/clusterrole.yaml

@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: {{ include "pmm.fullname" . }}
+  namespace: {{ include  "pmm.namespace" . }}
   labels:
     {{- include "pmm.labels" . | nindent 4 }}
 rules:

charts/pmm/templates/clusterrolebinding.yaml

@@ -11,7 +11,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ include "pmm.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include  "pmm.namespace" . }}
 {{- else }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -24,6 +24,6 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ include "pmm.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include  "pmm.namespace" . }}
 {{- end }}
 {{- end }}

charts/pmm/templates/configmap.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "pmm.fullname" . }}
+  namespace: {{ include  "pmm.namespace" . }}
   labels:
     {{- include "pmm.labels" . | nindent 4 }}
 data:

charts/pmm/templates/ingress.yaml

@@ -7,6 +7,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "pmm.fullname" . }}
+  namespace: {{ include  "pmm.namespace" . }}
   labels:
     {{- include "pmm.labels" . | nindent 4 }}
 {{- if or .Values.ingress.annotations .Values.ingress.nginxInc }}
@@ -84,6 +85,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "pmm.fullname" . }}-grpc
+  namespace: {{ include  "pmm.namespace" . }}
   labels:
     {{- include "pmm.labels" . | nindent 4 }}
   annotations:

charts/pmm/templates/secret-certs.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Values.certs.name }}
+  namespace: {{ include  "pmm.namespace" . }}
   labels:
     {{- include "pmm.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}

charts/pmm/templates/secret.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Values.secret.name }}
+  namespace: {{ include  "pmm.namespace" . }}
   labels:
     {{- include "pmm.labels" . | nindent 4 }}
   {{- with .Values.secret.annotations }}

charts/pmm/templates/service.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Values.service.name }}
+  namespace: {{ include  "pmm.namespace" . }}
   labels:
     {{- include "pmm.labels" . | nindent 4 }}
   {{- with .Values.service.annotations }}

charts/pmm/templates/serviceaccount.yaml

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

charts/pmm/templates/statefulset.yaml

@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ include "pmm.fullname" . }}
+  namespace: {{ include  "pmm.namespace" . }}
   labels:
     {{- include "pmm.labels" . | nindent 4 }}
 spec:
@@ -16,6 +17,7 @@ spec:
     metadata:
       annotations:
         {{- include "pmm.podAnnotations" . | nindent 8 }}
+      namespace: {{ include  "pmm.namespace" . }}
       labels:
         {{- include "pmm.selectorLabels" . | nindent 8 }}
     spec:
@@ -124,6 +126,7 @@ spec:
       kind: PersistentVolumeClaim
       metadata:
         name: {{ .Values.storage.name }}
+        namespace: {{ include  "pmm.namespace" . }}
       spec:
         {{- if .Values.storage.selector }}
         selector:

charts/pmm/values.yaml

@@ -200,6 +200,10 @@ storage:
 ##
 nameOverride: ""
 
+## @param namespaceOverride String to override namespace. Defaults to the value of .Release.Namespace.
+##
+namespaceOverride: ""
+
 ## @param extraLabels Labels to add to all deployed objects
 ##
 extraLabels: {}
@@ -211,7 +215,7 @@ extraLabels: {}
 ## @param serviceAccount.name Name of the service account to use. If not set and create is true, a name is generated using the fullname template.
 ##
 serviceAccount:
-  create: true
+  create: false
   annotations: {}
   name: "pmm-service-account"