From b5633035598e6eb3ea06584c2f1f62a690c32725 Mon Sep 17 00:00:00 2001 From: Raffael H Date: Thu, 10 Aug 2023 10:30:04 +0200 Subject: [PATCH] Resolve conflict --- charts/user-monitoring/Chart.yaml | 2 +- charts/user-monitoring/templates/user-prometheus.yaml | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/charts/user-monitoring/Chart.yaml b/charts/user-monitoring/Chart.yaml index f4f6fda..61e3464 100644 --- a/charts/user-monitoring/Chart.yaml +++ b/charts/user-monitoring/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.2 +version: 0.1.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/user-monitoring/templates/user-prometheus.yaml b/charts/user-monitoring/templates/user-prometheus.yaml index aead9f1..2887843 100644 --- a/charts/user-monitoring/templates/user-prometheus.yaml +++ b/charts/user-monitoring/templates/user-prometheus.yaml @@ -20,10 +20,6 @@ spec: resources: requests: memory: 400Mi -<<<<<<< HEAD - enableAdminAPI: false -======= enableAdminAPI: true externalLabels: monitoring: {{ .Values.user }} ->>>>>>> 2acef0e (Update prometheus config)