From 81038c7f3c70ff61ea6184635a5e94d346325002 Mon Sep 17 00:00:00 2001 From: Alexandre Veyrenc <alexandre.veyrenc@orange.com> Date: Mon, 9 Sep 2019 11:39:00 +0200 Subject: [PATCH] Kubespray deploys CoreDNS with label k8s-app=kube-dns --- .../kube-prometheus-kubespray.libsonnet | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet index 4cfde11e..6ef1a34e 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet @@ -4,12 +4,6 @@ local servicePort = k.core.v1.service.mixin.spec.portsType; { - _config+:: { - jobs+: { - CoreDNS: 'job="coredns"', - }, - }, - prometheus+: { kubeControllerManagerPrometheusDiscoveryService: service.new('kube-controller-manager-prometheus-discovery', { 'component': 'kube-controller-manager' }, servicePort.newNamed('http-metrics', 10252, 10252)) + @@ -22,16 +16,6 @@ local servicePort = k.core.v1.service.mixin.spec.portsType; service.mixin.metadata.withLabels({ 'k8s-app': 'kube-scheduler' }) + service.mixin.spec.withClusterIp('None'), - serviceMonitorCoreDNS+: { - spec+: { - selector: { - matchLabels: { - 'k8s-app': 'coredns', - }, - }, - }, - }, - serviceMonitorKubeScheduler+: { spec+: { selector+: { -- GitLab