From 3bcc64f3518d60c749bd021990313a3eed3399b0 Mon Sep 17 00:00:00 2001 From: Vasily Sliouniaev Date: Mon, 28 Jan 2019 09:35:46 +0000 Subject: [PATCH] [stable/prometheus-operator] Upgrade prometheus and prometheus-operator (#10931) * Fix typo Signed-off-by: Vasily * Use prometheus 2.6.1 and prometheus-operator 2.7 Bumping version of chart to 2.0.0 to indicate a change in the way the operator stateful sets behave as described here https://github.com/coreos/prometheus-operator/issues/2339 Prometheus 2.6.x has some very positive changes to startup time that are particularly advantageous when using PVs and running large instances Signed-off-by: Vasily --- stable/prometheus-operator/Chart.yaml | 2 +- stable/prometheus-operator/ci/test-values.yaml | 18 ++++++++++++------ .../templates/alertmanager/alertmanager.yaml | 4 ++-- stable/prometheus-operator/values.yaml | 9 +++------ 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 8f03ae559a..6a8a1696d1 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -9,7 +9,7 @@ name: prometheus-operator sources: - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 1.9.0 +version: 2.0.0 appVersion: 0.26.0 home: https://github.com/coreos/prometheus-operator keywords: diff --git a/stable/prometheus-operator/ci/test-values.yaml b/stable/prometheus-operator/ci/test-values.yaml index 02ee6f0a78..c379fd041f 100644 --- a/stable/prometheus-operator/ci/test-values.yaml +++ b/stable/prometheus-operator/ci/test-values.yaml @@ -324,6 +324,13 @@ grafana: enabled: true label: grafana_datasource + extraConfigmapMounts: [] + # - name: certs-configmap + # mountPath: /etc/grafana/ssl/ + # configMap: certs-configmap + # readOnly: true + + ## Component scraping the kube api server ## kubeApiServer: @@ -457,6 +464,8 @@ kubeStateMetrics: kube-state-metrics: rbac: create: true + podSecurityPolicy: + enabled: true ## Deploy node exporter as a daemonset to all nodes ## @@ -594,7 +603,7 @@ prometheusOperator: ## image: repository: quay.io/coreos/prometheus-operator - tag: v0.26.0 + tag: v0.27.0 pullPolicy: IfNotPresent ## Configmap-reload image to use for reloading configmaps @@ -607,7 +616,7 @@ prometheusOperator: ## prometheusConfigReloaderImage: repository: quay.io/coreos/prometheus-config-reloader - tag: v0.26.0 + tag: v0.27.0 ## Hyperkube image to use when cleaning up ## @@ -715,10 +724,7 @@ prometheus: ## image: repository: quay.io/prometheus/prometheus - tag: v2.5.0 - - # repository: quay.io/coreos/prometheus - # tag: v2.5.0 + tag: v2.6.1 ## Tolerations for use with node taints ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ diff --git a/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml b/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml index 8a78d43442..24f93847e1 100644 --- a/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml +++ b/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml @@ -62,7 +62,7 @@ spec: affinity: podAntiAffinity: requiredDuringSchedulingIgnoredDuringExecution: - - topologyKey: {{ .Values.prometheus.alertmanagerSpec.podAntiAffinityTopologyKey }} + - topologyKey: {{ .Values.alertmanager.alertmanagerSpec.podAntiAffinityTopologyKey }} labelSelector: matchLabels: app: alertmanager @@ -73,7 +73,7 @@ spec: preferredDuringSchedulingIgnoredDuringExecution: - weight: 100 podAffinityTerm: - topologyKey: {{ .Values.prometheus.alertmanagerSpec.podAntiAffinityTopologyKey }} + topologyKey: {{ .Values.alertmanager.alertmanagerSpec.podAntiAffinityTopologyKey }} labelSelector: matchLabels: app: alertmanager diff --git a/stable/prometheus-operator/values.yaml b/stable/prometheus-operator/values.yaml index 556ce57663..2f636c5ff6 100644 --- a/stable/prometheus-operator/values.yaml +++ b/stable/prometheus-operator/values.yaml @@ -603,7 +603,7 @@ prometheusOperator: ## image: repository: quay.io/coreos/prometheus-operator - tag: v0.26.0 + tag: v0.27.0 pullPolicy: IfNotPresent ## Configmap-reload image to use for reloading configmaps @@ -616,7 +616,7 @@ prometheusOperator: ## prometheusConfigReloaderImage: repository: quay.io/coreos/prometheus-config-reloader - tag: v0.26.0 + tag: v0.27.0 ## Hyperkube image to use when cleaning up ## @@ -724,10 +724,7 @@ prometheus: ## image: repository: quay.io/prometheus/prometheus - tag: v2.5.0 - - # repository: quay.io/coreos/prometheus - # tag: v2.5.0 + tag: v2.6.1 ## Tolerations for use with node taints ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/