mirrors/kube-prometheus
1
0
Fork 0
mirror of https://github.com/prometheus-operator/kube-prometheus.git synced 2025-10-29 15:11:02 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1135 from paulfantom/use-common

Browse Source
This commit is contained in:
Paweł Krupa 2021-05-31 23:12:53 +02:00 committed by GitHub
commit dccf2ee085
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -376,7 +376,7 @@ These mixins are selectable via the `platform` field of kubePrometheus:
(import 'kube-prometheus/main.libsonnet') + (import 'kube-prometheus/main.libsonnet') +
{ {
values+:: { values+:: {
kubePrometheus+: { common+: {
platform: 'example-platform', platform: 'example-platform',
}, },
}, },

2
examples/jsonnet-snippets/platform.jsonnet
View File

@ -1,7 +1,7 @@
(import 'kube-prometheus/main.libsonnet') + (import 'kube-prometheus/main.libsonnet') +
{ {
values+:: { values+:: {
kubePrometheus+: { common+: {
platform: 'example-platform', platform: 'example-platform',
}, },
}, },

18
jsonnet/kube-prometheus/main.libsonnet
View File

@ -16,6 +16,7 @@ local platformPatch = import './platforms/platforms.libsonnet';
values:: { values:: {
common: { common: {
namespace: 'default', namespace: 'default',
platform: null,
ruleLabels: { ruleLabels: {
role: 'alert-rules', role: 'alert-rules',
prometheus: $.values.prometheus.name, prometheus: $.values.prometheus.name,
@ -102,9 +103,6 @@ local platformPatch = import './platforms/platforms.libsonnet';
version: $.values.common.versions.prometheusOperator, version: $.values.common.versions.prometheusOperator,
image: $.values.common.images.prometheusOperator, image: $.values.common.images.prometheusOperator,
configReloaderImage: $.values.common.images.prometheusOperatorReloader, configReloaderImage: $.values.common.images.prometheusOperatorReloader,
commonLabels+: {
'app.kubernetes.io/part-of': 'kube-prometheus',
},
mixin+: { ruleLabels: $.values.common.ruleLabels }, mixin+: { ruleLabels: $.values.common.ruleLabels },
kubeRbacProxyImage: $.values.common.images.kubeRbacProxy, kubeRbacProxyImage: $.values.common.images.kubeRbacProxy,
}, },
@ -112,11 +110,6 @@ local platformPatch = import './platforms/platforms.libsonnet';
namespace: $.values.common.namespace, namespace: $.values.common.namespace,
mixin+: { ruleLabels: $.values.common.ruleLabels }, mixin+: { ruleLabels: $.values.common.ruleLabels },
}, },
kubePrometheus: {
namespace: $.values.common.namespace,
mixin+: { ruleLabels: $.values.common.ruleLabels },
platform: null,
},
}, },
alertmanager: alertmanager($.values.alertmanager), alertmanager: alertmanager($.values.alertmanager),
@ -128,12 +121,17 @@ local platformPatch = import './platforms/platforms.libsonnet';
prometheusAdapter: prometheusAdapter($.values.prometheusAdapter), prometheusAdapter: prometheusAdapter($.values.prometheusAdapter),
prometheusOperator: prometheusOperator($.values.prometheusOperator), prometheusOperator: prometheusOperator($.values.prometheusOperator),
kubernetesControlPlane: kubernetesControlPlane($.values.kubernetesControlPlane), kubernetesControlPlane: kubernetesControlPlane($.values.kubernetesControlPlane),
kubePrometheus: customMixin($.values.kubePrometheus) + { kubePrometheus: customMixin(
{
namespace: $.values.common.namespace,
mixin+: { ruleLabels: $.values.common.ruleLabels },
}
) + {
namespace: { namespace: {
apiVersion: 'v1', apiVersion: 'v1',
kind: 'Namespace', kind: 'Namespace',
metadata: { metadata: {
name: $.values.kubePrometheus.namespace, name: $.values.common.namespace,
}, },
}, },
}, },

2
jsonnet/kube-prometheus/platforms/platforms.libsonnet
View File

@ -26,7 +26,7 @@ local platformPatch(p) = if p != null && std.objectHas(platforms, p) then platfo
prometheusOperator: {}, prometheusOperator: {},
kubernetesControlPlane: {}, kubernetesControlPlane: {},
kubePrometheus: {}, kubePrometheus: {},
} + platformPatch($.values.kubePrometheus.platform), } + platformPatch($.values.common.platform),
alertmanager+: p.alertmanager, alertmanager+: p.alertmanager,
blackboxExporter+: p.blackboxExporter, blackboxExporter+: p.blackboxExporter,