From f41f1887e2d24d705500f536dfbacbe10f62d945 Mon Sep 17 00:00:00 2001 From: stewart-yu Date: Wed, 29 Nov 2017 17:54:20 +0800 Subject: [PATCH] Fix minor err in kubeadm --- cmd/kubeadm/app/features/features_test.go | 12 ++++++------ cmd/kubeadm/app/phases/addons/dns/dns.go | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/kubeadm/app/features/features_test.go b/cmd/kubeadm/app/features/features_test.go index 71c1e2b9c21..6d24ad9c4fa 100644 --- 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}, }, } diff --git a/cmd/kubeadm/app/phases/addons/dns/dns.go b/cmd/kubeadm/app/phases/addons/dns/dns.go index b1866e584fa..aa1e52c941d 100644 --- a/cmd/kubeadm/app/phases/addons/dns/dns.go +++ b/cmd/kubeadm/app/phases/addons/dns/dns.go @@ -200,7 +200,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