Merge pull request #216 from aveyrenc/kubespray-coredns

Kubespray deploys CoreDNS with label k8s-app=kube-dns
This commit is contained in:
Frederic Branczyk
2019-09-09 14:28:17 +02:00
committed by GitHub

View File

@@ -4,12 +4,6 @@ local servicePort = k.core.v1.service.mixin.spec.portsType;
{ {
_config+:: {
jobs+: {
CoreDNS: 'job="coredns"',
},
},
prometheus+: { prometheus+: {
kubeControllerManagerPrometheusDiscoveryService: kubeControllerManagerPrometheusDiscoveryService:
service.new('kube-controller-manager-prometheus-discovery', { 'component': 'kube-controller-manager' }, servicePort.newNamed('http-metrics', 10252, 10252)) + 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.metadata.withLabels({ 'k8s-app': 'kube-scheduler' }) +
service.mixin.spec.withClusterIp('None'), service.mixin.spec.withClusterIp('None'),
serviceMonitorCoreDNS+: {
spec+: {
selector: {
matchLabels: {
'k8s-app': 'coredns',
},
},
},
},
serviceMonitorKubeScheduler+: { serviceMonitorKubeScheduler+: {
spec+: { spec+: {
selector+: { selector+: {