[stable/prometheus] Fixes #9033, some resources are created when a component is disabled (#9274)

* [stable/prometheus] fixes #9033 resources created when component is disabled

Signed-off-by: Ludovic Cavajani <lcavajani@suse.com>

* bump chart version

Signed-off-by: Ludovic Cavajani <lcavajani@suse.com>

stable/prometheus/Chart.yaml

@@ -1,5 +1,5 @@
 name: prometheus
-version: 7.4.1
+version: 7.4.2
 appVersion: 2.5.0
 description: Prometheus is a monitoring system and time series database.
 home: https://prometheus.io/

stable/prometheus/templates/alertmanager-networkpolicy.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.networkPolicy.enabled }}
+{{- if and .Values.alertmanager.enabled .Values.networkPolicy.enabled -}}
 apiVersion: {{ template "prometheus.networkPolicy.apiVersion" . }}
 kind: NetworkPolicy
 metadata:
@@ -23,4 +23,4 @@ spec:
             component: "{{ .Values.server.name }}"
     - ports:
       - port: 9093
-{{- end }}
+{{- end -}}

stable/prometheus/templates/alertmanager-serviceaccount.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.serviceAccounts.alertmanager.create }}
+{{- if and .Values.alertmanager.enabled .Values.serviceAccounts.alertmanager.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -9,4 +9,4 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
   name: {{ template "prometheus.serviceAccountName.alertmanager" . }}
-{{- end }}
+{{- end -}}

stable/prometheus/templates/kube-state-metrics-clusterrole.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.rbac.create }}
+{{- if and .Values.kubeStateMetrics.enabled .Values.rbac.create -}}
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:

stable/prometheus/templates/kube-state-metrics-clusterrolebinding.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.rbac.create }}
+{{- if and .Values.kubeStateMetrics.enabled .Values.rbac.create -}}
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
@@ -17,4 +17,4 @@ roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: {{ template "prometheus.kubeStateMetrics.fullname" . }}
-{{- end }}
+{{- end -}}

stable/prometheus/templates/kube-state-metrics-networkpolicy.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.networkPolicy.enabled }}
+{{- if and .Values.kubeStateMetrics.enabled .Values.networkPolicy.enabled -}}
 apiVersion: {{ template "prometheus.networkPolicy.apiVersion" . }}
 kind: NetworkPolicy
 metadata:
@@ -23,4 +23,4 @@ spec:
           component: "{{ .Values.server.name }}"
   - ports:
     - port: 8080
-{{- end }}
+{{- end -}}

stable/prometheus/templates/kube-state-metrics-serviceaccount.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.serviceAccounts.kubeStateMetrics.create }}
+{{- if and .Values.kubeStateMetrics.enabled .Values.serviceAccounts.kubeStateMetrics.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -9,4 +9,4 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
   name: {{ template "prometheus.serviceAccountName.kubeStateMetrics" . }}
-{{- end }}
+{{- end -}}

stable/prometheus/templates/kube-state-metrics-svc.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.kubeStateMetrics.enabled -}}
+{{- if and .Values.kubeStateMetrics.enabled .Values.kubeStateMetrics.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:

stable/prometheus/templates/node-exporter-podsecuritypolicy.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.rbac.create }}
+{{- if and .Values.nodeExporter.enabled .Values.rbac.create }}
 {{- if .Values.nodeExporter.podSecurityPolicy.enabled }}
 apiVersion: extensions/v1beta1
 kind: PodSecurityPolicy

stable/prometheus/templates/node-exporter-role.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.rbac.create }}
+{{- if and .Values.nodeExporter.enabled .Values.rbac.create }}
 {{- if .Values.nodeExporter.podSecurityPolicy.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: Role

stable/prometheus/templates/node-exporter-rolebinding.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.rbac.create }}
+{{- if and .Values.nodeExporter.enabled .Values.rbac.create }}
 {{- if .Values.nodeExporter.podSecurityPolicy.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding

stable/prometheus/templates/node-exporter-serviceaccount.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.serviceAccounts.nodeExporter.create }}
+{{- if and .Values.nodeExporter.enabled .Values.serviceAccounts.nodeExporter.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -9,4 +9,4 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
   name: {{ template "prometheus.serviceAccountName.nodeExporter" . }}
-{{- end }}
+{{- end -}}

stable/prometheus/templates/pushgateway-serviceaccount.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.serviceAccounts.pushgateway.create }}
+{{- if and .Values.pushgateway.enabled .Values.serviceAccounts.pushgateway.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -9,4 +9,4 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
   name: {{ template "prometheus.serviceAccountName.pushgateway" . }}
-{{- end }}
+{{- end -}}