From e7172b3dbf461e1d12c7221f132080ae85c5b8a4 Mon Sep 17 00:00:00 2001 From: hwdef Date: Tue, 26 Nov 2019 17:12:10 +0800 Subject: [PATCH] pkg/master: Fix static check failures --- hack/.staticcheck_failures | 1 - pkg/master/master.go | 6 +++--- pkg/master/master_test.go | 3 +-- pkg/master/services.go | 2 +- pkg/master/tunneler/ssh.go | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index 1ad70e864c2..9089d5c323a 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -19,7 +19,6 @@ pkg/kubelet/cm/devicemanager pkg/kubelet/pluginmanager/operationexecutor pkg/kubelet/pluginmanager/pluginwatcher pkg/kubelet/remote -pkg/master pkg/printers pkg/probe/http pkg/proxy/healthcheck diff --git a/pkg/master/master.go b/pkg/master/master.go index 590f867c7cb..972397da8b1 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -452,7 +452,7 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget) func (m *Master) InstallLegacyAPI(c *completedConfig, restOptionsGetter generic.RESTOptionsGetter, legacyRESTStorageProvider corerest.LegacyRESTStorageProvider) error { legacyRESTStorage, apiGroupInfo, err := legacyRESTStorageProvider.NewLegacyRESTStorage(restOptionsGetter) if err != nil { - return fmt.Errorf("Error building core storage: %v", err) + return fmt.Errorf("error building core storage: %v", err) } controllerName := "bootstrap-controller" @@ -462,7 +462,7 @@ func (m *Master) InstallLegacyAPI(c *completedConfig, restOptionsGetter generic. m.GenericAPIServer.AddPreShutdownHookOrDie(controllerName, bootstrapController.PreShutdownHook) if err := m.GenericAPIServer.InstallLegacyAPIGroup(genericapiserver.DefaultLegacyAPIPrefix, &apiGroupInfo); err != nil { - return fmt.Errorf("Error in registering group versions: %v", err) + return fmt.Errorf("error in registering group versions: %v", err) } return nil } @@ -518,7 +518,7 @@ func (m *Master) InstallAPIs(apiResourceConfigSource serverstorage.APIResourceCo } if err := m.GenericAPIServer.InstallAPIGroups(apiGroupsInfo...); err != nil { - return fmt.Errorf("Error in registering group versions: %v", err) + return fmt.Errorf("error in registering group versions: %v", err) } return nil } diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go index 8365ea07cad..4b144946187 100644 --- a/pkg/master/master_test.go +++ b/pkg/master/master_test.go @@ -254,14 +254,13 @@ func TestGetNodeAddresses(t *testing.T) { addressProvider := nodeAddressProvider{fakeNodeClient} // Fail case (no addresses associated with nodes) - nodes, _ := fakeNodeClient.List(metav1.ListOptions{}) addrs, err := addressProvider.externalAddresses() assert.Error(err, "addresses should have caused an error as there are no addresses.") assert.Equal([]string(nil), addrs) // Pass case with External type IP - nodes, _ = fakeNodeClient.List(metav1.ListOptions{}) + nodes, _ := fakeNodeClient.List(metav1.ListOptions{}) for index := range nodes.Items { nodes.Items[index].Status.Addresses = []apiv1.NodeAddress{{Type: apiv1.NodeExternalIP, Address: "127.0.0.1"}} fakeNodeClient.Update(&nodes.Items[index]) diff --git a/pkg/master/services.go b/pkg/master/services.go index 420d2fcbf19..5b4d3897853 100644 --- a/pkg/master/services.go +++ b/pkg/master/services.go @@ -40,7 +40,7 @@ func ServiceIPRange(passedServiceClusterIPRange net.IPNet) (net.IPNet, net.IP, e size := integer.Int64Min(utilnet.RangeSize(&serviceClusterIPRange), 1<<16) if size < 8 { - return net.IPNet{}, net.IP{}, fmt.Errorf("The service cluster IP range must be at least %d IP addresses", 8) + return net.IPNet{}, net.IP{}, fmt.Errorf("the service cluster IP range must be at least %d IP addresses", 8) } // Select the first valid IP from ServiceClusterIPRange to use as the GenericAPIServer service IP. diff --git a/pkg/master/tunneler/ssh.go b/pkg/master/tunneler/ssh.go index f30a967e34b..684ba812f7b 100644 --- a/pkg/master/tunneler/ssh.go +++ b/pkg/master/tunneler/ssh.go @@ -55,7 +55,7 @@ func TunnelSyncHealthChecker(tunneler Tunneler) func(req *http.Request) error { } lag := tunneler.SecondsSinceSync() if lag > 600 { - return fmt.Errorf("Tunnel sync is taking too long: %d", lag) + return fmt.Errorf("tunnel sync is taking too long: %d", lag) } sshKeyLag := tunneler.SecondsSinceSSHKeySync() // Since we are syncing ssh-keys every 5 minutes, the allowed