Clean useless values

charts/rancher-monitoring/v0.0.2/charts/alertmanager/templates/alertmanager.yaml

@@ -6,9 +6,6 @@ metadata:
     chart: {{ template "app.version" . }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-{{- if .Values.labels }}
-{{ toYaml .Values.labels | indent 4 }}
-{{- end }}
   name: {{ .Release.Name }}
 spec:
 {{- if .Values.securityContext }}
@@ -17,17 +14,10 @@ spec:
 {{- end }}
   podMetadata:
     labels:
-{{- if .Values.labels }}
-{{ toYaml .Values.labels | indent 6 }}
-{{- else }}
       app: {{ template "app.name" . }}
       chart: {{ template "app.version" . }}
       release: {{ .Release.Name }}
-{{- end }}
   baseImage: {{ template "system_default_registry" . }}{{ .Values.image.repository }}
-{{- if .Values.externalUrl }}
-  externalUrl: "{{ .Values.externalUrl }}"
-{{- end }}
   nodeSelector:
     beta.kubernetes.io/os: linux
     {{- range .Values.nodeSelectors }}
@@ -46,9 +36,6 @@ spec:
 {{ toYaml .Values.resources.core | indent 4 }}
 {{- end }}
   retention: "{{ .Values.retention }}"
-{{- if .Values.routePrefix }}
-  routePrefix: "{{ .Values.routePrefix }}"
-{{- end }}
 {{- if .Values.secrets }}
   secrets:
 {{ toYaml .Values.secrets | indent 4 }}

charts/rancher-monitoring/v0.0.2/charts/alertmanager/templates/metrics-service.yaml

@@ -12,13 +12,9 @@ spec:
   type: ClusterIP
   clusterIP: None
   selector:
-{{- if .Values.labels }}
-{{ toYaml .Values.labels | indent 4 }}
-{{- else }}
     app: {{ template "app.name" . }}
     chart: {{ template "app.version" . }}
     release: {{ .Release.Name }}
-{{- end }}
   ports:
     - name: http
       port: 9093

charts/rancher-monitoring/v0.0.2/charts/alertmanager/templates/servicemonitor.yaml

@@ -7,9 +7,6 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
     source: rancher-monitoring
-    {{- if .Values.serviceMonitorLabels }}
-{{ toYaml .Values.serviceMonitorLabels | indent 4 }}
-    {{- end }}
   name: {{ template "app.fullname" . }}
 spec:
   selector:

charts/rancher-monitoring/v0.0.2/charts/alertmanager/values.yaml

@@ -56,12 +56,6 @@ templates: {}
 #           {{ range .Labels.SortedPairs }} • *{{ .Name }}:* `{{ .Value }}`
 #           {{ end }}
 
-## External URL at which Alertmanager will be reachable
-##
-externalUrl: ""
-
-serviceMonitorLabels: {}
-
 ## Alertmanager container image
 ##
 image:
@@ -71,10 +65,6 @@ image:
     repository: nginx
     tag: 1.15.8-alpine
 
-## Labels to be added to the Alertmanager
-##
-# labels: {}
-
 ## Node labels for Alertmanager pod assignment
 ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
 ##
@@ -120,11 +110,6 @@ resources:
 ##
 retention: 24h
 
-## Prefix used to register routes, overriding externalUrl route.
-## Useful for proxies that rewrite URLs.
-##
-routePrefix: ""
-
 ## List of Secrets in the same namespace as the Alertmanager
 ## object, which shall be mounted into the Alertmanager Pods.
 ## Ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#prometheusspec

charts/rancher-monitoring/v0.0.2/charts/exporter-coredns/templates/service.yaml

@@ -8,7 +8,7 @@ metadata:
     release: {{ .Release.Name }}
 {{ toYaml .Values.serviceSelectorLabels | indent 4 }}
   name: expose-coredns-metrics
-  namespace: {{ default .Release.Namespace .Values.componentNamespace }}
+  namespace: {{ .Release.Namespace }}
 spec:
   type: ClusterIP
   clusterIP: None

charts/rancher-monitoring/v0.0.2/charts/exporter-coredns/templates/servicemonitor.yaml

@@ -7,9 +7,6 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
     source: rancher-monitoring
-    {{- if .Values.serviceMonitorLabels }}
-{{ toYaml .Values.serviceMonitorLabels | indent 4 }}
-    {{- end }}  
   name: {{ template "app.fullname" . }}
 spec:
   selector:

charts/rancher-monitoring/v0.0.2/charts/exporter-coredns/values.yaml

-## 
-## For now, HELM cannot support deploy commponents into multiple namespaces
-##
-componentNamespace: ""
-
 ## CRD apiGroup
 ##
 apiGroup: "monitoring.coreos.com"
@@ -21,8 +16,6 @@ ports:
 serviceSelectorLabels:
   k8s-app: kube-dns
 
-serviceMonitorLabels: {}
-
 ## Skip verification until we have resolved why the certificate validation
 ## for the kubelet on API server nodes fail.
 ##

charts/rancher-monitoring/v0.0.2/charts/exporter-fluentd/templates/servicemonitor.yaml

@@ -7,9 +7,6 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
     source: rancher-monitoring
-    {{- if .Values.serviceMonitorLabels }}
-{{ toYaml .Values.serviceMonitorLabels | indent 4 }}
-    {{- end }}
   name: {{ template "app.fullname" . }}
 spec:
   selector:

charts/rancher-monitoring/v0.0.2/charts/exporter-fluentd/values.yaml

@@ -10,8 +10,6 @@ ports:
 serviceSelectorLabels:
   k8s-app: fluentd
 
-serviceMonitorLabels: {}
-
 ## Skip verification until we have resolved why the certificate validation
 ## for the kubelet on API server nodes fail.
 ##

charts/rancher-monitoring/v0.0.2/charts/exporter-kube-controller-manager/templates/service.yaml

@@ -8,7 +8,7 @@ metadata:
     release: {{ .Release.Name }}
 {{ toYaml .Values.serviceSelectorLabels | indent 4 }}
   name: expose-kube-cm-metrics
-  namespace: {{ default .Release.Namespace .Values.componentNamespace }}
+  namespace: {{ .Release.Namespace }}
 spec:
   type: ClusterIP
   clusterIP: None

charts/rancher-monitoring/v0.0.2/charts/exporter-kube-controller-manager/templates/servicemonitor.yaml

@@ -7,9 +7,6 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
     source: rancher-monitoring
-    {{- if .Values.serviceMonitorLabels }}
-{{ toYaml .Values.serviceMonitorLabels | indent 4 }}
-    {{- end }}  
   name: {{ template "app.fullname" . }}
 spec:
   selector:

charts/rancher-monitoring/v0.0.2/charts/exporter-kube-controller-manager/values.yaml

-## 
-## For now, HELM cannot support deploy commponents into multiple namespaces
-##
-componentNamespace: ""
-
 ## CRD apiGroup
 ##
 apiGroup: "monitoring.coreos.com"
@@ -21,8 +16,6 @@ ports:
 serviceSelectorLabels:
   k8s-app: kube-controller-manager
 
-serviceMonitorLabels: {}
-
 ## Skip verification until we have resolved why the certificate validation
 ## for the kubelet on API server nodes fail.
 ##

charts/rancher-monitoring/v0.0.2/charts/exporter-kube-dns/templates/service.yaml

@@ -8,7 +8,7 @@ metadata:
     release: {{ .Release.Name }}
 {{ toYaml .Values.serviceSelectorLabels | indent 4 }}
   name: expose-kube-dns-metrics
-  namespace: {{ default .Release.Namespace .Values.componentNamespace }}
+  namespace: {{ .Release.Namespace }}
 spec:
   type: ClusterIP
   clusterIP: None

charts/rancher-monitoring/v0.0.2/charts/exporter-kube-dns/templates/servicemonitor.yaml

@@ -7,9 +7,6 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
     source: rancher-monitoring
-    {{- if .Values.serviceMonitorLabels }}
-{{ toYaml .Values.serviceMonitorLabels | indent 4 }}
-    {{- end }}  
   name: {{ template "app.fullname" . }}
 spec:
   selector:

charts/rancher-monitoring/v0.0.2/charts/exporter-kube-dns/values.yaml

-## 
-## For now, HELM cannot support deploy commponents into multiple namespaces
-##
-componentNamespace: ""
-
 ## CRD apiGroup
 ##
 apiGroup: "monitoring.coreos.com"
@@ -27,8 +22,6 @@ ports:
 serviceSelectorLabels:
   k8s-app: kube-dns
 
-serviceMonitorLabels: {}
-
 ## Skip verification until we have resolved why the certificate validation
 ## for the kubelet on API server nodes fail.
 ##

charts/rancher-monitoring/v0.0.2/charts/exporter-kube-etcd/templates/service.yaml

@@ -8,7 +8,7 @@ metadata:
     release: {{ .Release.Name }}
 {{ toYaml .Values.serviceSelectorLabels | indent 4 }}
   name: expose-kube-etcd-metrics
-  namespace: {{ default .Release.Namespace .Values.componentNamespace }}
+  namespace: {{ .Release.Namespace }}
 spec:
   type: ClusterIP
   clusterIP: None

charts/rancher-monitoring/v0.0.2/charts/exporter-kube-etcd/templates/servicemonitor.yaml

@@ -7,9 +7,6 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
     source: rancher-monitoring
-    {{- if .Values.serviceMonitorLabels }}
-{{ toYaml .Values.serviceMonitorLabels | indent 4 }}
-    {{- end }}  
   name: {{ template "app.fullname" . }}
 spec:
   selector:

charts/rancher-monitoring/v0.0.2/charts/exporter-kube-etcd/values.yaml

-## 
-## For now, HELM cannot support deploy commponents into multiple namespaces
-##
-componentNamespace: ""
-
 ## CRD apiGroup
 ##
 apiGroup: "monitoring.coreos.com"
@@ -21,8 +16,6 @@ ports:
 serviceSelectorLabels:
   k8s-app: etcd-server
 
-serviceMonitorLabels: {}
-
 ## Skip verification until we have resolved why the certificate validation
 ## for the kubelet on API server nodes fail.
 ##

charts/rancher-monitoring/v0.0.2/charts/exporter-kube-scheduler/templates/prometheusrule.yaml

@@ -7,9 +7,6 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
     source: rancher-monitoring
-    {{- if .Values.prometheusRuleLabels }}
-{{ toYaml .Values.prometheusRuleLabels | indent 4 }}
-    {{- end }}   
   name: {{ template "app.fullname" . }}
 spec:
   groups:

charts/rancher-monitoring/v0.0.2/charts/exporter-kube-scheduler/templates/service.yaml

@@ -8,7 +8,7 @@ metadata:
     release: {{ .Release.Name }}
 {{ toYaml .Values.serviceSelectorLabels | indent 4 }}
   name: expose-kube-scheduler-metrics
-  namespace: {{ default .Release.Namespace .Values.componentNamespace }}
+  namespace: {{ .Release.Namespace }}
 spec:
   type: ClusterIP
   clusterIP: None

charts/rancher-monitoring/v0.0.2/charts/exporter-kube-scheduler/templates/servicemonitor.yaml

@@ -7,9 +7,6 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
     source: rancher-monitoring
-    {{- if .Values.serviceMonitorLabels }}
-{{ toYaml .Values.serviceMonitorLabels | indent 4 }}
-    {{- end }}  
   name: {{ template "app.fullname" . }}
 spec:
   selector:

charts/rancher-monitoring/v0.0.2/charts/exporter-kube-scheduler/values.yaml

-## 
-## For now, HELM cannot support deploy commponents into multiple namespaces
-##
-componentNamespace: ""
-
 ## CRD apiGroup
 ##
 apiGroup: "monitoring.coreos.com"
@@ -21,10 +16,6 @@ ports:
 serviceSelectorLabels:
   component: kube-scheduler
 
-serviceMonitorLabels: {}
-
-prometheusRuleLabels: {}
-
 ## Skip verification until we have resolved why the certificate validation
 ## for the kubelet on API server nodes fail.
 ##

charts/rancher-monitoring/v0.0.2/charts/exporter-kube-state/templates/servicemonitor.yaml

@@ -7,9 +7,6 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
     source: rancher-monitoring
-    {{- if .Values.serviceMonitorLabels }}
-{{ toYaml .Values.serviceMonitorLabels | indent 4 }}
-    {{- end }}
   name: {{ template "app.fullname" . }}
 spec:
   selector:

charts/rancher-monitoring/v0.0.2/charts/exporter-kube-state/values.yaml

@@ -39,6 +39,4 @@ tolerations: []
   #    value: "value"
   #    effect: "NoSchedule"
 
-serviceMonitorLabels: {}
-
 securityContext: {}

charts/rancher-monitoring/v0.0.2/charts/exporter-kubelets/templates/servicemonitor.yaml

@@ -7,9 +7,6 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
     source: rancher-monitoring
-    {{- if .Values.serviceMonitorLabels }}
-{{ toYaml .Values.serviceMonitorLabels | indent 4 }}
-    {{- end }}  
   name: {{ template "charts.exporter-kubelets.fullname" . }}
 spec:
   selector:

charts/rancher-monitoring/v0.0.2/charts/exporter-kubelets/values.yaml

@@ -5,8 +5,6 @@ apiGroup: "monitoring.coreos.com"
 serviceSelectorLabels:
   k8s-app: kubelet
 
-serviceMonitorLabels: {}
-
 ## Skip verification until we have resolved why the certificate validation
 ## for the kubelet on API server nodes fail.
 ##

charts/rancher-monitoring/v0.0.2/charts/exporter-kubernetes/templates/prometheusrule.yaml

@@ -7,9 +7,6 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
     source: rancher-monitoring
-    {{- if .Values.prometheusRuleLabels }}
-{{ toYaml .Values.prometheusRuleLabels | indent 4 }}
-    {{- end }}
   name: {{ template "app.fullname" . }}
 spec:
   groups:

charts/rancher-monitoring/v0.0.2/charts/exporter-kubernetes/templates/servicemonitor.yaml

@@ -7,9 +7,6 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
     source: rancher-monitoring
-    {{- if .Values.serviceMonitorLabels }}
-{{ toYaml .Values.serviceMonitorLabels | indent 4 }}
-    {{- end }}   
   name: {{ template "app.fullname" . }}
 spec:
   selector:

charts/rancher-monitoring/v0.0.2/charts/exporter-kubernetes/values.yaml

@@ -11,8 +11,4 @@ serviceSelectorLabels:
   component: apiserver
   provider: kubernetes
 
-serviceMonitorLabels: {}
-
-prometheusRuleLabels: {}
-
 insecureSkipVerify: true

charts/rancher-monitoring/v0.0.2/charts/exporter-node/templates/daemonset.yaml

@@ -72,14 +72,11 @@ spec:
       {{- if .Values.enabledRBAC }}
       serviceAccountName: {{ default (include "app.fullname" .) .Values.serviceAccountName }}
       {{- end }}
-      {{- if .Values.securityContext }}
       securityContext:
-{{ toYaml .Values.securityContext | indent 8 }}
-      {{- end }}
-      {{- if .Values.tolerations }}
+        runAsNonRoot: true
+        runAsUser: 65534
       tolerations:
-{{ toYaml .Values.tolerations | indent 8 }}
-      {{- end }}
+      - operator: Exists
       nodeSelector:
         beta.kubernetes.io/os: linux
         {{- range .Values.nodeSelectors }}

charts/rancher-monitoring/v0.0.2/charts/exporter-node/templates/prometheusrule.yaml

@@ -7,9 +7,6 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
     source: rancher-monitoring
-    {{- if .Values.prometheusRuleLabels }}
-{{ toYaml .Values.prometheusRuleLabels | indent 4 }}
-    {{- end }}   
   name: {{ template "app.fullname" . }}
 spec:
   groups:

charts/rancher-monitoring/v0.0.2/charts/exporter-node/templates/servicemonitor.yaml

@@ -6,10 +6,7 @@ metadata:
     chart: {{ template "app.version" . }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-    source: rancher-monitoring
-    {{- if .Values.serviceMonitorLabels }}
-{{ toYaml .Values.serviceMonitorLabels | indent 4 }}
-    {{- end }}    
+    source: rancher-monitoring 
   name: {{ template "app.fullname" . }}
 spec:
   selector:

charts/rancher-monitoring/v0.0.2/charts/exporter-node/values.yaml

@@ -4,8 +4,6 @@ enabledRBAC: true
 ##
 serviceAccountName: ""
 
-serviceAccountNameOverride: ""
-
 ## CRD apiGroup
 ##
 apiGroup: "monitoring.coreos.com"
@@ -32,27 +30,13 @@ resources:
     cpu: 100m
     memory: 30Mi
 
-## Tolerations for use with node taints
-## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
-##
-tolerations:
-- operator: Exists
-
 ## Node Selector to constrain pods to run on particular nodes
 ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
 ##
 nodeSelectors: []
 
-serviceMonitorLabels: {}
-
-prometheusRuleLabels: {}
-
 collectors: {}
 
-securityContext:
-  runAsNonRoot: true
-  runAsUser: 65534
-
 ##
 # Default collector settings
 ##

charts/rancher-monitoring/v0.0.2/charts/grafana/templates/servicemonitor.yaml

@@ -6,10 +6,7 @@ metadata:
     chart: {{ template "app.version" . }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-    source: rancher-monitoring
-    {{- if .Values.serviceMonitorLabels }}
-{{ toYaml .Values.serviceMonitorLabels | indent 4 }}
-    {{- end }}    
+    source: rancher-monitoring  
   name: {{ template "app.fullname" . }}
 spec:
   selector:

charts/rancher-monitoring/v0.0.2/charts/grafana/values.yaml

@@ -24,11 +24,6 @@ tolerations: []
   #    value: "value"
   #    effect: "NoSchedule"
 
-serviceMonitor:
-  ## Custom Labels to be added to ServiceMonitor
-  ##
-  labels: {}
-
 ## Pass extra environment variables to the Grafana container.
 ##
 # extraVars:

charts/rancher-monitoring/v0.0.2/charts/prometheus/templates/metrics-service.yaml

@@ -12,13 +12,9 @@ spec:
   type: ClusterIP
   clusterIP: None
   selector:
-{{- if .Values.labels }}
-{{ toYaml .Values.labels | indent 4 }}
-{{- else }}
     app: {{ template "app.name" . }}
     chart: {{ template "app.version" . }}
     release: {{ .Release.Name }}
-{{- end }}
   ports:
   - name: metrics
     port: 9090

charts/rancher-monitoring/v0.0.2/charts/prometheus/templates/prometheus.yaml

@@ -6,9 +6,6 @@ metadata:
     chart: {{ template "app.version" . }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-{{- if .Values.labels }}
-{{ toYaml .Values.labels | indent 4 }}
-{{- end }}
   name: {{ .Release.Name }}
 spec:
 {{- if .Values.securityContext }}
@@ -59,9 +56,9 @@ spec:
     resources:
 {{ toYaml .Values.resources.auth | indent 6 }}
     {{- end }}
-{{- if .Values.sidecarsSpec }}
+  {{- if .Values.sidecarsSpec }}
 {{ toYaml .Values.sidecarsSpec | indent 2 }}
-{{- end }}
+  {{- end }}
 {{- else }} 
   {{- if .Values.sidecarsSpec }}
   containers:
@@ -70,13 +67,9 @@ spec:
 {{- end }}
   podMetadata:
     labels:
-{{- if .Values.labels }}
-{{ toYaml .Values.labels | indent 6 }}
-{{- else }}
       app: {{ template "app.name" . }}
       chart: {{ template "app.version" . }}
       release: {{ .Release.Name }}
-{{- end }}
 {{- if .Values.alertingEndpoints }}
   alerting:
     alertmanagers:
@@ -93,9 +86,6 @@ spec:
   externalLabels:
 {{ toYaml .Values.externalLabels | indent 4}}
 {{- end }}
-{{- if .Values.externalUrl }}
-  externalUrl: "{{ .Values.externalUrl }}"
-{{- end }}
   nodeSelector:
     beta.kubernetes.io/os: linux
     {{- range .Values.nodeSelectors }}
@@ -114,9 +104,6 @@ spec:
 {{ toYaml .Values.resources.core | indent 4 }}
 {{- end }}
   retention: "{{ .Values.retention }}"
-{{- if .Values.routePrefix }}
-  routePrefix: "{{ .Values.routePrefix }}"
-{{- end }}
 {{- if .Values.secrets }}
   secrets:
 {{ toYaml .Values.secrets | indent 4 }}

charts/rancher-monitoring/v0.0.2/charts/prometheus/templates/servicemonitor.yaml

@@ -7,9 +7,6 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
     source: rancher-monitoring
-    {{- if .Values.serviceMonitorLabels }}
-{{ toYaml .Values.serviceMonitorLabels | indent 4 }}
-    {{- end }}
   name: {{ template "app.fullname" . }}
 spec:
   selector:

charts/rancher-monitoring/v0.0.2/charts/prometheus/values.yaml

@@ -25,12 +25,6 @@ alertingEndpoints: []
 ##
 externalLabels: {}
 
-## External URL at which Prometheus will be reachable
-##
-externalUrl: ""
-
-serviceMonitorLabels: {}
-
 ##Custom Labels to be added to Prometheus Rules CRDs
 ##
 additionalRulesLabels: {}
@@ -42,30 +36,27 @@ image:
   tag: v2.4.3
   auth:
     repository: rancher/prometheus-auth
-    tag: v0.1.0
+    tag: v0.2.0
   proxy:
     repository: nginx
     tag: 1.15.8-alpine
 
 auth:
   args:
-  - --log.debug
-  - agent
-  - start
-  - --agent.proxy-url
+  - --proxy-url
   - http://localhost:9090
-  - --listen.address
+  - --listen-address
   - $(POD_IP):9090
+  - --filter-reader-labels
+  - prometheus
+  - --filter-reader-labels
+  - prometheus_replica
   env:
   - name: POD_IP
     valueFrom:
       fieldRef:
         fieldPath: status.podIP
 
-## Labels to be added to the Prometheus
-##
-# labels: {}
-
 ## Node labels for Prometheus pod assignment
 ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
 ##
@@ -136,11 +127,6 @@ resources:
 ##
 retention: 24h
 
-## Prefix used to register routes, overriding externalUrl route.
-## Useful for proxies that rewrite URLs.
-##
-routePrefix: ""
-
 ## Namespaces to be selected for PrometheusRules discovery.
 ## If unspecified, only the same namespace as the Prometheus object is in is used.
 ruleNamespaceSelector: {}

charts/rancher-monitoring/v0.0.2/templates/servicemonitor.yaml

@@ -8,9 +8,6 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
     source: rancher-monitoring
-    {{- if .Values.serviceMonitorLabels }}
-{{ toYaml .Values.serviceMonitorLabels | indent 4 }}
-    {{- end }}
   name: {{ template "app.fullname" . }}
 spec:
   selector:

charts/rancher-monitoring/v0.0.2/values.yaml

@@ -41,8 +41,6 @@ manageCRDs: false
 
 withValidation: true
 
-serviceMonitorLabels: {}
-
 ## Prometheus-operator resource limits & requests
 ## Ref: https://kubernetes.io/docs/user-guide/compute-resources/
 ##
@@ -71,7 +69,6 @@ exporter-coredns:
   serviceSelectorLabels:
     k8s-app: kube-dns
   insecureSkipVerify: true
-  componentNamespace: ""
 
 exporter-kube-controller-manager:
   enabled: false
@@ -86,7 +83,6 @@ exporter-kube-controller-manager:
   serviceSelectorLabels:
     k8s-app: kube-controller-manager
   insecureSkipVerify: true
-  componentNamespace: ""
 
 exporter-kube-dns:
   enabled: false
@@ -107,7 +103,6 @@ exporter-kube-dns:
   serviceSelectorLabels:
     k8s-app: kube-dns
   insecureSkipVerify: true
-  componentNamespace: ""
 
 exporter-kube-etcd:
   enabled: false
@@ -125,7 +120,6 @@ exporter-kube-etcd:
   caFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
   certFile: ""
   keyFile: ""
-  componentNamespace: ""
 
 exporter-kube-scheduler:
   enabled: false
@@ -140,7 +134,6 @@ exporter-kube-scheduler:
   serviceSelectorLabels:
     component: kube-scheduler
   insecureSkipVerify: true
-  componentNamespace: ""
 
 exporter-kubelets:
   enabled: false
@@ -202,9 +195,6 @@ exporter-node:
   enabledHostNetwork: true
   enabledHostPID: true
   serviceAccountName: ""
-  securityContext:
-    runAsNonRoot: true
-    runAsUser: 65534
 
 exporter-kube-state:
   enabled: false
@@ -329,7 +319,6 @@ prometheus:
   level: cluster
   auth:
     args:
-    - --log.debug
     - --proxy-url
     - http://localhost:9090
     - --listen-address