From bfb809f3c64a971b2d32dcb132fb695b9cccc9cd Mon Sep 17 00:00:00 2001
From: Sandeep Rajan <srajan@infoblox.com>
Date: Tue, 4 Jun 2019 08:53:02 -0400
Subject: [PATCH] revert coredns to 1.3.1

---
 cluster/addons/dns/coredns/coredns.yaml.base | 7 +++----
 cluster/addons/dns/coredns/coredns.yaml.in   | 7 +++----
 cluster/addons/dns/coredns/coredns.yaml.sed  | 7 +++----
 test/e2e/network/dns_configmap.go            | 5 -----
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/cluster/addons/dns/coredns/coredns.yaml.base b/cluster/addons/dns/coredns/coredns.yaml.base
index 4bb74125103..3556f680078 100644
--- a/cluster/addons/dns/coredns/coredns.yaml.base
+++ b/cluster/addons/dns/coredns/coredns.yaml.base
@@ -64,7 +64,6 @@ data:
     .:53 {
         errors
         health
-        ready
         kubernetes __PILLAR__DNS__DOMAIN__ in-addr.arpa ip6.arpa {
             pods insecure
             fallthrough in-addr.arpa ip6.arpa
@@ -116,7 +115,7 @@ spec:
         beta.kubernetes.io/os: linux
       containers:
       - name: coredns
-        image: k8s.gcr.io/coredns:1.5.0
+        image: k8s.gcr.io/coredns:1.3.1
         imagePullPolicy: IfNotPresent
         resources:
           limits:
@@ -150,8 +149,8 @@ spec:
           failureThreshold: 5
         readinessProbe:
           httpGet:
-            path: /ready
-            port: 8181
+            path: /health
+            port: 8080
             scheme: HTTP
         securityContext:
           allowPrivilegeEscalation: false
diff --git a/cluster/addons/dns/coredns/coredns.yaml.in b/cluster/addons/dns/coredns/coredns.yaml.in
index 11efa9d886a..4d0edebaba4 100644
--- a/cluster/addons/dns/coredns/coredns.yaml.in
+++ b/cluster/addons/dns/coredns/coredns.yaml.in
@@ -64,7 +64,6 @@ data:
     .:53 {
         errors
         health
-        ready
         kubernetes {{ pillar['dns_domain'] }} in-addr.arpa ip6.arpa {
             pods insecure
             fallthrough in-addr.arpa ip6.arpa
@@ -116,7 +115,7 @@ spec:
         beta.kubernetes.io/os: linux
       containers:
       - name: coredns
-        image: k8s.gcr.io/coredns:1.5.0
+        image: k8s.gcr.io/coredns:1.3.1
         imagePullPolicy: IfNotPresent
         resources:
           limits:
@@ -150,8 +149,8 @@ spec:
           failureThreshold: 5
         readinessProbe:
           httpGet:
-            path: /ready
-            port: 8181
+            path: /health
+            port: 8080
             scheme: HTTP
         securityContext:
           allowPrivilegeEscalation: false
diff --git a/cluster/addons/dns/coredns/coredns.yaml.sed b/cluster/addons/dns/coredns/coredns.yaml.sed
index b02caa1655a..aa6a8061f97 100644
--- a/cluster/addons/dns/coredns/coredns.yaml.sed
+++ b/cluster/addons/dns/coredns/coredns.yaml.sed
@@ -64,7 +64,6 @@ data:
     .:53 {
         errors
         health
-        ready
         kubernetes $DNS_DOMAIN in-addr.arpa ip6.arpa {
             pods insecure
             fallthrough in-addr.arpa ip6.arpa
@@ -116,7 +115,7 @@ spec:
         beta.kubernetes.io/os: linux
       containers:
       - name: coredns
-        image: k8s.gcr.io/coredns:1.5.0
+        image: k8s.gcr.io/coredns:1.3.1
         imagePullPolicy: IfNotPresent
         resources:
           limits:
@@ -150,8 +149,8 @@ spec:
           failureThreshold: 5
         readinessProbe:
           httpGet:
-            path: /ready
-            port: 8181
+            path: /health
+            port: 8080
             scheme: HTTP
         securityContext:
           allowPrivilegeEscalation: false
diff --git a/test/e2e/network/dns_configmap.go b/test/e2e/network/dns_configmap.go
index eb8e790ba96..b10dd9ca816 100644
--- a/test/e2e/network/dns_configmap.go
+++ b/test/e2e/network/dns_configmap.go
@@ -67,7 +67,6 @@ func (t *dnsFederationsConfigMapTest) run() {
 		valid1 := map[string]string{
 			"Corefile": fmt.Sprintf(`.:53 {
         health
-        ready
         kubernetes %v in-addr.arpa ip6.arpa {
             pods insecure
             upstream
@@ -84,7 +83,6 @@ func (t *dnsFederationsConfigMapTest) run() {
 		valid2 := map[string]string{
 			"Corefile": fmt.Sprintf(`:53 {
         health
-        ready
         kubernetes %v in-addr.arpa ip6.arpa {
             pods insecure
             upstream
@@ -235,7 +233,6 @@ func (t *dnsNameserverTest) run(isIPv6 bool) {
 		t.setConfigMap(&v1.ConfigMap{Data: map[string]string{
 			"Corefile": fmt.Sprintf(`.:53 {
         health
-        ready
         kubernetes %v in-addr.arpa ip6.arpa {
            pods insecure
            upstream
@@ -335,7 +332,6 @@ func (t *dnsPtrFwdTest) run(isIPv6 bool) {
 		t.setConfigMap(&v1.ConfigMap{Data: map[string]string{
 			"Corefile": fmt.Sprintf(`.:53 {
         health
-        ready
         kubernetes %v in-addr.arpa ip6.arpa {
            pods insecure
            upstream
@@ -447,7 +443,6 @@ func (t *dnsExternalNameTest) run(isIPv6 bool) {
 		t.setConfigMap(&v1.ConfigMap{Data: map[string]string{
 			"Corefile": fmt.Sprintf(`.:53 {
         health
-        ready
         kubernetes %v in-addr.arpa ip6.arpa {
            pods insecure
            upstream