github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 12:32:03 +00:00
Code Issues Projects Releases Wiki Activity

pkg/master: Fix static check failures

Browse Source
This commit is contained in:
hwdef 2019-11-26 17:12:10 +08:00
parent 1f913b4582
commit e7172b3dbf
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.staticcheck_failures
View File

@ -19,7 +19,6 @@ pkg/kubelet/cm/devicemanager
pkg/kubelet/pluginmanager/operationexecutor pkg/kubelet/pluginmanager/operationexecutor
pkg/kubelet/pluginmanager/pluginwatcher pkg/kubelet/pluginmanager/pluginwatcher
pkg/kubelet/remote pkg/kubelet/remote
pkg/master
pkg/printers pkg/printers
pkg/probe/http pkg/probe/http
pkg/proxy/healthcheck pkg/proxy/healthcheck

6
pkg/master/master.go
View File

@ -452,7 +452,7 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
func (m *Master) InstallLegacyAPI(c *completedConfig, restOptionsGetter generic.RESTOptionsGetter, legacyRESTStorageProvider corerest.LegacyRESTStorageProvider) error { func (m *Master) InstallLegacyAPI(c *completedConfig, restOptionsGetter generic.RESTOptionsGetter, legacyRESTStorageProvider corerest.LegacyRESTStorageProvider) error {
legacyRESTStorage, apiGroupInfo, err := legacyRESTStorageProvider.NewLegacyRESTStorage(restOptionsGetter) legacyRESTStorage, apiGroupInfo, err := legacyRESTStorageProvider.NewLegacyRESTStorage(restOptionsGetter)
if err != nil { if err != nil {
return fmt.Errorf("Error building core storage: %v", err) return fmt.Errorf("error building core storage: %v", err)
} }
controllerName := "bootstrap-controller" controllerName := "bootstrap-controller"
@ -462,7 +462,7 @@ func (m *Master) InstallLegacyAPI(c *completedConfig, restOptionsGetter generic.
m.GenericAPIServer.AddPreShutdownHookOrDie(controllerName, bootstrapController.PreShutdownHook) m.GenericAPIServer.AddPreShutdownHookOrDie(controllerName, bootstrapController.PreShutdownHook)
if err := m.GenericAPIServer.InstallLegacyAPIGroup(genericapiserver.DefaultLegacyAPIPrefix, &apiGroupInfo); err != nil { 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 return nil
} }
@ -518,7 +518,7 @@ func (m *Master) InstallAPIs(apiResourceConfigSource serverstorage.APIResourceCo
} }
if err := m.GenericAPIServer.InstallAPIGroups(apiGroupsInfo...); err != nil { 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 return nil
} }

3
pkg/master/master_test.go
View File

@ -254,14 +254,13 @@ func TestGetNodeAddresses(t *testing.T) {
addressProvider := nodeAddressProvider{fakeNodeClient} addressProvider := nodeAddressProvider{fakeNodeClient}
// Fail case (no addresses associated with nodes) // Fail case (no addresses associated with nodes)
nodes, _ := fakeNodeClient.List(metav1.ListOptions{})
addrs, err := addressProvider.externalAddresses() addrs, err := addressProvider.externalAddresses()
assert.Error(err, "addresses should have caused an error as there are no addresses.") assert.Error(err, "addresses should have caused an error as there are no addresses.")
assert.Equal([]string(nil), addrs) assert.Equal([]string(nil), addrs)
// Pass case with External type IP // Pass case with External type IP
nodes, _ = fakeNodeClient.List(metav1.ListOptions{}) nodes, _ := fakeNodeClient.List(metav1.ListOptions{})
for index := range nodes.Items { for index := range nodes.Items {
nodes.Items[index].Status.Addresses = []apiv1.NodeAddress{{Type: apiv1.NodeExternalIP, Address: "127.0.0.1"}} nodes.Items[index].Status.Addresses = []apiv1.NodeAddress{{Type: apiv1.NodeExternalIP, Address: "127.0.0.1"}}
fakeNodeClient.Update(&nodes.Items[index]) fakeNodeClient.Update(&nodes.Items[index])

2
pkg/master/services.go
View File

@ -40,7 +40,7 @@ func ServiceIPRange(passedServiceClusterIPRange net.IPNet) (net.IPNet, net.IP, e
size := integer.Int64Min(utilnet.RangeSize(&serviceClusterIPRange), 1<<16) size := integer.Int64Min(utilnet.RangeSize(&serviceClusterIPRange), 1<<16)
if size < 8 { 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. // Select the first valid IP from ServiceClusterIPRange to use as the GenericAPIServer service IP.

2
pkg/master/tunneler/ssh.go
View File

@ -55,7 +55,7 @@ func TunnelSyncHealthChecker(tunneler Tunneler) func(req *http.Request) error {
} }
lag := tunneler.SecondsSinceSync() lag := tunneler.SecondsSinceSync()
if lag > 600 { 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() sshKeyLag := tunneler.SecondsSinceSSHKeySync()
// Since we are syncing ssh-keys every 5 minutes, the allowed // Since we are syncing ssh-keys every 5 minutes, the allowed