diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index de38760d69..19bae7f53d 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -11,7 +11,7 @@ name: prometheus-operator sources: - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 5.19.0 +version: 6.0.0 appVersion: 0.31.1 home: https://github.com/coreos/prometheus-operator keywords: diff --git a/stable/prometheus-operator/README.md b/stable/prometheus-operator/README.md index 6d9717930d..400a280051 100644 --- a/stable/prometheus-operator/README.md +++ b/stable/prometheus-operator/README.md @@ -93,6 +93,12 @@ The `crd-install` hook is required to deploy the prometheus operator CRDs before 1. Install prometheus-operator by itself, disabling everything but the prometheus-operator component, and also setting `prometheusOperator.serviceMonitor.selfMonitor=false` 2. Install all the other components, and configure `prometheus.additionalServiceMonitors` to scrape the prometheus-operator service. + +### Upgrade +When executing the `helm upgrade` to avoid the error below is need add the argument `--force`. +> invalid: spec.selector: Invalid value: v1.LabelSelector{MatchLabels:map[string]string{"app.kubernetes.io/name":"kube-state-metrics"}, MatchExpressions:[]v1.LabelSelectorRequirement(nil)}: field is immutable + + ## Configuration The following tables list the configurable parameters of the prometheus-operator chart and their default values. diff --git a/stable/prometheus-operator/requirements.lock b/stable/prometheus-operator/requirements.lock index 2660de2359..00d2b85adb 100644 --- a/stable/prometheus-operator/requirements.lock +++ b/stable/prometheus-operator/requirements.lock @@ -1,12 +1,12 @@ dependencies: - name: kube-state-metrics repository: https://kubernetes-charts.storage.googleapis.com/ - version: 1.6.5 + version: 2.0.0 - name: prometheus-node-exporter repository: https://kubernetes-charts.storage.googleapis.com/ version: 1.5.1 - name: grafana repository: https://kubernetes-charts.storage.googleapis.com/ - version: 3.5.10 -digest: sha256:a3d1b543bd95ccc050bec80481dc4ab231d8c8e9febda173654c462ab9105b48 -generated: "2019-07-10T09:21:49.560501-07:00" + version: 3.5.11 +digest: sha256:f1b0b94a4f7a5f58dbb6f13007f9d3379a6f7cdd320b4ebdaf8c85da96b0b955 +generated: 2019-07-17T08:11:31.394436052-03:00 diff --git a/stable/prometheus-operator/requirements.yaml b/stable/prometheus-operator/requirements.yaml index 8640db23a2..98201ff42d 100644 --- a/stable/prometheus-operator/requirements.yaml +++ b/stable/prometheus-operator/requirements.yaml @@ -1,7 +1,7 @@ dependencies: - name: kube-state-metrics - version: 1.6.* + version: 2.0.* repository: https://kubernetes-charts.storage.googleapis.com/ condition: kubeStateMetrics.enabled diff --git a/stable/prometheus-operator/templates/exporters/kube-state-metrics/serviceMonitor.yaml b/stable/prometheus-operator/templates/exporters/kube-state-metrics/serviceMonitor.yaml index 04d8dcaf3e..e8399a5ef2 100644 --- a/stable/prometheus-operator/templates/exporters/kube-state-metrics/serviceMonitor.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-state-metrics/serviceMonitor.yaml @@ -7,7 +7,7 @@ metadata: app: {{ template "prometheus-operator.name" . }}-kube-state-metrics {{ include "prometheus-operator.labels" . | indent 4 }} spec: - jobLabel: app + jobLabel: app.kubernetes.io/name endpoints: - port: http {{- if .Values.kubeStateMetrics.serviceMonitor.interval }} @@ -24,6 +24,6 @@ spec: {{- end }} selector: matchLabels: - app: kube-state-metrics - release: "{{ .Release.Name }}" + app.kubernetes.io/name: kube-state-metrics + app.kubernetes.io/instance: "{{ .Release.Name }}" {{- end }}