Skip to content

Commit 8ed38bd

Browse files
authored
fix(kube-monitoring) remove default ingress annotations (#1296)
1 parent 9cd5c24 commit 8ed38bd

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

kube-monitoring/charts/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ maintainers:
88
name: kube-monitoring
99
sources:
1010
- https://github.com/cloudoperators/greenhouse-extensions
11-
version: 7.1.0
11+
version: 7.2.0
1212
keywords:
1313
- operator
1414
- prometheus

kube-monitoring/charts/values.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -318,15 +318,9 @@ kubeMonitoring:
318318
# @section -- Prometheus options
319319
enabled: false
320320

321-
# By default, the alerts plugin deploys a ca-bundle to enable tls between Prometheus and Alertmanager
322-
# Move to plugindef ?
321+
# -- Prometheus Ingress Annotations
323322
# @ignored
324-
annotations:
325-
disco: "true"
326-
kubernetes.io/tls-acme: "true"
327-
nginx.ingress.kubernetes.io/auth-tls-secret: "{{ $.Release.Namespace }}/{{ $.Release.Namespace }}-ca-bundle"
328-
nginx.ingress.kubernetes.io/auth-tls-verify-client: "true"
329-
nginx.ingress.kubernetes.io/auth-tls-verify-depth: "3"
323+
annotations: {}
330324

331325
# -- Must be provided if Ingress is enabled
332326
# @section -- Prometheus options

kube-monitoring/plugindefinition.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ kind: PluginDefinition
66
metadata:
77
name: kube-monitoring
88
spec:
9-
version: 8.1.0
9+
version: 8.2.0
1010
displayName: Kubernetes monitoring
1111
description: Native deployment and management of Prometheus along with Kubernetes cluster monitoring components.
1212
docMarkDownUrl: https://raw.githubusercontent.com/cloudoperators/greenhouse-extensions/main/kube-monitoring/README.md
@@ -15,7 +15,7 @@ spec:
1515
# renovate depName=ghcr.io/cloudoperators/greenhouse-extensions/charts/kube-monitoring
1616
name: kube-monitoring
1717
repository: oci://ghcr.io/cloudoperators/greenhouse-extensions/charts
18-
version: 7.1.0
18+
version: 7.2.0
1919
options:
2020
- name: global.commonLabels
2121
description: Labels to add to all resources. This can be used to add a support group or service to all alerts.

0 commit comments

Comments
 (0)