Merge pull request #78030 from rajansandeep/bump1.5.0

Bump CoreDNS version to 1.5.0 and update manifest

cluster/addons/dns/coredns/coredns.yaml.base

@@ -64,9 +64,9 @@ data:
     .:53 {
         errors
         health
+        ready
         kubernetes __PILLAR__DNS__DOMAIN__ in-addr.arpa ip6.arpa {
             pods insecure
-            upstream
             fallthrough in-addr.arpa ip6.arpa
             ttl 30
         }
@@ -116,7 +116,7 @@ spec:
         beta.kubernetes.io/os: linux
       containers:
       - name: coredns
-        image: k8s.gcr.io/coredns:1.3.1
+        image: k8s.gcr.io/coredns:1.5.0
         imagePullPolicy: IfNotPresent
         resources:
           limits:
@@ -150,8 +150,8 @@ spec:
           failureThreshold: 5
         readinessProbe:
           httpGet:
-            path: /health
+            path: /ready
-            port: 8080
+            port: 8181
             scheme: HTTP
         securityContext:
           allowPrivilegeEscalation: false

cluster/addons/dns/coredns/coredns.yaml.in

@@ -64,9 +64,9 @@ data:
     .:53 {
         errors
         health
+        ready
         kubernetes {{ pillar['dns_domain'] }} in-addr.arpa ip6.arpa {
             pods insecure
-            upstream
             fallthrough in-addr.arpa ip6.arpa
             ttl 30
         }
@@ -116,7 +116,7 @@ spec:
         beta.kubernetes.io/os: linux
       containers:
       - name: coredns
-        image: k8s.gcr.io/coredns:1.3.1
+        image: k8s.gcr.io/coredns:1.5.0
         imagePullPolicy: IfNotPresent
         resources:
           limits:
@@ -150,8 +150,8 @@ spec:
           failureThreshold: 5
         readinessProbe:
           httpGet:
-            path: /health
+            path: /ready
-            port: 8080
+            port: 8181
             scheme: HTTP
         securityContext:
           allowPrivilegeEscalation: false

cluster/addons/dns/coredns/coredns.yaml.sed

@@ -64,9 +64,9 @@ data:
     .:53 {
         errors
         health
+        ready
         kubernetes $DNS_DOMAIN in-addr.arpa ip6.arpa {
             pods insecure
-            upstream
             fallthrough in-addr.arpa ip6.arpa
             ttl 30
         }
@@ -116,7 +116,7 @@ spec:
         beta.kubernetes.io/os: linux
       containers:
       - name: coredns
-        image: k8s.gcr.io/coredns:1.3.1
+        image: k8s.gcr.io/coredns:1.5.0
         imagePullPolicy: IfNotPresent
         resources:
           limits:
@@ -150,8 +150,8 @@ spec:
           failureThreshold: 5
         readinessProbe:
           httpGet:
-            path: /health
+            path: /ready
-            port: 8080
+            port: 8181
             scheme: HTTP
         securityContext:
           allowPrivilegeEscalation: false

cmd/kubeadm/app/constants/constants.go

@@ -328,7 +328,7 @@ const (
 	KubeDNSVersion = "1.14.13"
 
 	// CoreDNSVersion is the version of CoreDNS to be deployed if it is used
-	CoreDNSVersion = "1.3.1"
+	CoreDNSVersion = "1.5.0"
 
 	// ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct
 	ClusterConfigurationKind = "ClusterConfiguration"

cmd/kubeadm/app/phases/addons/dns/manifests.go

@@ -281,8 +281,8 @@ spec:
           failureThreshold: 5
         readinessProbe:
           httpGet:
-            path: /health
+            path: /ready
-            port: 8080
+            port: 8181
             scheme: HTTP
         securityContext:
           allowPrivilegeEscalation: false
@@ -314,9 +314,9 @@ data:
     .:53 {
         errors
         health
+        ready
         kubernetes {{ .DNSDomain }} in-addr.arpa ip6.arpa {
            pods insecure
-           upstream
            fallthrough in-addr.arpa ip6.arpa
            ttl 30
         }{{ .Federation }}

cmd/kubeadm/app/phases/upgrade/compute_test.go

@@ -186,7 +186,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
 						KubeVersion:    constants.MinimumControlPlaneVersion.WithPatch(3).String(),
 						KubeadmVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(),
 						DNSType:        kubeadmapi.CoreDNS,
-						DNSVersion:     "1.3.1",
+						DNSVersion:     "1.5.0",
 						EtcdVersion:    getEtcdVersion(constants.MinimumControlPlaneVersion),
 					},
 				},
@@ -225,7 +225,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
 						KubeVersion:    constants.MinimumControlPlaneVersion.WithPatch(3).String(),
 						KubeadmVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(),
 						DNSType:        kubeadmapi.CoreDNS,
-						DNSVersion:     "1.3.1",
+						DNSVersion:     "1.5.0",
 						EtcdVersion:    getEtcdVersion(constants.MinimumControlPlaneVersion),
 					},
 				},
@@ -264,7 +264,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
 						KubeVersion:    constants.CurrentKubernetesVersion.String(),
 						KubeadmVersion: constants.CurrentKubernetesVersion.String(),
 						DNSType:        kubeadmapi.CoreDNS,
-						DNSVersion:     "1.3.1",
+						DNSVersion:     "1.5.0",
 						EtcdVersion:    getEtcdVersion(constants.CurrentKubernetesVersion),
 					},
 				},
@@ -303,7 +303,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
 						KubeVersion:    constants.MinimumControlPlaneVersion.WithPatch(5).String(),
 						KubeadmVersion: constants.MinimumControlPlaneVersion.WithPatch(5).String(), // Note: The kubeadm version mustn't be "downgraded" here
 						DNSType:        kubeadmapi.CoreDNS,
-						DNSVersion:     "1.3.1",
+						DNSVersion:     "1.5.0",
 						EtcdVersion:    getEtcdVersion(constants.MinimumControlPlaneVersion),
 					},
 				},
@@ -323,7 +323,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
 						KubeVersion:    constants.CurrentKubernetesVersion.WithPatch(1).String(),
 						KubeadmVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(),
 						DNSType:        kubeadmapi.CoreDNS,
-						DNSVersion:     "1.3.1",
+						DNSVersion:     "1.5.0",
 						EtcdVersion:    getEtcdVersion(constants.CurrentKubernetesVersion),
 					},
 				},
@@ -382,7 +382,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
 						KubeVersion:    constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(),
 						KubeadmVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(),
 						DNSType:        kubeadmapi.CoreDNS,
-						DNSVersion:     "1.3.1",
+						DNSVersion:     "1.5.0",
 						EtcdVersion:    getEtcdVersion(constants.CurrentKubernetesVersion),
 					},
 				},
@@ -422,7 +422,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
 						KubeVersion:    constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(),
 						KubeadmVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(),
 						DNSType:        kubeadmapi.CoreDNS,
-						DNSVersion:     "1.3.1",
+						DNSVersion:     "1.5.0",
 						EtcdVersion:    getEtcdVersion(constants.CurrentKubernetesVersion),
 					},
 				},
@@ -463,7 +463,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
 						KubeVersion:    "v1.13.0-beta.1",
 						KubeadmVersion: "v1.13.0-beta.1",
 						DNSType:        kubeadmapi.CoreDNS,
-						DNSVersion:     "1.3.1",
+						DNSVersion:     "1.5.0",
 						EtcdVersion:    "3.2.24",
 					},
 				},
@@ -504,7 +504,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
 						KubeVersion:    "v1.13.0-rc.1",
 						KubeadmVersion: "v1.13.0-rc.1",
 						DNSType:        kubeadmapi.CoreDNS,
-						DNSVersion:     "1.3.1",
+						DNSVersion:     "1.5.0",
 						EtcdVersion:    "3.2.24",
 					},
 				},
@@ -545,7 +545,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
 						KubeVersion:    "v1.13.6-rc.1",
 						KubeadmVersion: "v1.13.6-rc.1",
 						DNSType:        kubeadmapi.CoreDNS,
-						DNSVersion:     "1.3.1",
+						DNSVersion:     "1.5.0",
 						EtcdVersion:    "3.2.24",
 					},
 				},
@@ -586,7 +586,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
 						KubeVersion:    "v1.13.0-rc.1",
 						KubeadmVersion: "v1.13.0-rc.1",
 						DNSType:        kubeadmapi.CoreDNS,
-						DNSVersion:     "1.3.1",
+						DNSVersion:     "1.5.0",
 						EtcdVersion:    "3.2.24",
 					},
 				},
@@ -606,7 +606,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
 						KubeVersion:    "v1.12.0-alpha.2",
 						KubeadmVersion: "v1.12.0-alpha.2",
 						DNSType:        kubeadmapi.CoreDNS,
-						DNSVersion:     "1.3.1",
+						DNSVersion:     "1.5.0",
 						EtcdVersion:    "3.2.24",
 					},
 				},
@@ -659,7 +659,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
 						KubeVersion:    constants.CurrentKubernetesVersion.WithPatch(1).String(),
 						KubeadmVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(),
 						DNSType:        kubeadmapi.CoreDNS,
-						DNSVersion:     "1.3.1",
+						DNSVersion:     "1.5.0",
 						EtcdVersion:    getEtcdVersion(constants.CurrentKubernetesVersion),
 					},
 				},
@@ -696,7 +696,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
 						KubeVersion:    constants.CurrentKubernetesVersion.String(),
 						KubeadmVersion: constants.CurrentKubernetesVersion.String(),
 						DNSType:        kubeadmapi.CoreDNS,
-						DNSVersion:     "1.3.1",
+						DNSVersion:     "1.5.0",
 						EtcdVersion:    getEtcdVersion(constants.CurrentKubernetesVersion),
 					},
 				},