Merge pull request #1315 from DimitrijeManic/wip/update-rule-selector

This commit is contained in:
Paweł Krupa
2021-08-11 16:27:38 +02:00
committed by GitHub
2 changed files with 3 additions and 11 deletions

View File

@@ -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}}',

View File

@@ -36,10 +36,7 @@ spec:
requests:
memory: 400Mi
ruleNamespaceSelector: {}
ruleSelector:
matchLabels:
prometheus: k8s
role: alert-rules
ruleSelector: {}
securityContext:
fsGroup: 2000
runAsNonRoot: true