From 57730b757ec526ebeb847f71866e538550a3a450 Mon Sep 17 00:00:00 2001
From: paulfantom <pawel@krupa.net.pl>
Date: Mon, 22 Feb 2021 16:36:39 +0100
Subject: [PATCH] jsonnet/kube-prometheus/platforms: adapt platform addons to
 use new k8s-control-plane component

---
 jsonnet/kube-prometheus/platforms/aws.libsonnet          | 2 +-
 jsonnet/kube-prometheus/platforms/bootkube.libsonnet     | 2 +-
 jsonnet/kube-prometheus/platforms/eks.libsonnet          | 2 +-
 jsonnet/kube-prometheus/platforms/gke.libsonnet          | 4 ++--
 jsonnet/kube-prometheus/platforms/kops-coredns.libsonnet | 2 +-
 jsonnet/kube-prometheus/platforms/kops.libsonnet         | 2 +-
 jsonnet/kube-prometheus/platforms/kubeadm.libsonnet      | 2 +-
 jsonnet/kube-prometheus/platforms/kubespray.libsonnet    | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jsonnet/kube-prometheus/platforms/aws.libsonnet b/jsonnet/kube-prometheus/platforms/aws.libsonnet
index 04d67d00..27a61c2b 100644
--- a/jsonnet/kube-prometheus/platforms/aws.libsonnet
+++ b/jsonnet/kube-prometheus/platforms/aws.libsonnet
@@ -14,7 +14,7 @@ local service(name, namespace, labels, selector, ports) = {
 };
 
 {
-  prometheus+: {
+  kubernetesControlPlane+: {
     kubeControllerManagerPrometheusDiscoveryService: service(
       'kube-controller-manager-prometheus-discovery',
       'kube-system',
diff --git a/jsonnet/kube-prometheus/platforms/bootkube.libsonnet b/jsonnet/kube-prometheus/platforms/bootkube.libsonnet
index 8e73509d..e4651ae9 100644
--- a/jsonnet/kube-prometheus/platforms/bootkube.libsonnet
+++ b/jsonnet/kube-prometheus/platforms/bootkube.libsonnet
@@ -14,7 +14,7 @@ local service(name, namespace, labels, selector, ports) = {
 };
 
 {
-  prometheus+:: {
+  kubernetesControlPlane+: {
     kubeControllerManagerPrometheusDiscoveryService: service(
       'kube-controller-manager-prometheus-discovery',
       'kube-system',
diff --git a/jsonnet/kube-prometheus/platforms/eks.libsonnet b/jsonnet/kube-prometheus/platforms/eks.libsonnet
index c72e5c8b..815c1234 100644
--- a/jsonnet/kube-prometheus/platforms/eks.libsonnet
+++ b/jsonnet/kube-prometheus/platforms/eks.libsonnet
@@ -5,7 +5,7 @@
       minimumAvailableIPsTime: '10m',
     },
   },
-  prometheus+: {
+  kubernetesControlPlane+: {
     serviceMonitorCoreDNS+: {
       spec+: {
         endpoints: [
diff --git a/jsonnet/kube-prometheus/platforms/gke.libsonnet b/jsonnet/kube-prometheus/platforms/gke.libsonnet
index b8b83c28..973eeffb 100644
--- a/jsonnet/kube-prometheus/platforms/gke.libsonnet
+++ b/jsonnet/kube-prometheus/platforms/gke.libsonnet
@@ -1,6 +1,6 @@
 (import '../addons/managed-cluster.libsonnet') + {
-  _config+:: {
-    prometheusAdapter+:: {
+  values+:: {
+    prometheusAdapter+: {
       config+: {
         resourceRules:: null,
       },
diff --git a/jsonnet/kube-prometheus/platforms/kops-coredns.libsonnet b/jsonnet/kube-prometheus/platforms/kops-coredns.libsonnet
index 749e937c..b9688173 100644
--- a/jsonnet/kube-prometheus/platforms/kops-coredns.libsonnet
+++ b/jsonnet/kube-prometheus/platforms/kops-coredns.libsonnet
@@ -1,5 +1,5 @@
 {
-  prometheus+:: {
+  kubernetesControlPlane+: {
     kubeDnsPrometheusDiscoveryService: {
       apiVersion: 'v1',
       kind: 'Service',
diff --git a/jsonnet/kube-prometheus/platforms/kops.libsonnet b/jsonnet/kube-prometheus/platforms/kops.libsonnet
index 54be338e..914ffb02 100644
--- a/jsonnet/kube-prometheus/platforms/kops.libsonnet
+++ b/jsonnet/kube-prometheus/platforms/kops.libsonnet
@@ -14,7 +14,7 @@ local service(name, namespace, labels, selector, ports) = {
 };
 
 {
-  prometheus+:: {
+  kubernetesControlPlane+: {
     kubeControllerManagerPrometheusDiscoveryService: service(
       'kube-controller-manager-prometheus-discovery',
       'kube-system',
diff --git a/jsonnet/kube-prometheus/platforms/kubeadm.libsonnet b/jsonnet/kube-prometheus/platforms/kubeadm.libsonnet
index 3621c2aa..dec785d9 100644
--- a/jsonnet/kube-prometheus/platforms/kubeadm.libsonnet
+++ b/jsonnet/kube-prometheus/platforms/kubeadm.libsonnet
@@ -14,7 +14,7 @@ local service(name, namespace, labels, selector, ports) = {
 };
 
 {
-  prometheus+: {
+  kubernetesControlPlane+: {
     kubeControllerManagerPrometheusDiscoveryService: service(
       'kube-controller-manager-prometheus-discovery',
       'kube-system',
diff --git a/jsonnet/kube-prometheus/platforms/kubespray.libsonnet b/jsonnet/kube-prometheus/platforms/kubespray.libsonnet
index f34cab67..3b35e8e1 100644
--- a/jsonnet/kube-prometheus/platforms/kubespray.libsonnet
+++ b/jsonnet/kube-prometheus/platforms/kubespray.libsonnet
@@ -15,7 +15,7 @@ local service(name, namespace, labels, selector, ports) = {
 
 {
 
-  prometheus+: {
+  kubernetesControlPlane+: {
     kubeControllerManagerPrometheusDiscoveryService: service(
       'kube-controller-manager-prometheus-discovery',
       'kube-system',
-- 
GitLab