Update DNS version in kubeadm of 1.10 cycle.

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

@@ -75,7 +75,7 @@ func kubeDNSAddon(cfg *kubeadmapi.MasterConfiguration, client clientset.Interfac
 	// Get the YAML manifest conditionally based on the k8s version
 	kubeDNSDeploymentBytes := GetKubeDNSManifest(k8sVersion)
 	dnsDeploymentBytes, err := kubeadmutil.ParseTemplate(kubeDNSDeploymentBytes,
-		struct{ ImageRepository, Arch, Version, DNSBindAddr, DNSProbeAddr, DNSDomain, DNSProbeType, MasterTaintKey string }{
+		struct{ ImageRepository, Arch, Version, DNSBindAddr, DNSProbeAddr, DNSDomain, MasterTaintKey string }{
 			ImageRepository: cfg.ImageRepository,
 			Arch:            runtime.GOARCH,
 			// Get the kube-dns version conditionally based on the k8s version
@@ -83,7 +83,6 @@ func kubeDNSAddon(cfg *kubeadmapi.MasterConfiguration, client clientset.Interfac
 			DNSBindAddr:    dnsBindAddr,
 			DNSProbeAddr:   dnsProbeAddr,
 			DNSDomain:      cfg.Networking.DNSDomain,
-			DNSProbeType:   GetKubeDNSProbeType(k8sVersion),
 			MasterTaintKey: kubeadmconstants.LabelNodeRoleMaster,
 		})
 	if err != nil {

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

@@ -92,14 +92,13 @@ func TestCompileManifests(t *testing.T) {
 	}{
 		{
 			manifest: v180AndAboveKubeDNSDeployment,
-			data: struct{ ImageRepository, Arch, Version, DNSBindAddr, DNSProbeAddr, DNSDomain, DNSProbeType, MasterTaintKey string }{
+			data: struct{ ImageRepository, Arch, Version, DNSBindAddr, DNSProbeAddr, DNSDomain, MasterTaintKey string }{
 				ImageRepository: "foo",
 				Arch:            "foo",
 				Version:         "foo",
 				DNSBindAddr:     "foo",
 				DNSProbeAddr:    "foo",
 				DNSDomain:       "foo",
-				DNSProbeType:    "foo",
 				MasterTaintKey:  "foo",
 			},
 			expected: true,

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

@@ -156,8 +156,8 @@ spec:
         args:
         - --v=2
         - --logtostderr
-        - --probe=kubedns,{{ .DNSProbeAddr }}:10053,kubernetes.default.svc.{{ .DNSDomain }},5,{{ .DNSProbeType }}
-        - --probe=dnsmasq,{{ .DNSProbeAddr }}:53,kubernetes.default.svc.{{ .DNSDomain }},5,{{ .DNSProbeType }}
+        - --probe=kubedns,{{ .DNSProbeAddr }}:10053,kubernetes.default.svc.{{ .DNSDomain }},5,SRV
+        - --probe=dnsmasq,{{ .DNSProbeAddr }}:53,kubernetes.default.svc.{{ .DNSDomain }},5,SRV
         ports:
         - containerPort: 10054
           name: metrics

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

@@ -22,46 +22,24 @@ import (
 )
 
 const (
-	kubeDNSv180AndAboveVersion = "1.14.5"
 	kubeDNSv190AndAboveVersion = "1.14.7"
-
-	kubeDNSProbeSRV = "SRV"
-	kubeDNSProbeA   = "A"
-	coreDNSVersion  = "1.0.1"
+	coreDNSVersion             = "1.0.1"
 )
 
 // GetDNSVersion returns the right kube-dns version for a specific k8s version
 func GetDNSVersion(kubeVersion *version.Version, dns string) string {
-	// v1.8.0+ uses kube-dns 1.14.5
 	// v1.9.0+ uses kube-dns 1.14.7
-	// v1.9.0+ uses CoreDNS  1.0.1
+	// v1.9.0+ uses CoreDNS  1.0.1 if feature gate "CoreDNS" is enabled.
 
 	// In the future when the version is bumped at HEAD; add conditional logic to return the right versions
 	// Also, the version might be bumped for different k8s releases on the same branch
 	switch dns {
-	case kubeadmconstants.KubeDNS:
-		// return the kube-dns version
-		if kubeVersion.Major() == 1 && kubeVersion.Minor() >= 9 {
-			return kubeDNSv190AndAboveVersion
-		}
-		return kubeDNSv180AndAboveVersion
 	case kubeadmconstants.CoreDNS:
 		// return the CoreDNS version
 		return coreDNSVersion
 	default:
-		return kubeDNSv180AndAboveVersion
-	}
-}
-
-// GetKubeDNSProbeType returns the right kube-dns probe for a specific k8s version
-func GetKubeDNSProbeType(kubeVersion *version.Version) string {
-	// v1.8.0+ uses type A, just return that here
-	// In the future when the kube-dns version is bumped at HEAD; add conditional logic to return the right versions
-	// Also, the version might be bumped for different k8s releases on the same branch
-	if kubeVersion.Major() == 1 && kubeVersion.Minor() >= 9 {
-		return kubeDNSProbeSRV
+		return kubeDNSv190AndAboveVersion
 	}
-	return kubeDNSProbeA
 }
 
 // GetKubeDNSManifest returns the right kube-dns YAML manifest for a specific k8s version

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

@@ -25,45 +25,38 @@ import (
 
 func TestGetKubeDNSVersion(t *testing.T) {
 	var tests = []struct {
-		k8sVersion, expected string
+		k8sVersion string
+		dns        string
+		expected   string
 	}{
 		{
-			k8sVersion: "v1.7.0",
-			expected:   "1.14.5",
-		},
-		{
-			k8sVersion: "v1.7.1",
-			expected:   "1.14.5",
-		},
-		{
-			k8sVersion: "v1.7.2",
-			expected:   "1.14.5",
-		},
-		{
-			k8sVersion: "v1.7.3",
-			expected:   "1.14.5",
+			k8sVersion: "v1.9.0",
+			dns:        kubeadmconstants.KubeDNS,
+			expected:   kubeDNSv190AndAboveVersion,
 		},
 		{
-			k8sVersion: "v1.8.0-alpha.2",
-			expected:   "1.14.5",
+			k8sVersion: "v1.10.0",
+			dns:        kubeadmconstants.KubeDNS,
+			expected:   kubeDNSv190AndAboveVersion,
 		},
 		{
-			k8sVersion: "v1.8.0",
-			expected:   "1.14.5",
+			k8sVersion: "v1.9.0",
+			dns:        kubeadmconstants.CoreDNS,
+			expected:   coreDNSVersion,
 		},
 		{
-			k8sVersion: "v1.9.0",
-			expected:   "1.14.7",
+			k8sVersion: "v1.10.0",
+			dns:        kubeadmconstants.CoreDNS,
+			expected:   coreDNSVersion,
 		},
 	}
 	for _, rt := range tests {
-
 		k8sVersion, err := version.ParseSemantic(rt.k8sVersion)
 		if err != nil {
 			t.Fatalf("couldn't parse kubernetes version %q: %v", rt.k8sVersion, err)
 		}
 
-		actualDNSVersion := GetDNSVersion(k8sVersion, kubeadmconstants.KubeDNS)
+		actualDNSVersion := GetDNSVersion(k8sVersion, rt.dns)
 		if actualDNSVersion != rt.expected {
 			t.Errorf(
 				"failed GetDNSVersion:\n\texpected: %s\n\t  actual: %s",
@@ -73,54 +66,3 @@ func TestGetKubeDNSVersion(t *testing.T) {
 		}
 	}
 }
-
-func TestGetKubeDNSProbeType(t *testing.T) {
-	var tests = []struct {
-		k8sVersion, expected string
-	}{
-		{
-			k8sVersion: "v1.7.0",
-			expected:   "A",
-		},
-		{
-			k8sVersion: "v1.7.1",
-			expected:   "A",
-		},
-		{
-			k8sVersion: "v1.7.2",
-			expected:   "A",
-		},
-		{
-			k8sVersion: "v1.7.3",
-			expected:   "A",
-		},
-		{
-			k8sVersion: "v1.8.0-alpha.2",
-			expected:   "A",
-		},
-		{
-			k8sVersion: "v1.8.0",
-			expected:   "A",
-		},
-		{
-			k8sVersion: "v1.9.0",
-			expected:   "SRV",
-		},
-	}
-	for _, rt := range tests {
-
-		k8sVersion, err := version.ParseSemantic(rt.k8sVersion)
-		if err != nil {
-			t.Fatalf("couldn't parse kubernetes version %q: %v", rt.k8sVersion, err)
-		}
-
-		actualDNSProbeType := GetKubeDNSProbeType(k8sVersion)
-		if actualDNSProbeType != rt.expected {
-			t.Errorf(
-				"failed GetKubeDNSProbeType:\n\texpected: %s\n\t  actual: %s",
-				rt.expected,
-				actualDNSProbeType,
-			)
-		}
-	}
-}