Merge branch 'master' into current_addons_table

mesosphere · Mar 7, 2021 · 35d25c5 · 35d25c5
2 parents 86df1a0 + 9b02274
commit 35d25c5
Showing 1 changed file with 1 addition and 13 deletions.
diff --git 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,24 +52,12 @@ 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
-        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