helm: Use CRDs for rules for operator 0.20.0+ (#1581)

* helm: Use CRDs for rules for operator 0.20.0+ Changed rules configmapst push -f to be PrometheusRule instead Deprecated `additionalRulesConfigMapLabels` in favor of `additionalRulesLabels` Fixes #1523, #1576, #1595 * helm: Rename configmap files to prometheusrule * helm: Remove alert-rules labels from rules Since rules are now sourced from CRDs and rules can be for recording * helm: Bump chart versions
2026-02-05 06:45:27 +01:00 · 2018-07-17 07:50:48 +01:00
parent bf569245d2
commit cfd3b8b788
53 changed files with 307 additions and 300 deletions
--- a/helm/alertmanager/Chart.yaml
+++ b/helm/alertmanager/Chart.yaml
@@ -8,7 +8,7 @@ name: alertmanager
 sources:
  - https://github.com/coreos/prometheus-operator
  - https://github.com/prometheus/alertmanager
-version: 0.1.3
+version: 0.1.4
 appVersion: "0.14.0"
 home: https://github.com/prometheus/alertmanager 
 keywords:
--- a/helm/alertmanager/templates/NOTES.txt
+++ b/helm/alertmanager/templates/NOTES.txt
@@ -1 +1,5 @@
 A new Alertmanager instance has been created.
+
+DEPRECATION NOTICE:
+
+- additionalRulesConfigMapLabels is not used anymore, use additionalRulesLabels
--- a/helm/alertmanager/templates/configmap.yaml
+++ b/helm/alertmanager/templates/configmap.yaml
@@ -1,25 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  labels:
-    app: "alertmanager"
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    prometheus: {{ .Values.prometheusLabelValue | default .Release.Name | quote }}
-    release: {{ .Release.Name }}
-    role: alert-rules
-    {{- if .Values.additionalRulesConfigMapLabels }}
-{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}
-    {{- end }}    
-  name: {{ template "alertmanager.fullname" . }}
-data:
-{{- if .Values.prometheusRules }}
-{{- $root := . }}
-{{- range $key, $val := .Values.prometheusRules }}
-  {{ $key }}: |-
-{{ $val | indent 4}}
-{{- end }}
-{{ else }}
-  alertmanager.rules: |-
-    {{- include "alertmanager.rules.yaml.tpl" . | indent 4}}
-{{ end }}
--- a/helm/alertmanager/templates/prometheusrule.yaml
+++ b/helm/alertmanager/templates/prometheusrule.yaml
@@ -0,0 +1,22 @@
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  labels:
+    app: "alertmanager"
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    heritage: {{ .Release.Service }}
+    prometheus: {{ .Values.prometheusLabelValue | default .Release.Name | quote }}
+    release: {{ .Release.Name }}
+    {{- if .Values.additionalRulesLabels }}
+{{ toYaml .Values.additionalRulesLabels | indent 4 }}
+    {{- else if .Values.additionalRulesConfigMapLabels }}       # Deprecated for .Values.additionalRulesLabels
+{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}  # Deprecated for .Values.additionalRulesLabels
+    {{- end }}   
+  name: {{ template "alertmanager.fullname" . }}
+spec:
+{{- if .Values.prometheusRules }}
+  groups:
+{{ toYaml .Values.prometheusRules | indent 4 }}
+{{ else }}
+{{ include "alertmanager.rules.yaml.tpl" . | indent 2}}
+{{ end }}
--- a/helm/alertmanager/values.yaml
+++ b/helm/alertmanager/values.yaml
@@ -49,9 +49,9 @@ selfServiceMonitor: true
 ##
 additionalServiceMonitorLabels: {}

-##Custom Labels to be added to Prometheus Rules ConfigMap
+##Custom Labels to be added to Prometheus Rules CRD
 ##
-additionalRulesConfigMapLabels: {}
+additionalRulesLabels: {}

 ## Alertmanager container image
 ##
@@ -63,7 +63,7 @@ image:
 ##
 labels: {}

-## "prometheus" label value for ServiceMonitor and rules ConfigMap
+## "prometheus" label value for ServiceMonitor ConfigMap and Prometheus Rules CRD
 ## Release.Name by default
 prometheusLabelValue: ""

--- a/helm/exporter-kube-controller-manager/Chart.yaml
+++ b/helm/exporter-kube-controller-manager/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart for Kubernetes
 name: exporter-kube-controller-manager
-version: 0.1.9
+version: 0.1.10
 maintainers:
  - name: Michael Goodness
    email: mgoodness@gmail.com
--- a/helm/exporter-kube-controller-manager/templates/NOTES.txt
+++ b/helm/exporter-kube-controller-manager/templates/NOTES.txt
@@ -0,0 +1,3 @@
+DEPRECATION NOTICE:
+
+- additionalRulesConfigMapLabels is not used anymore, use additionalRulesLabels
--- a/helm/exporter-kube-controller-manager/templates/configmap.yaml
+++ b/helm/exporter-kube-controller-manager/templates/configmap.yaml
@@ -1,25 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  labels:
-    app: "prometheus"
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    prometheus: {{ .Release.Name }}
-    release: {{ .Release.Name }}
-    role: alert-rules
-    {{- if .Values.additionalRulesConfigMapLabels }}
-{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}
-    {{- end }}
-  name: {{ template "exporter-kube-controller-manager.fullname" . }}
-data:
-{{- if .Values.prometheusRules }}
-{{- $root := . }}
-{{- range $key, $val := .Values.prometheusRules }}
-  {{ $key }}: |-
-{{ $val | indent 4}}
-{{- end }}
-{{ else }}
-  kube-controller-manager.rules: |-
-    {{- include "kube-controller-manager.rules.yaml.tpl" . | indent 4}}
-{{ end }}
--- a/helm/exporter-kube-controller-manager/templates/prometheusrule.yaml
+++ b/helm/exporter-kube-controller-manager/templates/prometheusrule.yaml
@@ -0,0 +1,22 @@
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  labels:
+    app: "prometheus"
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    heritage: {{ .Release.Service }}
+    prometheus: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+    {{- if .Values.additionalRulesLabels }}
+{{ toYaml .Values.additionalRulesLabels | indent 4 }}
+    {{- else if .Values.additionalRulesConfigMapLabels }}       # Deprecated for .Values.additionalRulesLabels
+{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}  # Deprecated for .Values.additionalRulesLabels
+    {{- end }}
+  name: {{ template "exporter-kube-controller-manager.fullname" . }}
+spec:
+{{- if .Values.prometheusRules }}
+  groups:
+{{ toYaml .Values.prometheusRules | indent 4 }}
+{{ else }}
+{{ include "kube-controller-manager.rules.yaml.tpl" . | indent 2}}
+{{ end }}
--- a/helm/exporter-kube-controller-manager/values.yaml
+++ b/helm/exporter-kube-controller-manager/values.yaml
@@ -12,6 +12,6 @@ serviceSelectorLabelKey: k8s-app
 ##
 additionalServiceMonitorLabels: {}

-##Custom Labels to be added to Prometheus Rules ConfigMap
+##Custom Labels to be added to Prometheus Rules CRD
 ##
-additionalRulesConfigMapLabels: {}
+additionalRulesLabels: {}
--- a/helm/exporter-kube-etcd/Chart.yaml
+++ b/helm/exporter-kube-etcd/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart for Kubernetes
 name: exporter-kube-etcd
-version: 0.1.14
+version: 0.1.15
 maintainers:
  - name: Giancarlo Rubio
    email: gianrubio@gmail.com
--- a/helm/exporter-kube-etcd/templates/NOTES.txt
+++ b/helm/exporter-kube-etcd/templates/NOTES.txt
@@ -0,0 +1,3 @@
+DEPRECATION NOTICE:
+
+- additionalRulesConfigMapLabels is not used anymore, use additionalRulesLabels
--- a/helm/exporter-kube-etcd/templates/configmap.yaml
+++ b/helm/exporter-kube-etcd/templates/configmap.yaml
@@ -1,25 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  labels:
-    app: "prometheus"
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    prometheus: {{ .Release.Name }}
-    release: {{ .Release.Name }}
-    role: alert-rules
-    {{- if .Values.additionalRulesConfigMapLabels }}
-{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}
-    {{- end }}    
-  name: {{ template "exporter-kube-etcd.fullname" . }}
-data:
-{{- if .Values.prometheusRules }}
-{{- $root := . }}
-{{- range $key, $val := .Values.prometheusRules }}
-  {{ $key }}: |-
-{{ tpl $val $root | indent 4}}
-{{- end }}
-{{ else }}
-  etcd3.rules: |-
-    {{- include "etcd3.rules.yaml.tpl" . | indent 4}}
-{{ end }}
--- a/helm/exporter-kube-etcd/templates/prometheusrule.yaml
+++ b/helm/exporter-kube-etcd/templates/prometheusrule.yaml
@@ -0,0 +1,22 @@
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  labels:
+    app: "prometheus"
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    heritage: {{ .Release.Service }}
+    prometheus: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+    {{- if .Values.additionalRulesLabels }}
+{{ toYaml .Values.additionalRulesLabels | indent 4 }}
+    {{- else if .Values.additionalRulesConfigMapLabels }}       # Deprecated for .Values.additionalRulesLabels
+{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}  # Deprecated for .Values.additionalRulesLabels
+    {{- end }}   
+  name: {{ template "exporter-kube-etcd.fullname" . }}
+spec:
+{{- if .Values.prometheusRules }}
+  groups:
+{{ toYaml .Values.prometheusRules | indent 4 }}
+{{ else }}
+{{ include "etcd3.rules.yaml.tpl" . | indent 2}}
+{{ end }}
--- a/helm/exporter-kube-etcd/values.yaml
+++ b/helm/exporter-kube-etcd/values.yaml
@@ -19,9 +19,9 @@ keyFile: ""
 ## Custom Labels to be added to ServiceMonitor
 ##
 additionalServiceMonitorLabels: {}
-##Custom Labels to be added to Prometheus Rules ConfigMap
+##Custom Labels to be added to Prometheus Rules CRD
 ##
-additionalRulesConfigMapLabels: {}
+additionalRulesLabels: {}

 serviceMonitor:
  create: true
--- a/helm/exporter-kube-scheduler/Chart.yaml
+++ b/helm/exporter-kube-scheduler/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart singleton for kube-state-metrics
 name: exporter-kube-scheduler
-version: 0.1.8
+version: 0.1.9
 maintainers:
  - name: Michael Goodness
    email: mgoodness@gmail.com
--- a/helm/exporter-kube-scheduler/templates/NOTES.txt
+++ b/helm/exporter-kube-scheduler/templates/NOTES.txt
@@ -0,0 +1,3 @@
+DEPRECATION NOTICE:
+
+- additionalRulesConfigMapLabels is not used anymore, use additionalRulesLabels
--- a/helm/exporter-kube-scheduler/templates/configmap.yaml
+++ b/helm/exporter-kube-scheduler/templates/configmap.yaml
@@ -1,25 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  labels:
-    app: "prometheus"
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    prometheus: {{ .Release.Name }}
-    release: {{ .Release.Name }}
-    role: alert-rules
-    {{- if .Values.additionalRulesConfigMapLabels }}
-{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}
-    {{- end }}    
-  name: {{ template "exporter-kube-scheduler.fullname" . }}
-data:
-{{- if .Values.prometheusRules }}
-{{- $root := . }}
-{{- range $key, $val := .Values.prometheusRules }}
-  {{ $key }}: |-
-{{ tpl $val $root | indent 4}}
-{{- end }}
-{{ else }}
-  kube-scheduler.rules: |-
-    {{- include "kube-scheduler.rules.yaml.tpl" . | indent 4}}
-{{ end }}
--- a/helm/exporter-kube-scheduler/templates/prometheusrule.yaml
+++ b/helm/exporter-kube-scheduler/templates/prometheusrule.yaml
@@ -0,0 +1,22 @@
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  labels:
+    app: "prometheus"
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    heritage: {{ .Release.Service }}
+    prometheus: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+    {{- if .Values.additionalRulesLabels }}
+{{ toYaml .Values.additionalRulesLabels | indent 4 }}
+    {{- else if .Values.additionalRulesConfigMapLabels }}       # Deprecated for .Values.additionalRulesLabels
+{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}  # Deprecated for .Values.additionalRulesLabels
+    {{- end }} 
+  name: {{ template "exporter-kube-scheduler.fullname" . }}
+spec:
+{{- if .Values.prometheusRules }}
+  groups:
+{{ toYaml .Values.prometheusRules | indent 4 }}
+{{ else }}
+{{ include "kube-scheduler.rules.yaml.tpl" . | indent 2}}
+{{ end }}
--- a/helm/exporter-kube-scheduler/values.yaml
+++ b/helm/exporter-kube-scheduler/values.yaml
@@ -11,6 +11,6 @@ serviceSelectorLabelKey: k8s-app
 ## Custom Labels to be added to ServiceMonitor
 ##
 additionalServiceMonitorLabels: {}
-##Custom Labels to be added to Prometheus Rules ConfigMap
+##Custom Labels to be added to Prometheus Rules CRD
 ##
-additionalRulesConfigMapLabels: {}
+additionalRulesLabels: {}
--- a/helm/exporter-kube-state/Chart.yaml
+++ b/helm/exporter-kube-state/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart singleton for kube-state-metrics
 name: exporter-kube-state
-version: 0.2.4
+version: 0.2.5
 maintainers:
  - name: Giancarlo Rubio
    email: gianrubio@gmail.com
--- a/helm/exporter-kube-state/templates/NOTES.txt
+++ b/helm/exporter-kube-state/templates/NOTES.txt
@@ -15,3 +15,7 @@
 {{- end }}

 IMPORTANT: this is a singleton chart; only install one per cluster
+
+DEPRECATION NOTICE:
+
+- additionalRulesConfigMapLabels is not used anymore, use additionalRulesLabels
--- a/helm/exporter-kube-state/templates/configmap.yaml
+++ b/helm/exporter-kube-state/templates/configmap.yaml
@@ -1,25 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  labels:
-    app: "prometheus"
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    prometheus: {{ .Release.Name }}
-    release: {{ .Release.Name }}
-    role: alert-rules
-    {{- if .Values.additionalRulesConfigMapLabels }}
-{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}
-    {{- end }}    
-  name: {{ template "exporter-kube-state.fullname" . }}
-data:
-{{- if .Values.prometheusRules }}
-{{- $root := . }}
-{{- range $key, $val := .Values.prometheusRules }}
-  {{ $key }}: |-
-{{ $val | indent 4}}
-{{- end }}
-{{ else }}
-  kube-state-metrics.rules: |-
-    {{- include "kube-state-metrics.rules.yaml.tpl" . | indent 4}}
-{{ end }}
--- a/helm/exporter-kube-state/templates/prometheusrule.yaml
+++ b/helm/exporter-kube-state/templates/prometheusrule.yaml
@@ -0,0 +1,22 @@
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  labels:
+    app: "prometheus"
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    heritage: {{ .Release.Service }}
+    prometheus: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+    {{- if .Values.additionalRulesLabels }}
+{{ toYaml .Values.additionalRulesLabels | indent 4 }}
+    {{- else if .Values.additionalRulesConfigMapLabels }}       # Deprecated for .Values.additionalRulesLabels
+{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}  # Deprecated for .Values.additionalRulesLabels
+    {{- end }} 
+  name: {{ template "exporter-kube-state.fullname" . }}
+spec:
+{{- if .Values.prometheusRules }}
+  groups:
+{{ toYaml .Values.prometheusRules | indent 4 }}
+{{ else }}
+{{ include "kube-state-metrics.rules.yaml.tpl" . | indent 2}}
+{{ end }}
--- a/helm/exporter-kube-state/values.yaml
+++ b/helm/exporter-kube-state/values.yaml
@@ -55,6 +55,6 @@ tolerations: {}
 ## Custom Labels to be added to ServiceMonitor
 ##
 additionalServiceMonitorLabels: {}
-##Custom Labels to be added to Prometheus Rules ConfigMap
+##Custom Labels to be added to Prometheus Rules CRD
 ##
-additionalRulesConfigMapLabels: {}
+additionalRulesLabels: {}
--- a/helm/exporter-kubelets/Chart.yaml
+++ b/helm/exporter-kubelets/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart for Kubernetes
 name: exporter-kubelets
-version: 0.2.10
+version: 0.2.11
 maintainers:
  - name: Michael Goodness
    email: mgoodness@gmail.com
--- a/helm/exporter-kubelets/templates/NOTES.txt
+++ b/helm/exporter-kubelets/templates/NOTES.txt
@@ -0,0 +1,3 @@
+DEPRECATION NOTICE:
+
+- additionalRulesConfigMapLabels is not used anymore, use additionalRulesLabels
--- a/helm/exporter-kubelets/templates/configmap.yaml
+++ b/helm/exporter-kubelets/templates/configmap.yaml
@@ -1,25 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  labels:
-    app: "prometheus"
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    prometheus: {{ .Release.Name }}
-    release: {{ .Release.Name }}
-    role: alert-rules
-    {{- if .Values.additionalRulesConfigMapLabels }}
-{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}
-    {{- end }}    
-  name: {{ template "exporter-kubelets.fullname" . }}
-data:
-{{- if .Values.prometheusRules }}
-{{- $root := . }}
-{{- range $key, $val := .Values.prometheusRules }}
-  {{ $key }}: |-
-{{ $val | indent 4}}
-{{- end }}
-{{ else }}
-  kubelet.rules: |-
-    {{- include "kubelet.rules.yaml.tpl" . | indent 4}}
-{{ end }}
--- a/helm/exporter-kubelets/templates/prometheusrule.yaml
+++ b/helm/exporter-kubelets/templates/prometheusrule.yaml
@@ -0,0 +1,22 @@
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  labels:
+    app: "prometheus"
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    heritage: {{ .Release.Service }}
+    prometheus: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+    {{- if .Values.additionalRulesLabels }}
+{{ toYaml .Values.additionalRulesLabels | indent 4 }}
+    {{- else if .Values.additionalRulesConfigMapLabels }}       # Deprecated for .Values.additionalRulesLabels
+{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}  # Deprecated for .Values.additionalRulesLabels
+    {{- end }}
+  name: {{ template "exporter-kubelets.fullname" . }}
+spec:
+{{- if .Values.prometheusRules }}
+  groups:
+{{ toYaml .Values.prometheusRules | indent 4 }}
+{{ else }}
+{{ include "kubelet.rules.yaml.tpl" . | indent 2}}
+{{ end }}
--- a/helm/exporter-kubelets/values.yaml
+++ b/helm/exporter-kubelets/values.yaml
@@ -9,6 +9,6 @@ insecureSkipVerify: true
 ## Custom Labels to be added to ServiceMonitor
 ##
 additionalServiceMonitorLabels: {}
-##Custom Labels to be added to Prometheus Rules ConfigMap
+##Custom Labels to be added to Prometheus Rules CRD
 ##
-additionalRulesConfigMapLabels: {}
+additionalRulesLabels: {}
--- a/helm/exporter-kubernetes/Chart.yaml
+++ b/helm/exporter-kubernetes/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart for Kubernetes
 name: exporter-kubernetes
-version: 0.1.9
+version: 0.1.10
 maintainers:
  - name: Giancarlo Rubio
    email: gianrubio@gmail.com
--- a/helm/exporter-kubernetes/templates/NOTES.txt
+++ b/helm/exporter-kubernetes/templates/NOTES.txt
@@ -0,0 +1,3 @@
+DEPRECATION NOTICE:
+
+- additionalRulesConfigMapLabels is not used anymore, use additionalRulesLabels
--- a/helm/exporter-kubernetes/templates/configmap.yaml
+++ b/helm/exporter-kubernetes/templates/configmap.yaml
@@ -1,25 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  labels:
-    app: "prometheus"
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    prometheus: {{ .Release.Name }}
-    release: {{ .Release.Name }}
-    role: alert-rules
-    {{- if .Values.additionalRulesConfigMapLabels }}
-{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}
-    {{- end }}
-  name: {{ template "exporter-kubernetes.fullname" . }}
-data:
-{{- if .Values.prometheusRules }}
-{{- $root := . }}
-{{- range $key, $val := .Values.prometheusRules }}
-  {{ $key }}: |-
-{{ $val | indent 4}}
-{{- end }}
-{{ else }}
-  kubernetes.rules: |-
-    {{- include "kubernetes.rules.yaml.tpl" . | indent 4}}
-{{ end }}
--- a/helm/exporter-kubernetes/templates/prometheusrule.yaml
+++ b/helm/exporter-kubernetes/templates/prometheusrule.yaml
@@ -0,0 +1,22 @@
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  labels:
+    app: "prometheus"
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    heritage: {{ .Release.Service }}
+    prometheus: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+    {{- if .Values.additionalRulesLabels }}
+{{ toYaml .Values.additionalRulesLabels | indent 4 }}
+    {{- else if .Values.additionalRulesConfigMapLabels }}       # Deprecated for .Values.additionalRulesLabels
+{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}  # Deprecated for .Values.additionalRulesLabels
+    {{- end }}
+  name: {{ template "exporter-kubernetes.fullname" . }}
+spec:
+{{- if .Values.prometheusRules }}
+  groups:
+{{ toYaml .Values.prometheusRules | indent 4 }}
+{{ else }}
+{{ include "kubernetes.rules.yaml.tpl" . | indent 2}}
+{{ end }}
--- a/helm/exporter-kubernetes/values.yaml
+++ b/helm/exporter-kubernetes/values.yaml
@@ -4,6 +4,6 @@
 ## Custom Labels to be added to ServiceMonitor
 ##
 additionalServiceMonitorLabels: {}
-##Custom Labels to be added to Prometheus Rules ConfigMap
+##Custom Labels to be added to Prometheus Rules CRD
 ##
-additionalRulesConfigMapLabels: {}
+additionalRulesLabels: {}
--- a/helm/exporter-node/Chart.yaml
+++ b/helm/exporter-node/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart for Kubernetes node exporter
 name: exporter-node
-version: 0.4.1
+version: 0.4.2
 maintainers:
  - name: Giancarlo Rubio
    email: gianrubio@gmail.com
--- a/helm/exporter-node/templates/configmap.yaml
+++ b/helm/exporter-node/templates/configmap.yaml
@@ -1,25 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  labels:
-    app: "prometheus"
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    prometheus: {{ .Release.Name }}
-    release: {{ .Release.Name }}
-    role: alert-rules
-    {{- if .Values.additionalRulesConfigMapLabels }}
-{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}
-    {{- end }}    
-  name: {{ template "exporter-node.fullname" . }}
-data:
-{{- if .Values.prometheusRules }}
-{{- $root := . }}
-{{- range $key, $val := .Values.prometheusRules }}
-  {{ $key }}: |-
-{{ $val | indent 4}}
-{{- end }}
-{{ else }}
-  node.rules: |-
-    {{- include "node.rules.yaml.tpl" . | indent 4}}
-{{ end }}
--- a/helm/exporter-node/templates/prometheusrule.yaml
+++ b/helm/exporter-node/templates/prometheusrule.yaml
@@ -0,0 +1,22 @@
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  labels:
+    app: "prometheus"
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    heritage: {{ .Release.Service }}
+    prometheus: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+    {{- if .Values.additionalRulesLabels }}
+{{ toYaml .Values.additionalRulesLabels | indent 4 }}
+    {{- else if .Values.additionalRulesConfigMapLabels }}       # Deprecated for .Values.additionalRulesLabels
+{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}  # Deprecated for .Values.additionalRulesLabels
+    {{- end }}   
+  name: {{ template "exporter-node.fullname" . }}
+spec:
+{{- if .Values.prometheusRules }}
+  groups:
+{{ toYaml .Values.prometheusRules | indent 4 }}
+{{ else }}
+{{ include "node.rules.yaml.tpl" . | indent 2}}
+{{ end }}
--- a/helm/exporter-node/values.yaml
+++ b/helm/exporter-node/values.yaml
@@ -62,9 +62,9 @@ global:
 ## Custom Labels to be added to ServiceMonitor
 ##
 additionalServiceMonitorLabels: {}
-##Custom Labels to be added to Prometheus Rules ConfigMap
+##Custom Labels to be added to Prometheus Rules CRD
 ##
-additionalRulesConfigMapLabels: {}
+additionalRulesLabels: {}

 # deploy node_exporter as a DaemonSet
 enableDaemonSet: true
--- a/helm/kube-prometheus/Chart.yaml
+++ b/helm/kube-prometheus/Chart.yaml
@@ -7,4 +7,4 @@ maintainers:
 name: kube-prometheus
 sources:
  - https://github.com/coreos/prometheus-operator
-version: 0.0.95
+version: 0.0.96
--- a/helm/kube-prometheus/requirements.yaml
+++ b/helm/kube-prometheus/requirements.yaml
@@ -1,12 +1,12 @@
 dependencies:
  - name: alertmanager
-    version: 0.1.3
+    version: 0.1.4
    #e2e-repository: file://../alertmanager
    repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
    condition: deployAlertManager

  - name: prometheus
-    version: 0.0.49
+    version: 0.0.50
    #e2e-repository: file://../prometheus
    repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/

@@ -17,7 +17,7 @@ dependencies:
    condition: deployCoreDNS

  - name: exporter-kube-controller-manager
-    version: 0.1.9
+    version: 0.1.10
    #e2e-repository: file://../exporter-kube-controller-manager
    repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
    condition: deployKubeControllerManager
@@ -29,36 +29,36 @@ dependencies:
    condition: deployKubeDNS

  - name: exporter-kube-etcd
-    version: 0.1.14
+    version: 0.1.15
    #e2e-repository: file://../exporter-kube-etcd
    repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
    condition: deployKubeEtcd

  - name: exporter-kube-scheduler
-    version: 0.1.8
+    version: 0.1.9
    #e2e-repository: file://../exporter-kube-scheduler
    repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
    condition: deployKubeScheduler

  - name: exporter-kube-state
-    version: 0.2.4
+    version: 0.2.5
    #e2e-repository: file://../exporter-kube-state
    repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
    condition: deployKubeState

  - name: exporter-kubelets
-    version: 0.2.10
+    version: 0.2.11
    #e2e-repository: file://../exporter-kubelets
    repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
    condition: deployKubelets

  - name: exporter-kubernetes
-    version: 0.1.9
+    version: 0.1.10
    #e2e-repository: file://../exporter-kubernetes
    repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/

  - name: exporter-node
-    version: 0.4.1
+    version: 0.4.2
    #e2e-repository: file://../exporter-node
    repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
    condition: deployExporterNode
--- a/helm/kube-prometheus/templates/NOTES.txt
+++ b/helm/kube-prometheus/templates/NOTES.txt
@@ -3,3 +3,12 @@ DEPRECATION NOTICE:
 - alertmanager.ingress.fqdn is not used anymore, use alertmanager.ingress.hosts []
 - prometheus.ingress.fqdn is not used anymore, use prometheus.ingress.hosts []
 - grafana.ingress.fqdn is not used anymore, use prometheus.grafana.hosts []
+
+- additionalRulesConfigMapLabels is not used anymore, use additionalRulesLabels
+- prometheus.additionalRulesConfigMapLabels is not used anymore, use additionalRulesLabels
+- alertmanager.additionalRulesConfigMapLabels is not used anymore, use additionalRulesLabels
+- exporter-kube-controller-manager.additionalRulesConfigMapLabels is not used anymore, use additionalRulesLabels
+- exporter-kube-etcd.additionalRulesConfigMapLabels is not used anymore, use additionalRulesLabels
+- exporter-kube-scheduler.additionalRulesConfigMapLabels is not used anymore, use additionalRulesLabels
+- exporter-kubelets.additionalRulesConfigMapLabels is not used anymore, use additionalRulesLabels
+- exporter-kubernetes.additionalRulesConfigMapLabels is not used anymore, use additionalRulesLabels
--- a/helm/kube-prometheus/templates/configmap.yaml
+++ b/helm/kube-prometheus/templates/configmap.yaml
@@ -1,25 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  labels:
-    app: "prometheus"
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    prometheus: {{ .Release.Name }}
-    release: {{ .Release.Name }}
-    role: alert-rules
-    {{- if .Values.additionalRulesConfigMapLabels }}
-{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}
-    {{- end }}
-  name: {{ template "kube-prometheus.fullname" . }}
-data:
-{{- if .Values.prometheusRules }}
-{{- $root := . }}
-{{- range $key, $val := .Values.prometheusRules }}
-  {{ $key }}: |-
-{{ tpl $val $root | indent 4}}
-{{- end }}
-{{ else }}
-  general.rules: |-
-    {{- include "general.rules.yaml.tpl" . | indent 4}}
-{{ end }}
--- a/helm/kube-prometheus/templates/prometheusrule.yaml
+++ b/helm/kube-prometheus/templates/prometheusrule.yaml
@@ -0,0 +1,22 @@
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  labels:
+    app: "prometheus"
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    heritage: {{ .Release.Service }}
+    prometheus: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+    {{- if .Values.additionalRulesLabels }}
+{{ toYaml .Values.additionalRulesLabels | indent 4 }}
+    {{- else if .Values.additionalRulesConfigMapLabels }}       # Deprecated for .Values.additionalRulesLabels
+{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}  # Deprecated for .Values.additionalRulesLabels
+    {{- end }}
+  name: {{ template "kube-prometheus.fullname" . }}
+spec:
+{{- if .Values.prometheusRules }}
+  groups:
+{{ toYaml .Values.prometheusRules | indent 4 }}
+{{ else }}
+{{ include "general.rules.yaml.tpl" . | indent 2}}
+{{ end }}
--- a/helm/kube-prometheus/values.yaml
+++ b/helm/kube-prometheus/values.yaml
@@ -269,7 +269,7 @@ prometheus:
  ## If unspecified, only the same namespace as the Prometheus object is in is used.
  ruleNamespaceSelector: {}

-  ## Rules configmap selector
+  ## Rules PrometheusRule CRD selector
  ## Ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/design.md
  ##
  ## 1. If `matchLabels` is used, `rules.additionalLabels` must contain all the labels from
@@ -292,7 +292,7 @@ prometheus:
  ##
  rules:
    specifiedInValues: true
-    ## What additional rules to be added to the ConfigMap
+    ## What additional rules to be added to the PrometheusRule CRD
    ## You can use this together with `rulesSelector`
    additionalLabels: {}
    #  prometheus: example-rules
@@ -440,8 +440,8 @@ deployCoreDNS: false
 deployKubeDNS: true
 deployKubeEtcd: true

-##Custom Labels to be added to Prometheus Rules ConfigMap
+##Custom Labels to be added to Prometheus Rules CRD
 ##
-additionalRulesConfigMapLabels: {}
+additionalRulesLabels: {}
  # additionalRulesConfigMapLabels:
  #   team: devops
--- a/helm/prometheus/Chart.yaml
+++ b/helm/prometheus/Chart.yaml
@@ -7,5 +7,5 @@ maintainers:
 name: prometheus
 sources:
  - https://github.com/coreos/prometheus-operator
-version: 0.0.49
+version: 0.0.50

--- a/helm/prometheus/README.md
+++ b/helm/prometheus/README.md
@@ -67,7 +67,7 @@ Parameter | Description | Default
 `routePrefix` | Prefix used to register routes, overriding externalUrl route | `/`
 `rules` | Prometheus alerting & recording rules | `{}`
 `ruleNamespaceSelector` | Namespaces to be selected for PrometheusRules discovery | `{}`
-`rulesSelector` | Rules ConfigMap selector | `{}`
+`rulesSelector` | Rules CRD selector | `{}`
 `secrets` | List of Secrets in the same namespace as the Prometheus object, which shall be mounted into the Prometheus Pods. | `{}`
 `service.annotations` | Annotations to be added to the Prometheus Service | `{}`
 `service.clusterIP` | Cluster-internal IP address for Prometheus Service | `""`
--- a/helm/prometheus/templates/NOTES.txt
+++ b/helm/prometheus/templates/NOTES.txt
@@ -1 +1,5 @@
 A new Prometheus instance has been created.
+
+DEPRECATION NOTICE:
+
+- additionalRulesConfigMapLabels is not used anymore, use additionalRulesLabels
--- a/helm/prometheus/templates/configmap.yaml
+++ b/helm/prometheus/templates/configmap.yaml
@@ -1,25 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  labels:
-    app: "prometheus"
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    prometheus: {{ .Values.prometheusLabelValue | default .Release.Name | quote }}
-    release: {{ .Release.Name }}
-    role: alert-rules
-    {{- if .Values.additionalRulesConfigMapLabels }}
-{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}
-    {{- end }}    
-  name: {{ template "prometheus.fullname" . }}-rules
-data:
-{{- if .Values.prometheusRules }}
-{{- $root := . }}
-{{- range $key, $val := .Values.prometheusRules }}
-  {{ $key }}: |-
-{{ $val | indent 4}}
-{{- end }}
-{{ else }}
-  prometheus.rules: |-
-    {{- include "prometheus.rules.yaml.tpl" . | indent 4}}
-{{ end }}
--- a/helm/prometheus/templates/prometheus.yaml
+++ b/helm/prometheus/templates/prometheus.yaml
@@ -95,7 +95,6 @@ spec:
 {{- else }}
  ruleSelector:
    matchLabels:
-      role: alert-rules
      prometheus: {{ .Values.prometheusLabelValue | default .Release.Name | quote }}
 {{- end }}
 {{- if .Values.storageSpec }}
--- a/helm/prometheus/templates/prometheusrule.yaml
+++ b/helm/prometheus/templates/prometheusrule.yaml
@@ -0,0 +1,22 @@
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  labels:
+    app: "prometheus"
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    heritage: {{ .Release.Service }}
+    prometheus: {{ .Values.prometheusLabelValue | default .Release.Name | quote }}
+    release: {{ .Release.Name }}
+    {{- if .Values.additionalRulesLabels }}
+{{ toYaml .Values.additionalRulesLabels | indent 4 }}
+    {{- else if .Values.additionalRulesConfigMapLabels }}       # Deprecated for .Values.additionalRulesLabels
+{{ toYaml .Values.additionalRulesConfigMapLabels | indent 4 }}  # Deprecated for .Values.additionalRulesLabels
+    {{- end }}
+  name: {{ template "prometheus.fullname" . }}-rules
+spec:
+{{- if .Values.prometheusRules }}
+  groups:
+{{ toYaml .Values.prometheusRules | indent 4 }}
+{{ else }}
+{{ include "prometheus.rules.yaml.tpl" . | indent 2}}
+{{ end }}
--- a/helm/prometheus/templates/rules.yaml
+++ b/helm/prometheus/templates/rules.yaml
@@ -1,6 +1,6 @@
 {{- if and .Values.rules.specifiedInValues .Values.rules.value }}
-apiVersion: v1
-kind: ConfigMap
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
 metadata:
  labels:
    app: {{ template "prometheus.name" . }}
@@ -12,6 +12,7 @@ metadata:
 {{ toYaml .Values.rules.additionalLabels | indent 4 }}
    {{- end }}
  name: prometheus-{{ .Release.Name }}-rules
-data:
-{{ toYaml .Values.rules.value | indent 2 }}
+spec:
+  groups:
+{{ toYaml .Values.rules.value | indent 4 }}
 {{- end }}
--- a/helm/prometheus/values.yaml
+++ b/helm/prometheus/values.yaml
@@ -34,9 +34,10 @@ prometheusLabelValue: ""
 ## Custom Labels to be added to ServiceMonitor
 ##
 additionalSelfServiceMonitorLabels: {}
-##Custom Labels to be added to Prometheus Rules ConfigMap
+
+##Custom Labels to be added to Prometheus Rules CRDs
 ##
-additionalRulesConfigMapLabels: {}
+additionalRulesLabels: {}

 ## Prometheus container image
 ##
@@ -158,7 +159,7 @@ routePrefix: /
 ## Namespaces to be selected for PrometheusRules discovery.
 ## If unspecified, only the same namespace as the Prometheus object is in is used.
 ruleNamespaceSelector: {}
-## Rules configmap selector
+## Rules CRD selector
 ## Ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/design.md
 ##
 ## 1. If `matchLabels` is used, `rules.additionalLabels` must contain all the labels from
@@ -181,7 +182,7 @@ rulesSelector: {}
 ##
 rules:
  specifiedInValues: true
-  ## What additional rules to be added to the ConfigMap
+  ## What additional rules to be added to the CRD
  ## You can use this together with `rulesSelector`
  additionalLabels: {}
  #  prometheus: example-rules