Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prometheus-server,thanos: don't set linkerd_enabled #6120

Merged
merged 1 commit into from Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion 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:
Expand Down
1 change: 0 additions & 1 deletion common/prometheus-server/values.yaml
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion common/thanos/Chart.yaml
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion common/thanos/values.yaml
Expand Up @@ -18,7 +18,6 @@ global:
# tier: k8s

linkerd_requested: false
linkerd_enabled: false

# allows to disable Thanos for specific regions
enabled: true
Expand Down