mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
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 ```
This commit is contained in:
commit
cfdf8ae231
@ -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},
|
||||
},
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user