Merge pull request #1189 from dmcnaught/release-0.8
Fix for bug #1163 #1164 merged to release-0.8
This commit is contained in:
@@ -18,22 +18,22 @@ local service(name, namespace, labels, selector, ports) = {
|
||||
kubeControllerManagerPrometheusDiscoveryService: service(
|
||||
'kube-controller-manager-prometheus-discovery',
|
||||
'kube-system',
|
||||
{ 'app.kubernetes.io/name': 'kube-controller-manager' },
|
||||
{ 'app.kubernetes.io/name': 'kube-controller-manager' },
|
||||
{ 'k8s-app': 'kube-controller-manager', 'app.kubernetes.io/name': 'kube-controller-manager' },
|
||||
{ 'k8s-app': 'kube-controller-manager' },
|
||||
[{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
|
||||
),
|
||||
kubeSchedulerPrometheusDiscoveryService: service(
|
||||
'kube-scheduler-prometheus-discovery',
|
||||
'kube-system',
|
||||
{ 'app.kubernetes.io/name': 'kube-scheduler' },
|
||||
{ 'app.kubernetes.io/name': 'kube-scheduler' },
|
||||
{ 'k8s-app': 'kube-controller-manager', 'app.kubernetes.io/name': 'kube-scheduler' },
|
||||
{ 'k8s-app': 'kube-scheduler' },
|
||||
[{ name: 'https-metrics', port: 10259, targetPort: 10259 }]
|
||||
),
|
||||
kubeDnsPrometheusDiscoveryService: service(
|
||||
'kube-dns-prometheus-discovery',
|
||||
'kube-system',
|
||||
{ 'app.kubernetes.io/name': 'kube-dns' },
|
||||
{ 'app.kubernetes.io/name': 'kube-dns' },
|
||||
{ 'k8s-app': 'kube-controller-manager', 'app.kubernetes.io/name': 'kube-dns' },
|
||||
{ 'k8s-app': 'kube-dns' },
|
||||
[{ name: 'metrics', port: 10055, targetPort: 10055 }, { name: 'http-metrics-dnsmasq', port: 10054, targetPort: 10054 }]
|
||||
),
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user