From c88795bb3bb8211119b2d296e99195372b69ceb0 Mon Sep 17 00:00:00 2001 From: Grace Do Date: Wed, 3 Mar 2021 11:01:49 -0800 Subject: [PATCH 1/2] fix: Ensure etcd rules are enabled --- addons/prometheus/prometheus.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/addons/prometheus/prometheus.yaml b/addons/prometheus/prometheus.yaml index 6e56a36f..7137e2c8 100644 --- a/addons/prometheus/prometheus.yaml +++ b/addons/prometheus/prometheus.yaml @@ -9,7 +9,7 @@ metadata: # on the cluster, this hack will trigger re-queue on Addons until one exists. kubeaddons.mesosphere.io/hack-requires-defaultstorageclass: "true" annotations: - catalog.kubeaddons.mesosphere.io/addon-revision: "0.44.0-6" + catalog.kubeaddons.mesosphere.io/addon-revision: "0.44.0-7" appversion.kubeaddons.mesosphere.io/prometheus-operator: "0.44.0" appversion.kubeaddons.mesosphere.io/prometheus: "2.22.1" appversion.kubeaddons.mesosphere.io/alertmanager: "0.21.0" @@ -52,13 +52,9 @@ spec: "grafana.ingress.annotations.traefik\\.ingress\\.kubernetes\\.io/auth-url": "ingress.auth.auth-url" values: | --- - defaultRules: - rules: - etcd: false mesosphereResources: create: true rules: - etcd: true # addon alert rules are defaulted to false to prevent potential misfires if addons # are disabled. velero: false From b61206cfc0531b54c676d7bdc74e1df5afbbe89d Mon Sep 17 00:00:00 2001 From: Grace Do Date: Wed, 3 Mar 2021 11:41:36 -0800 Subject: [PATCH 2/2] chore: Remove dupe configs defaulted in chart --- addons/prometheus/prometheus.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/addons/prometheus/prometheus.yaml b/addons/prometheus/prometheus.yaml index 7137e2c8..c6d9cb10 100644 --- a/addons/prometheus/prometheus.yaml +++ b/addons/prometheus/prometheus.yaml @@ -58,14 +58,6 @@ spec: # addon alert rules are defaulted to false to prevent potential misfires if addons # are disabled. velero: false - homeDashboard: - cronJob: - image: apteno/alpine-jq:2021-01-19 - hooks: - grafana: - image: apteno/alpine-jq:2021-01-19 - prometheus: - kubectlImage: bitnami/kubectl:1.19.7 prometheus: ingress: enabled: true