From 5d06e286ca0e7bbe11da1a0a81388d3e6adbfb9f Mon Sep 17 00:00:00 2001 From: paulfantom <pawel@krupa.net.pl> Date: Mon, 22 Feb 2021 16:38:07 +0100 Subject: [PATCH] examples: adapt examples to use k8s-control-plane component --- example.jsonnet | 2 +- examples/eks-cni-example.jsonnet | 2 +- examples/weave-net-example.jsonnet | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/example.jsonnet b/example.jsonnet index 2568be96..00737df1 100644 --- a/example.jsonnet +++ b/example.jsonnet @@ -29,7 +29,7 @@ local kp = { ['blackbox-exporter-' + name]: kp.blackboxExporter[name] for name in std.objectFields(kp.blackboxExporter) } + { ['grafana-' + name]: kp.grafana[name] for name in std.objectFields(kp.grafana) } + { ['kube-state-metrics-' + name]: kp.kubeStateMetrics[name] for name in std.objectFields(kp.kubeStateMetrics) } + -{ ['kubernetes-' + name]: kp.kubernetesMixin[name] for name in std.objectFields(kp.kubernetesMixin) } +{ ['kubernetes-' + name]: kp.kubernetesControlPlane[name] for name in std.objectFields(kp.kubernetesControlPlane) } { ['node-exporter-' + name]: kp.nodeExporter[name] for name in std.objectFields(kp.nodeExporter) } + { ['prometheus-' + name]: kp.prometheus[name] for name in std.objectFields(kp.prometheus) } + { ['prometheus-adapter-' + name]: kp.prometheusAdapter[name] for name in std.objectFields(kp.prometheusAdapter) } diff --git a/examples/eks-cni-example.jsonnet b/examples/eks-cni-example.jsonnet index 77fa5d0b..c92236fe 100644 --- a/examples/eks-cni-example.jsonnet +++ b/examples/eks-cni-example.jsonnet @@ -5,7 +5,7 @@ local kp = (import 'kube-prometheus/main.libsonnet') + namespace: 'monitoring', }, }, - prometheus+: { + kubernetesControlPlane+: { prometheusRuleEksCNI+: { spec+: { groups+: [ diff --git a/examples/weave-net-example.jsonnet b/examples/weave-net-example.jsonnet index a7eca242..eeeb622d 100644 --- a/examples/weave-net-example.jsonnet +++ b/examples/weave-net-example.jsonnet @@ -5,7 +5,7 @@ local kp = (import 'kube-prometheus/main.libsonnet') + namespace: 'monitoring', }, }, - prometheus+: { + kubernetesControlPlane+: { prometheusRuleWeaveNet+: { spec+: { groups: std.map( -- GitLab