Be straight-forward about the namespace

Signed-off-by: Danil Mironov <[email protected]>
tkestack · Jul 24, 2020 · 1059909 · 1059909
1 parent ce9057a
commit 1059909
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 21 deletions.
diff --git a/deployment/dcgm-exporter/templates/daemonset.yaml b/deployment/dcgm-exporter/templates/daemonset.yaml
@@ -16,9 +16,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ include "dcgm-exporter.fullname" . }}
-{{- if .Values.namespace }}
-  namespace: {{ .Values.namespace }}
-{{- end }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "dcgm-exporter.labels" . | nindent 4 }}
     app.kubernetes.io/component: "dcgm-exporter"

diff --git a/deployment/dcgm-exporter/templates/service-monitor.yaml b/deployment/dcgm-exporter/templates/service-monitor.yaml
@@ -17,9 +17,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "dcgm-exporter.fullname" . }}
-{{- if .Values.serviceMonitor.namespace }}
-  namespace: {{ .Values.serviceMonitor.namespace }}
-{{- end }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "dcgm-exporter.labels" . | nindent 4 }}
     app.kubernetes.io/component: "dcgm-exporter"
@@ -36,11 +34,7 @@ spec:
     path: "/metrics"
   namespaceSelector:
     matchNames:
-{{- if .Values.namespace }}
-    - "{{ .Values.namespace }}"
-{{ else }}
     - "{{ .Release.Namespace }}"
-{{- end }}
   endpoints:
   - port: "metrics"
     path: "/metrics"

diff --git a/deployment/dcgm-exporter/templates/service.yaml b/deployment/dcgm-exporter/templates/service.yaml
@@ -16,9 +16,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "dcgm-exporter.fullname" . }}
-{{- if .Values.namespace }}
-  namespace: {{ .Values.namespace }}
-{{- end }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "dcgm-exporter.labels" . | nindent 4 }}
     app.kubernetes.io/component: "dcgm-exporter"

diff --git a/deployment/dcgm-exporter/templates/serviceaccount.yaml b/deployment/dcgm-exporter/templates/serviceaccount.yaml
@@ -3,9 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "dcgm-exporter.serviceAccountName" . }}
-{{- if .Values.namespace }}
-  namespace: {{ .Values.namespace }}
-{{- end }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "dcgm-exporter.labels" . | nindent 4 }}
     app.kubernetes.io/component: "dcgm-exporter"

diff --git a/deployment/dcgm-exporter/values.yaml b/deployment/dcgm-exporter/values.yaml
@@ -19,9 +19,6 @@ image:
   # for the image tag, e.g:
   #tag: 1.7.2
 
-# For helm v2 this field might be useful
-#namespace: kube-system
-
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
@@ -63,8 +60,6 @@ resources: {}
 serviceMonitor:
   enabled: true
   interval: 15s
-  # Defaults to .Release.Namespace
-  #namespace: default
   additionalLabels: {}
     #monitoring: prometheus