diff --git a/cmd/kubeadm/app/cmd/init.go b/cmd/kubeadm/app/cmd/init.go index a52b2952cf0..432ea7b3ca1 100644 --- a/cmd/kubeadm/app/cmd/init.go +++ b/cmd/kubeadm/app/cmd/init.go @@ -597,7 +597,7 @@ func (d *initData) WaitControlPlaneClient() (clientset.Interface, error) { // Tokens returns an array of token strings. func (d *initData) Tokens() []string { - tokens := []string{} + tokens := make([]string, 0, len(d.cfg.BootstrapTokens)) for _, bt := range d.cfg.BootstrapTokens { tokens = append(tokens, bt.Token.String()) } diff --git a/cmd/kubeadm/app/cmd/phases/init/kubeletfinalize.go b/cmd/kubeadm/app/cmd/phases/init/kubeletfinalize.go index b3e514cfdc5..90f47b7178b 100644 --- a/cmd/kubeadm/app/cmd/phases/init/kubeletfinalize.go +++ b/cmd/kubeadm/app/cmd/phases/init/kubeletfinalize.go @@ -35,7 +35,7 @@ import ( var ( kubeletFinalizePhaseExample = cmdutil.Examples(` - # Updates settings relevant to the kubelet after TLS bootstrap" + # Updates settings relevant to the kubelet after TLS bootstrap kubeadm init phase kubelet-finalize all --config `) ) diff --git a/cmd/kubeadm/app/cmd/upgrade/plan.go b/cmd/kubeadm/app/cmd/upgrade/plan.go index af73aec8e3b..4c7283a9a0a 100644 --- a/cmd/kubeadm/app/cmd/upgrade/plan.go +++ b/cmd/kubeadm/app/cmd/upgrade/plan.go @@ -234,7 +234,7 @@ func genAvailableUpgrade(up *upgrade.Upgrade, etcdUpgrade bool) outputapiv1alpha // sortedSliceFromStringStringArrayMap returns a slice of the keys in the map sorted alphabetically func sortedSliceFromStringStringArrayMap(strMap map[string][]string) []string { - strSlice := []string{} + strSlice := make([]string, 0, len(strMap)) for k := range strMap { strSlice = append(strSlice, k) }