Merge pull request #56565 from stewart-yu/fixTextErrorKubeadm

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>. Fix minor err in kubeadm **What this PR does / why we need it**: fix minor text error in kubeadm. **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 # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #56565 from stewart-yu/fixTextErrorKubeadm
cfdf8ae2 · Kubernetes Submit Queue · GitHub · 7e22151d · f41f1887 · cfdf8ae2
Unverified Commit cfdf8ae2 authored Dec 22, 2017 by Kubernetes Submit Queue Committed by GitHub Dec 22, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

features_test.go cmd/kubeadm/app/features/features_test.go +6 -6

dns.go cmd/kubeadm/app/phases/addons/dns/dns.go +1 -1

No files found.
--- a/cmd/kubeadm/app/features/features_test.go
+++ b/cmd/kubeadm/app/features/features_test.go
@@ -168,16 +168,16 @@ func TestResolveFeatureGateDependencies(t *testing.T) {
 			expectedFeatures: map[string]bool{},
 		},
 		{ // others flags
-			inputFeatures:    map[string]bool{"SupportIPVSProxyMode": true},
-			expectedFeatures: map[string]bool{"SupportIPVSProxyMode": true},
+			inputFeatures:    map[string]bool{CoreDNS: true},
+			expectedFeatures: map[string]bool{CoreDNS: true},
 		},
 		{ // just StoreCertsInSecrets flags
-			inputFeatures:    map[string]bool{"StoreCertsInSecrets": true},
-			expectedFeatures: map[string]bool{"StoreCertsInSecrets": true, "SelfHosting": true},
+			inputFeatures:    map[string]bool{StoreCertsInSecrets: true},
+			expectedFeatures: map[string]bool{StoreCertsInSecrets: true, SelfHosting: true},
 		},
 		{ // just HighAvailability flags
-			inputFeatures:    map[string]bool{"HighAvailability": true},
-			expectedFeatures: map[string]bool{"HighAvailability": true, "StoreCertsInSecrets": true, "SelfHosting": true},
+			inputFeatures:    map[string]bool{HighAvailability: true},
+			expectedFeatures: map[string]bool{HighAvailability: true, StoreCertsInSecrets: true, SelfHosting: true},
 		},
 	}


--- a/cmd/kubeadm/app/phases/addons/dns/dns.go
+++ b/cmd/kubeadm/app/phases/addons/dns/dns.go
@@ -203,7 +203,7 @@ func createCoreDNSAddon(deploymentBytes, serviceBytes, configBytes []byte, clien

 	coreDNSServiceAccount := &v1.ServiceAccount{}
 	if err := kuberuntime.DecodeInto(legacyscheme.Codecs.UniversalDecoder(), []byte(CoreDNSServiceAccount), coreDNSServiceAccount); err != nil {
-		return fmt.Errorf("unable to decode CoreDNS configmap %v", err)
+		return fmt.Errorf("unable to decode CoreDNS serviceaccount %v", err)
 	}

 	// Create the ConfigMap for CoreDNS or update it in case it already exists