From 35c26f48e42e42c466faf9136b1709f71a3bab24 Mon Sep 17 00:00:00 2001 From: demoManito <1430482733@qq.com> Date: Mon, 5 Sep 2022 17:07:45 +0800 Subject: [PATCH] fix: map and slice create style --- cmd/kubeadm/app/phases/upgrade/compute.go | 2 +- cmd/kubeadm/app/phases/upgrade/compute_test.go | 4 ++-- cmd/kubeadm/app/phases/upgrade/health.go | 4 ++-- cmd/kubeadm/app/phases/upgrade/policy.go | 2 +- cmd/kubeadm/app/phases/upgrade/postupgrade.go | 4 ++-- cmd/kubeadm/app/phases/upgrade/versiongetter.go | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cmd/kubeadm/app/phases/upgrade/compute.go b/cmd/kubeadm/app/phases/upgrade/compute.go index 71fde4770af..a627e9003f0 100644 --- a/cmd/kubeadm/app/phases/upgrade/compute.go +++ b/cmd/kubeadm/app/phases/upgrade/compute.go @@ -77,7 +77,7 @@ func GetAvailableUpgrades(versionGetterImpl VersionGetter, experimentalUpgradesA printer.Printf("[upgrade] Fetching available versions to upgrade to\n") // Collect the upgrades kubeadm can do in this list - upgrades := []Upgrade{} + var upgrades []Upgrade // Get the cluster version clusterVersionStr, clusterVersion, err := versionGetterImpl.ClusterVersion() diff --git a/cmd/kubeadm/app/phases/upgrade/compute_test.go b/cmd/kubeadm/app/phases/upgrade/compute_test.go index 7471cb18f49..1cad954f906 100644 --- a/cmd/kubeadm/app/phases/upgrade/compute_test.go +++ b/cmd/kubeadm/app/phases/upgrade/compute_test.go @@ -137,7 +137,7 @@ func TestGetAvailableUpgrades(t *testing.T) { stableVersion: v1Y0.String(), }, beforeDNSVersion: fakeCurrentCoreDNSVersion, - expectedUpgrades: []Upgrade{}, + expectedUpgrades: nil, allowExperimental: false, errExpected: false, }, @@ -342,7 +342,7 @@ func TestGetAvailableUpgrades(t *testing.T) { latestVersion: v1Z0alpha2.String(), }, beforeDNSVersion: fakeCurrentCoreDNSVersion, - expectedUpgrades: []Upgrade{}, + expectedUpgrades: nil, allowExperimental: true, errExpected: false, }, diff --git a/cmd/kubeadm/app/phases/upgrade/health.go b/cmd/kubeadm/app/phases/upgrade/health.go index a0547ffb754..ec09ee9f39e 100644 --- a/cmd/kubeadm/app/phases/upgrade/health.go +++ b/cmd/kubeadm/app/phases/upgrade/health.go @@ -226,7 +226,7 @@ func controlPlaneNodesReady(client clientset.Interface, _ *kubeadmapi.ClusterCon // staticPodManifestHealth makes sure the required static pods are presents func staticPodManifestHealth(_ clientset.Interface, _ *kubeadmapi.ClusterConfiguration) error { - nonExistentManifests := []string{} + var nonExistentManifests []string for _, component := range constants.ControlPlaneComponents { manifestFile := constants.GetStaticPodFilepath(component, constants.GetStaticPodDirectory()) if _, err := os.Stat(manifestFile); os.IsNotExist(err) { @@ -241,7 +241,7 @@ func staticPodManifestHealth(_ clientset.Interface, _ *kubeadmapi.ClusterConfigu // getNotReadyNodes returns a string slice of nodes in the cluster that are NotReady func getNotReadyNodes(nodes []v1.Node) []string { - notReadyNodes := []string{} + var notReadyNodes []string for _, node := range nodes { for _, condition := range node.Status.Conditions { if condition.Type == v1.NodeReady && condition.Status != v1.ConditionTrue { diff --git a/cmd/kubeadm/app/phases/upgrade/policy.go b/cmd/kubeadm/app/phases/upgrade/policy.go index 8d5b0441c8e..eed1ed5346e 100644 --- a/cmd/kubeadm/app/phases/upgrade/policy.go +++ b/cmd/kubeadm/app/phases/upgrade/policy.go @@ -169,7 +169,7 @@ func detectUnstableVersionError(newK8sVersion *version.Version, newK8sVersionStr // detectTooOldKubelets errors out if the kubelet versions are so old that an unsupported skew would happen if the cluster was upgraded func detectTooOldKubelets(newK8sVersion *version.Version, kubeletVersions map[string]uint16) error { - tooOldKubeletVersions := []string{} + var tooOldKubeletVersions []string for versionStr := range kubeletVersions { kubeletVersion, err := version.ParseSemantic(versionStr) diff --git a/cmd/kubeadm/app/phases/upgrade/postupgrade.go b/cmd/kubeadm/app/phases/upgrade/postupgrade.go index a4f4731fedd..c01e704e3a0 100644 --- a/cmd/kubeadm/app/phases/upgrade/postupgrade.go +++ b/cmd/kubeadm/app/phases/upgrade/postupgrade.go @@ -48,7 +48,7 @@ import ( // PerformPostUpgradeTasks runs nearly the same functions as 'kubeadm init' would do // Note that the mark-control-plane phase is left out, not needed, and no token is created as that doesn't belong to the upgrade func PerformPostUpgradeTasks(client clientset.Interface, cfg *kubeadmapi.InitConfiguration, patchesDir string, dryRun bool, out io.Writer) error { - errs := []error{} + var errs []error // Upload currently used configuration to the cluster // Note: This is done right in the beginning of cluster initialization; as we might want to make other phases @@ -191,7 +191,7 @@ func GetKubeletDir(dryRun bool) (string, error) { // moveFiles moves files from one directory to another. func moveFiles(files map[string]string) error { - filesToRecover := map[string]string{} + filesToRecover := make(map[string]string, len(files)) for from, to := range files { if err := os.Rename(from, to); err != nil { return rollbackFiles(filesToRecover, err) diff --git a/cmd/kubeadm/app/phases/upgrade/versiongetter.go b/cmd/kubeadm/app/phases/upgrade/versiongetter.go index 5e10be36372..234351f3b91 100644 --- a/cmd/kubeadm/app/phases/upgrade/versiongetter.go +++ b/cmd/kubeadm/app/phases/upgrade/versiongetter.go @@ -21,7 +21,7 @@ import ( "github.com/pkg/errors" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" versionutil "k8s.io/apimachinery/pkg/util/version" clientset "k8s.io/client-go/kubernetes" @@ -105,7 +105,7 @@ func (g *KubeVersionGetter) KubeletVersions() (map[string]uint16, error) { // computeKubeletVersions returns a string-int map that describes how many nodes are of a specific version func computeKubeletVersions(nodes []v1.Node) map[string]uint16 { - kubeletVersions := map[string]uint16{} + kubeletVersions := make(map[string]uint16) for _, node := range nodes { kver := node.Status.NodeInfo.KubeletVersion if _, found := kubeletVersions[kver]; !found {