adding-files-with-cherrypick-conflicts

d2iq-archive · Feb 4, 2022 · 7c3e5a3 · 7c3e5a3
1 parent 4644957
commit 7c3e5a3
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/addons/prometheus/prometheus.yaml b/addons/prometheus/prometheus.yaml
@@ -9,7 +9,11 @@ metadata:
     # on the cluster, this hack will trigger re-queue on Addons until one exists.
     kubeaddons.mesosphere.io/hack-requires-defaultstorageclass: "true"
   annotations:
+<<<<<<< HEAD
     catalog.kubeaddons.mesosphere.io/addon-revision: "0.47.0-6"
+=======
+    catalog.kubeaddons.mesosphere.io/addon-revision: "0.47.0-8"
+>>>>>>> 728f462... chore: Bump prometheus to 15.4.11
     appversion.kubeaddons.mesosphere.io/prometheus-operator: "0.47.0"
     appversion.kubeaddons.mesosphere.io/prometheus: "2.29.2"
     appversion.kubeaddons.mesosphere.io/alertmanager: "0.21.0"
@@ -20,7 +24,11 @@ metadata:
     docs.kubeaddons.mesosphere.io/prometheus: "https://prometheus.io/docs/introduction/overview/"
     docs.kubeaddons.mesosphere.io/grafana: "https://grafana.com/docs/"
     docs.kubeaddons.mesosphere.io/alertmanager: "https://prometheus.io/docs/alerting/alertmanager/"
+<<<<<<< HEAD
     values.chart.helm.kubeaddons.mesosphere.io/prometheus: "https://raw.githubusercontent.com/mesosphere/charts/bb83e66aefb3d13617ddf5189c3425822efaa666/staging/kube-prometheus-stack/values.yaml"
+=======
+    values.chart.helm.kubeaddons.mesosphere.io/prometheus: "https://raw.githubusercontent.com/mesosphere/charts/a3001f479f4d8837f071652db0228d715e641cc1/staging/kube-prometheus-stack/values.yaml"
+>>>>>>> 728f462... chore: Bump prometheus to 15.4.11
     # The prometheus-operator chart from prior Konvoy releases can't be upgraded to 8.10.0.
     # See https://github.com/helm/charts/issues/21200.
     # 8.8.5 was the latest version available in mesosphere/charts before it was bumped past 8.10.0.
@@ -45,7 +53,11 @@ spec:
   chartReference:
     chart: kube-prometheus-stack
     repo: https://mesosphere.github.io/charts/staging
+<<<<<<< HEAD
     version: 15.4.9
+=======
+    version: 15.4.11
+>>>>>>> 728f462... chore: Bump prometheus to 15.4.11
     valuesRemap:
       "prometheus.ingress.annotations.traefik\\.ingress\\.kubernetes\\.io/auth-url": "ingress.auth.auth-url"
       "alertmanager.ingress.annotations.traefik\\.ingress\\.kubernetes\\.io/auth-url": "ingress.auth.auth-url"