From 799715fb7ef7a19f02b756a74db36e26dbbe1295 Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 7 Mar 2024 14:07:23 +0100 Subject: [PATCH] prometheus-server,thanos: don't set linkerd_enabled (#6120) --- common/prometheus-server/Chart.yaml | 2 +- common/prometheus-server/values.yaml | 1 - common/thanos/Chart.yaml | 2 +- common/thanos/values.yaml | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/common/prometheus-server/Chart.yaml b/common/prometheus-server/Chart.yaml index 7b37961d63..830b442b3f 100644 --- a/common/prometheus-server/Chart.yaml +++ b/common/prometheus-server/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: Prometheus via operator. name: prometheus-server -version: 7.5.1 +version: 7.5.2 appVersion: v2.47.2 icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png maintainers: diff --git a/common/prometheus-server/values.yaml b/common/prometheus-server/values.yaml index 85dc781bce..9af1aed498 100644 --- a/common/prometheus-server/values.yaml +++ b/common/prometheus-server/values.yaml @@ -20,7 +20,6 @@ global: # targets: linkerd_requested: false - linkerd_enabled: false # The image for the Prometheus server. The tag equals the .Chart.appVersion. image: diff --git a/common/thanos/Chart.yaml b/common/thanos/Chart.yaml index 35ada75655..8682faaae5 100644 --- a/common/thanos/Chart.yaml +++ b/common/thanos/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: thanos description: Deploy Thanos via operator type: application -version: 0.9.3 +version: 0.9.4 appVersion: v0.33.0 maintainers: - name: Tommy Sauer (viennaa) diff --git a/common/thanos/values.yaml b/common/thanos/values.yaml index 489bbf0acb..d367bce633 100644 --- a/common/thanos/values.yaml +++ b/common/thanos/values.yaml @@ -18,7 +18,6 @@ global: # tier: k8s linkerd_requested: false - linkerd_enabled: false # allows to disable Thanos for specific regions enabled: true