From 8603800f65fbedecb5f1922e897e3fc994ccaf6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Nu=C3=B1ez-Cacho?= Date: Tue, 28 May 2019 18:32:37 +0200 Subject: [PATCH 1/2] Add annotations for Prometheus service discovery --- cluster/addons/dns/kube-dns/kube-dns.yaml.base | 3 +++ cluster/addons/dns/kube-dns/kube-dns.yaml.in | 3 +++ cluster/addons/dns/kube-dns/kube-dns.yaml.sed | 3 +++ 3 files changed, 9 insertions(+) diff --git a/cluster/addons/dns/kube-dns/kube-dns.yaml.base b/cluster/addons/dns/kube-dns/kube-dns.yaml.base index cb70ab2c80a..6e33db3fa54 100644 --- a/cluster/addons/dns/kube-dns/kube-dns.yaml.base +++ b/cluster/addons/dns/kube-dns/kube-dns.yaml.base @@ -84,6 +84,9 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' seccomp.security.alpha.kubernetes.io/pod: 'docker/default' + prometheus.io/path: /metrics + prometheus.io/port: "10054" + prometheus.io/scrape: "true" spec: priorityClassName: system-cluster-critical securityContext: diff --git a/cluster/addons/dns/kube-dns/kube-dns.yaml.in b/cluster/addons/dns/kube-dns/kube-dns.yaml.in index 48a70e7ecb2..aaf69652d6a 100644 --- a/cluster/addons/dns/kube-dns/kube-dns.yaml.in +++ b/cluster/addons/dns/kube-dns/kube-dns.yaml.in @@ -84,6 +84,9 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' seccomp.security.alpha.kubernetes.io/pod: 'docker/default' + prometheus.io/path: /metrics + prometheus.io/port: "10054" + prometheus.io/scrape: "true" spec: priorityClassName: system-cluster-critical securityContext: diff --git a/cluster/addons/dns/kube-dns/kube-dns.yaml.sed b/cluster/addons/dns/kube-dns/kube-dns.yaml.sed index 85cd7a19f91..a2d1685b6fb 100644 --- a/cluster/addons/dns/kube-dns/kube-dns.yaml.sed +++ b/cluster/addons/dns/kube-dns/kube-dns.yaml.sed @@ -84,6 +84,9 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' seccomp.security.alpha.kubernetes.io/pod: 'docker/default' + prometheus.io/path: /metrics + prometheus.io/port: "10054" + prometheus.io/scrape: "true" spec: priorityClassName: system-cluster-critical securityContext: From fe53ed8ca9eaabd48456550d8626dcc44df26f78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Nu=C3=B1ez-Cacho?= Date: Tue, 28 May 2019 23:45:34 +0200 Subject: [PATCH 2/2] metrics is default value. Not necessary. --- cluster/addons/dns/kube-dns/kube-dns.yaml.base | 1 - cluster/addons/dns/kube-dns/kube-dns.yaml.in | 1 - cluster/addons/dns/kube-dns/kube-dns.yaml.sed | 1 - 3 files changed, 3 deletions(-) diff --git a/cluster/addons/dns/kube-dns/kube-dns.yaml.base b/cluster/addons/dns/kube-dns/kube-dns.yaml.base index 6e33db3fa54..cd8abb1a82f 100644 --- a/cluster/addons/dns/kube-dns/kube-dns.yaml.base +++ b/cluster/addons/dns/kube-dns/kube-dns.yaml.base @@ -84,7 +84,6 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' seccomp.security.alpha.kubernetes.io/pod: 'docker/default' - prometheus.io/path: /metrics prometheus.io/port: "10054" prometheus.io/scrape: "true" spec: diff --git a/cluster/addons/dns/kube-dns/kube-dns.yaml.in b/cluster/addons/dns/kube-dns/kube-dns.yaml.in index aaf69652d6a..f4160658aaa 100644 --- a/cluster/addons/dns/kube-dns/kube-dns.yaml.in +++ b/cluster/addons/dns/kube-dns/kube-dns.yaml.in @@ -84,7 +84,6 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' seccomp.security.alpha.kubernetes.io/pod: 'docker/default' - prometheus.io/path: /metrics prometheus.io/port: "10054" prometheus.io/scrape: "true" spec: diff --git a/cluster/addons/dns/kube-dns/kube-dns.yaml.sed b/cluster/addons/dns/kube-dns/kube-dns.yaml.sed index a2d1685b6fb..2e397d29175 100644 --- a/cluster/addons/dns/kube-dns/kube-dns.yaml.sed +++ b/cluster/addons/dns/kube-dns/kube-dns.yaml.sed @@ -84,7 +84,6 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' seccomp.security.alpha.kubernetes.io/pod: 'docker/default' - prometheus.io/path: /metrics prometheus.io/port: "10054" prometheus.io/scrape: "true" spec: