github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-18 07:34:12 +00:00
Code Issues Projects Releases Wiki Activity

cmd/kubeadm/app: fix staticcheck warning

Browse Source
This commit is contained in:
hwdef
2019-11-01 10:30:46 +08:00
parent 5e468a49de
commit eae3e3ce8c
7 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubeadm/app/phases/upgrade/staticpods.go
View File

@@ -32,7 +32,6 @@ import (
certsphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs"
"k8s.io/kubernetes/cmd/kubeadm/app/phases/certs/renewal"
"k8s.io/kubernetes/cmd/kubeadm/app/phases/controlplane"
controlplanephase "k8s.io/kubernetes/cmd/kubeadm/app/phases/controlplane"
etcdphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/etcd"
"k8s.io/kubernetes/cmd/kubeadm/app/util"
"k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient"
@@ -464,7 +463,7 @@ func StaticPodControlPlane(client clientset.Interface, waiter apiclient.Waiter,
// Write the updated static Pod manifests into the temporary directory
fmt.Printf("[upgrade/staticpods] Writing new Static Pod manifests to %q\n", pathMgr.TempManifestDir())
err = controlplanephase.CreateInitStaticPodManifestFiles(pathMgr.TempManifestDir(), pathMgr.KustomizeDir(), cfg)
err = controlplane.CreateInitStaticPodManifestFiles(pathMgr.TempManifestDir(), pathMgr.KustomizeDir(), cfg)
if err != nil {
return errors.Wrap(err, "error creating init static pod manifest files")
}

19
cmd/kubeadm/app/phases/upgrade/staticpods_test.go
View File

@@ -35,7 +35,6 @@ import (
certutil "k8s.io/client-go/util/cert"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
"k8s.io/kubernetes/cmd/kubeadm/app/constants"
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
certsphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs"
"k8s.io/kubernetes/cmd/kubeadm/app/phases/certs/renewal"
controlplanephase "k8s.io/kubernetes/cmd/kubeadm/app/phases/controlplane"
@@ -432,7 +431,7 @@ func TestStaticPodControlPlane(t *testing.T) {
moveFileFunc: func(oldPath, newPath string) error {
return os.Rename(oldPath, newPath)
},
skipKubeConfig: kubeadmconstants.SchedulerKubeConfigFileName,
skipKubeConfig: constants.SchedulerKubeConfigFileName,
expectedErr: true,
manifestShouldChange: false,
},
@@ -446,7 +445,7 @@ func TestStaticPodControlPlane(t *testing.T) {
moveFileFunc: func(oldPath, newPath string) error {
return os.Rename(oldPath, newPath)
},
skipKubeConfig: kubeadmconstants.AdminKubeConfigFileName,
skipKubeConfig: constants.AdminKubeConfigFileName,
expectedErr: true,
manifestShouldChange: false,
},
@@ -488,9 +487,9 @@ func TestStaticPodControlPlane(t *testing.T) {
}
for _, kubeConfig := range []string{
kubeadmconstants.AdminKubeConfigFileName,
kubeadmconstants.SchedulerKubeConfigFileName,
kubeadmconstants.ControllerManagerKubeConfigFileName,
constants.AdminKubeConfigFileName,
constants.SchedulerKubeConfigFileName,
constants.ControllerManagerKubeConfigFileName,
} {
if rt.skipKubeConfig == kubeConfig {
continue
@@ -743,14 +742,14 @@ func TestRenewCertsByComponent(t *testing.T) {
name: "all CA exist, should be rotated for scheduler",
component: constants.KubeScheduler,
kubeConfigShouldExist: []string{
kubeadmconstants.SchedulerKubeConfigFileName,
constants.SchedulerKubeConfigFileName,
},
},
{
name: "all CA exist, should be rotated for controller manager",
component: constants.KubeControllerManager,
kubeConfigShouldExist: []string{
kubeadmconstants.ControllerManagerKubeConfigFileName,
constants.ControllerManagerKubeConfigFileName,
},
},
{
@@ -850,7 +849,7 @@ func TestRenewCertsByComponent(t *testing.T) {
t.Errorf("couldn't load new certificate %q: %v", kubeCert.Name, err)
continue
}
oldSerial, _ := certMaps[kubeCert.Name]
oldSerial := certMaps[kubeCert.Name]
shouldBeRenewed := true
if test.certsShouldBeRenewed != nil {
@@ -876,7 +875,7 @@ func TestRenewCertsByComponent(t *testing.T) {
if err != nil {
t.Fatalf("error reading embedded certs from %s: %v", kubeConfig, err)
}
oldSerial, _ := certMaps[kubeConfig]
oldSerial := certMaps[kubeConfig]
if oldSerial.Cmp(newCerts[0].SerialNumber) == 0 {
t.Errorf("certifitate %v was not reissued", kubeConfig)
}