jsonnet/kube-prometheus/platforms: adapt platform addons to use new k8s-control-plane component

2021-02-22 16:36:39 +01:00
parent c80a82b19a
commit 57730b757e
8 changed files with 9 additions and 9 deletions
--- 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',
--- 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',
--- 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: [
--- 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,
      },
--- 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',
--- 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',
--- 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',
--- 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',