Merge pull request #65589 from rajansandeep/scrapeport

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add prometheus scrape port to CoreDNS service **What this PR does / why we need it**: Add prometheus scrape port **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #https://github.com/kubernetes/kubeadm/issues/955 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #65589 from rajansandeep/scrapeport
90f681be · Kubernetes Submit Queue · GitHub · 85aa6d24 · 8798640f · 90f681be
Unverified Commit 90f681be authored Jun 29, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 29, 2018
4 changed files
--- a/cluster/addons/dns/coredns/coredns.yaml.base
+++ b/cluster/addons/dns/coredns/coredns.yaml.base
@@ -161,6 +161,7 @@ metadata:
  name: kube-dns
  namespace: kube-system
  annotations:
+    prometheus.io/port: "9153"
    prometheus.io/scrape: "true"
  labels:
    k8s-app: kube-dns

--- a/cluster/addons/dns/coredns/coredns.yaml.in
+++ b/cluster/addons/dns/coredns/coredns.yaml.in
@@ -161,6 +161,7 @@ metadata:
  name: kube-dns
  namespace: kube-system
  annotations:
+    prometheus.io/port: "9153"
    prometheus.io/scrape: "true"
  labels:
    k8s-app: kube-dns

--- a/cluster/addons/dns/coredns/coredns.yaml.sed
+++ b/cluster/addons/dns/coredns/coredns.yaml.sed
@@ -161,6 +161,7 @@ metadata:
  name: kube-dns
  namespace: kube-system
  annotations:
+    prometheus.io/port: "9153"
    prometheus.io/scrape: "true"
  labels:
    k8s-app: kube-dns

--- a/cmd/kubeadm/app/phases/addons/dns/manifests.go
+++ b/cmd/kubeadm/app/phases/addons/dns/manifests.go
@@ -189,6 +189,7 @@ metadata:
  name: kube-dns
  namespace: kube-system
  annotations:
+    prometheus.io/port: "9153"
    prometheus.io/scrape: "true"
  # Without this resourceVersion value, an update of the Service between versions will yield:
  #   Service "kube-dns" is invalid: metadata.resourceVersion: Invalid value: "": must be specified for an update