Skip to content

K
k3s
Unverified Commit cfdf8ae2 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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 ```
parents 7e22151d f41f1887
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
cmd/kubeadm/app/features/features_test.go
View file @ cfdf8ae2
...@@ -168,16 +168,16 @@ func TestResolveFeatureGateDependencies(t *testing.T) { ...@@ -168,16 +168,16 @@ func TestResolveFeatureGateDependencies(t *testing.T) {
expectedFeatures: map[string]bool{}, expectedFeatures: map[string]bool{},
}, },
{ // others flags { // others flags
inputFeatures: map[string]bool{"SupportIPVSProxyMode": true}, inputFeatures: map[string]bool{CoreDNS: true},
expectedFeatures: map[string]bool{"SupportIPVSProxyMode": true}, expectedFeatures: map[string]bool{CoreDNS: true},
}, },
{ // just StoreCertsInSecrets flags { // just StoreCertsInSecrets flags
inputFeatures: map[string]bool{"StoreCertsInSecrets": true}, inputFeatures: map[string]bool{StoreCertsInSecrets: true},
expectedFeatures: map[string]bool{"StoreCertsInSecrets": true, "SelfHosting": true}, expectedFeatures: map[string]bool{StoreCertsInSecrets: true, SelfHosting: true},
}, },
{ // just HighAvailability flags { // just HighAvailability flags
inputFeatures: map[string]bool{"HighAvailability": true}, inputFeatures: map[string]bool{HighAvailability: true},
expectedFeatures: map[string]bool{"HighAvailability": true, "StoreCertsInSecrets": true, "SelfHosting": true}, expectedFeatures: map[string]bool{HighAvailability: true, StoreCertsInSecrets: true, SelfHosting: true},
}, },
} }
......
cmd/kubeadm/app/phases/addons/dns/dns.go
View file @ cfdf8ae2
...@@ -203,7 +203,7 @@ func createCoreDNSAddon(deploymentBytes, serviceBytes, configBytes []byte, clien ...@@ -203,7 +203,7 @@ func createCoreDNSAddon(deploymentBytes, serviceBytes, configBytes []byte, clien
coreDNSServiceAccount := &v1.ServiceAccount{} coreDNSServiceAccount := &v1.ServiceAccount{}
if err := kuberuntime.DecodeInto(legacyscheme.Codecs.UniversalDecoder(), []byte(CoreDNSServiceAccount), coreDNSServiceAccount); err != nil { 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 // Create the ConfigMap for CoreDNS or update it in case it already exists
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment