kube-prometheus: Adjust to new Prometheus rule file CRD
89fc4e306972604eba2dcb961a6d29cc27a668ad introduced the new Prometheus rule file custom resource definition. This patch adjusts the kube-prometheus project to use the new custom resource definition.
This commit is contained in:
@@ -7,7 +7,6 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
|
||||
versions+:: {
|
||||
prometheusOperator: 'v0.19.0',
|
||||
configmapReloader: 'v0.0.1',
|
||||
prometheusConfigReloader: 'v0.0.4',
|
||||
},
|
||||
|
||||
imageRepos+:: {
|
||||
@@ -52,6 +51,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
|
||||
'prometheuses/finalizers',
|
||||
'alertmanagers/finalizers',
|
||||
'servicemonitors',
|
||||
'rulefiles',
|
||||
]) +
|
||||
policyRule.withVerbs(['*']);
|
||||
|
||||
@@ -119,7 +119,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
|
||||
container.withArgs([
|
||||
'--kubelet-service=kube-system/kubelet',
|
||||
'--config-reloader-image=' + $._config.imageRepos.configmapReloader + ':' + $._config.versions.configmapReloader,
|
||||
'--prometheus-config-reloader=' + $._config.imageRepos.prometheusConfigReloader + ':' + $._config.versions.prometheusConfigReloader,
|
||||
'--prometheus-config-reloader=' + $._config.imageRepos.prometheusConfigReloader + ':' + $._config.versions.prometheusOperator,
|
||||
]) +
|
||||
container.mixin.resources.withRequests({ cpu: '100m', memory: '50Mi' }) +
|
||||
container.mixin.resources.withLimits({ cpu: '200m', memory: '100Mi' });
|
||||
|
||||
@@ -40,11 +40,21 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
|
||||
service.mixin.metadata.withNamespace($._config.namespace) +
|
||||
service.mixin.metadata.withLabels({ prometheus: $._config.prometheus.name }),
|
||||
rules:
|
||||
local configMap = k.core.v1.configMap;
|
||||
|
||||
configMap.new('prometheus-' + $._config.prometheus.name + '-rules', ({ 'all.rules.yaml': std.manifestYamlDoc($._config.prometheus.rules) } + $._config.prometheus.renderedRules)) +
|
||||
configMap.mixin.metadata.withLabels({ role: 'alert-rules', prometheus: $._config.prometheus.name }) +
|
||||
configMap.mixin.metadata.withNamespace($._config.namespace),
|
||||
{
|
||||
apiVersion: 'monitoring.coreos.com/v1',
|
||||
kind: 'RuleFile',
|
||||
metadata: {
|
||||
labels: {
|
||||
prometheus: $._config.prometheus.name,
|
||||
role: 'alert-rules',
|
||||
},
|
||||
name: 'prometheus-' + $._config.prometheus.name + '-rules',
|
||||
namespace: $._config.namespace,
|
||||
},
|
||||
spec: {
|
||||
groups: $._config.prometheus.rules.groups,
|
||||
},
|
||||
},
|
||||
roleBindingDefault:
|
||||
local roleBinding = k.rbac.v1.roleBinding;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user