From 12cd7fd9ce297866efc8189e99f1d41fd868cb8a Mon Sep 17 00:00:00 2001
From: Dimitrije Manic <dmanic@gobonfire.com>
Date: Wed, 11 Aug 2021 10:05:00 -0400
Subject: [PATCH] Prometheus ruleSelector defaults to all rules
---
jsonnet/kube-prometheus/components/prometheus.libsonnet | 9 ++-------
manifests/prometheus-prometheus.yaml | 5 +----
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/jsonnet/kube-prometheus/components/prometheus.libsonnet b/jsonnet/kube-prometheus/components/prometheus.libsonnet
index 9a629389..a44e5729 100644
--- a/jsonnet/kube-prometheus/components/prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/components/prometheus.libsonnet
@@ -24,14 +24,9 @@ local defaults = {
for labelName in std.objectFields(defaults.commonLabels)
if !std.setMember(labelName, ['app.kubernetes.io/version'])
} + { prometheus: defaults.name },
- ruleSelector: {
- matchLabels: defaults.mixin.ruleLabels,
- },
+ ruleSelector: {},
mixin: {
- ruleLabels: {
- role: 'alert-rules',
- prometheus: defaults.name,
- },
+ ruleLabels: {},
_config: {
prometheusSelector: 'job="prometheus-' + defaults.name + '",namespace="' + defaults.namespace + '"',
prometheusName: '{{$labels.namespace}}/{{$labels.pod}}',
diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml
index 087a7aa2..e41383e9 100644
--- a/manifests/prometheus-prometheus.yaml
+++ b/manifests/prometheus-prometheus.yaml
@@ -36,10 +36,7 @@ spec:
requests:
memory: 400Mi
ruleNamespaceSelector: {}
- ruleSelector:
- matchLabels:
- prometheus: k8s
- role: alert-rules
+ ruleSelector: {}
securityContext:
fsGroup: 2000
runAsNonRoot: true
--
GitLab