feat(helm) add namespaceOverride

charts/metrics-server/CHANGELOG.md

@@ -20,6 +20,7 @@
 
 - Add chart options to secure the connection between Metrics Server and the Kubernetes API Server. ([#1288](https://github.com/kubernetes-sigs/metrics-server/pull/1288)) _@mkilchhofer_
 - Add `unhealthyPodEvictionPolicy` to the Metrics Server PDB as a user enabled feature. ([#1574](https://github.com/kubernetes-sigs/metrics-server/pull/1574)) @peterabarr
+- Add `namespaceOverride` which allows deploying to a namespace other than `.Release.namespace`. ([#1710](https://github.com/kubernetes-sigs/metrics-server/pull/1710)) @TheRealNoob
 
 ### Changed
 

charts/metrics-server/templates/_helpers.tpl

@@ -23,6 +23,17 @@ 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 "metrics-server.namespace" -}}
+  {{- if .Values.namespaceOverride -}}
+    {{- .Values.namespaceOverride -}}
+  {{- else -}}
+    {{- .Release.Namespace -}}
+  {{- end -}}
+{{- end -}}
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}

charts/metrics-server/templates/apiservice.yaml

@@ -3,9 +3,9 @@
 {{- $previous := dict }}
 
 {{- if eq .Values.tls.type "helm" }}
-{{- $previous = lookup "v1" "Secret" .Release.Namespace (include "metrics-server.fullname" .) }}
+{{- $previous = lookup "v1" "Secret" (include "metrics-server.namespace" .) (include "metrics-server.fullname" .) }}
 {{- $commonName := include "metrics-server.fullname" . }}
-{{- $ns := .Release.Namespace }}
+{{- $ns := (include "metrics-server.namespace" .) }}
 {{- $altNames = append $altNames (printf "%s.%s" $commonName $ns) }}
 {{- $altNames = append $altNames (printf "%s.%s.svc" $commonName $ns) }}
 {{- $altNames = append $altNames (printf "%s.%s.svc.%s" $commonName $ns .Values.tls.clusterDomain) }}
@@ -14,6 +14,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "metrics-server.fullname" . }}
+  namespace: {{ include "metrics-server.namespace" . }}
   labels:
     {{- include "metrics-server.labels" . | nindent 4 }}
 type: Opaque
@@ -30,7 +31,7 @@ data:
 {{- $existing := dict }}
 {{- if .Values.apiService.create }}
 {{- if and (eq .Values.tls.type "existingSecret") .Values.tls.existingSecret.lookup }}
-{{- $existing := lookup "v1" "Secret" .Release.Namespace .Values.tls.existingSecret.name }}
+{{- $existing := lookup "v1" "Secret" (include "metrics-server.namespace" .) .Values.tls.existingSecret.name }}
 {{- end }}
 apiVersion: apiregistration.k8s.io/v1
 kind: APIService
@@ -41,7 +42,7 @@ metadata:
   {{- if or .Values.apiService.annotations .Values.tls.certManager.addInjectorAnnotations }}
   annotations:
     {{- if and (eq .Values.tls.type "cert-manager") .Values.tls.certManager.addInjectorAnnotations }}
-    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "metrics-server.fullname" . }}
+    cert-manager.io/inject-ca-from: {{ include "metrics-server.namespace" . }}/{{ include "metrics-server.fullname" . }}
     {{- end }}
     {{- with .Values.apiService.annotations }}
       {{- toYaml . | nindent 4 }}
@@ -64,7 +65,7 @@ spec:
   insecureSkipTLSVerify: {{ .Values.apiService.insecureSkipTLSVerify }}
   service:
     name: {{ include "metrics-server.fullname" . }}
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ include "metrics-server.namespace" . }}
     port: {{ .Values.service.port }}
   version: v1beta1
   versionPriority: 100

charts/metrics-server/templates/certificate.yaml

@@ -6,7 +6,7 @@ metadata:
   annotations:
     {{- toYaml .Values.additionalAnnotations | nindent 4 }}
   name: {{ include "metrics-server.fullname" . }}-issuer
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "metrics-server.namespace" . }}
 spec:
   selfSigned: {}
 {{- end }}
@@ -15,13 +15,13 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: {{ include "metrics-server.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "metrics-server.namespace" . }}
 spec:
   commonName: {{ include "metrics-server.fullname" . }}
   dnsNames:
-  - {{ include "metrics-server.fullname" . }}.{{ .Release.Namespace }}
-  - {{ include "metrics-server.fullname" . }}.{{ .Release.Namespace }}.svc
-  - {{ include "metrics-server.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.tls.clusterDomain }}
+  - {{ include "metrics-server.fullname" . }}.{{ include "metrics-server.namespace" . }}
+  - {{ include "metrics-server.fullname" . }}.{{ include "metrics-server.namespace" . }}.svc
+  - {{ include "metrics-server.fullname" . }}.{{ include "metrics-server.namespace" . }}.svc.{{ .Values.tls.clusterDomain }}
   secretName: {{ include "metrics-server.fullname" . }}
   usages:
     - server auth

charts/metrics-server/templates/clusterrolebinding-auth-delegator.yaml

@@ -12,5 +12,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "metrics-server.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ include "metrics-server.namespace" . }}
 {{- end -}}

charts/metrics-server/templates/clusterrolebinding-nanny.yaml

@@ -13,6 +13,6 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "metrics-server.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ include "metrics-server.namespace" . }}
 {{- end -}}
 {{- end -}}

charts/metrics-server/templates/clusterrolebinding.yaml

@@ -12,5 +12,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "metrics-server.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ include "metrics-server.namespace" . }}
 {{- end -}}

charts/metrics-server/templates/configmaps-nanny.yaml

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "metrics-server.addonResizer.configMap" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "metrics-server.namespace" . }}
   labels:
     {{- include "metrics-server.labels" . | nindent 4 }}
 data:

charts/metrics-server/templates/deployment.yaml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "metrics-server.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "metrics-server.namespace" . }}
   labels:
     {{- include "metrics-server.labels" . | nindent 4 }}
   {{- with .Values.deploymentAnnotations }}

charts/metrics-server/templates/pdb.yaml

@@ -3,7 +3,7 @@ apiVersion: {{ include "metrics-server.pdb.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "metrics-server.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "metrics-server.namespace" . }}
   labels:
     {{- include "metrics-server.labels" . | nindent 4 }}
 spec:

charts/metrics-server/templates/role-nanny.yaml

@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ include "metrics-server.addonResizer.role" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "metrics-server.namespace" . }}
   labels:
     {{- include "metrics-server.labels" . | nindent 4 }}
 rules:

charts/metrics-server/templates/rolebinding-nanny.yaml

@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ printf "%s-nanny" (include "metrics-server.fullname" .)  }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "metrics-server.namespace" . }}
   labels:
     {{- include "metrics-server.labels" . | nindent 4 }}
 roleRef:
@@ -14,6 +14,6 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "metrics-server.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ include "metrics-server.namespace" . }}
 {{- end -}}
 {{- end -}}

charts/metrics-server/templates/rolebinding.yaml

@@ -13,5 +13,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "metrics-server.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ include "metrics-server.namespace" . }}
 {{- end -}}

charts/metrics-server/templates/service.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "metrics-server.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "metrics-server.namespace" . }}
   labels:
     {{- include "metrics-server.labels" . | nindent 4 }}
   {{- with .Values.service.labels -}}

charts/metrics-server/templates/serviceaccount.yaml

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

charts/metrics-server/templates/servicemonitor.yaml

@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "metrics-server.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "metrics-server.namespace" . }}
   labels:
     {{- include "metrics-server.labels" . | nindent 4 }}
     {{- with .Values.serviceMonitor.additionalLabels }}
@@ -13,7 +13,7 @@ spec:
   jobLabel: app.kubernetes.io/instance
   namespaceSelector:
     matchNames:
-      - {{ .Release.Namespace }}
+      - {{ include "metrics-server.namespace" . }}
   selector:
     matchLabels:
       {{- include "metrics-server.selectorLabels" . | nindent 6 }}

charts/metrics-server/values.yaml

@@ -13,6 +13,7 @@ imagePullSecrets: []
 
 nameOverride: ""
 fullnameOverride: ""
+namespaceOverride: ""
 
 serviceAccount:
   # Specifies whether a service account should be created