diff --git a/pkg/kubelet/kubelet_node_status.go b/pkg/kubelet/kubelet_node_status.go index 54f54f149ae..096dfd83060 100644 --- a/pkg/kubelet/kubelet_node_status.go +++ b/pkg/kubelet/kubelet_node_status.go @@ -151,7 +151,7 @@ func (kl *Kubelet) updateDefaultLabels(initialNode, existingNode *v1.Node) bool kubeletapis.LabelArch, } - var needsUpdate bool = false + needsUpdate := false if existingNode.Labels == nil { existingNode.Labels = make(map[string]string) } diff --git a/pkg/kubelet/kubelet_pods.go b/pkg/kubelet/kubelet_pods.go index 1854554824c..a00b934df6a 100644 --- a/pkg/kubelet/kubelet_pods.go +++ b/pkg/kubelet/kubelet_pods.go @@ -138,7 +138,7 @@ func makeMounts(pod *v1.Pod, podDir string, container *v1.Container, hostName, h mountEtcHostsFile := len(podIP) > 0 && runtime.GOOS != "windows" glog.V(3).Infof("container: %v/%v/%v podIP: %q creating hosts mount: %v", pod.Namespace, pod.Name, container.Name, podIP, mountEtcHostsFile) mounts := []kubecontainer.Mount{} - var cleanupAction func() = nil + var cleanupAction func() for i, mount := range container.VolumeMounts { // do not mount /etc/hosts if container is already mounting on the path mountEtcHostsFile = mountEtcHostsFile && (mount.MountPath != etcHostsPath) diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index cf75dc87197..de8fb60969e 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -318,7 +318,7 @@ func newTestKubeletWithImageList( allPlugins = append(allPlugins, azure_dd.ProbeVolumePlugins()...) } - var prober volume.DynamicPluginProber = nil // TODO (#51147) inject mock + var prober volume.DynamicPluginProber // TODO (#51147) inject mock kubelet.volumePluginMgr, err = NewInitializedVolumePluginMgr(kubelet, kubelet.secretManager, kubelet.configMapManager, token.NewManager(kubelet.kubeClient), allPlugins, prober) require.NoError(t, err, "Failed to initialize VolumePluginMgr")