diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index fd18b128331..46b9a0f6188 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -31,7 +31,6 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/clock" utilruntime "k8s.io/apimachinery/pkg/util/runtime" @@ -436,10 +435,6 @@ func TestSyncPodsDeletesWhenSourcesAreReady(t *testing.T) { fakeRuntime.AssertKilledPods([]string{"12345678"}) } -type testNodeLister struct { - nodes []*v1.Node -} - type testNodeInfo struct { nodes []*v1.Node } @@ -453,10 +448,6 @@ func (ls testNodeInfo) GetNodeInfo(id string) (*v1.Node, error) { return nil, fmt.Errorf("Node with name: %s does not exist", id) } -func (ls testNodeLister) List(selector labels.Selector) ([]*v1.Node, error) { - return ls.nodes, nil -} - func checkPodStatus(t *testing.T, kl *Kubelet, pod *v1.Pod, phase v1.PodPhase) { status, found := kl.statusManager.GetPodStatus(pod.UID) require.True(t, found, "Status of pod %q is not found in the status map", pod.UID) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager.go b/pkg/kubelet/kuberuntime/kuberuntime_manager.go index df207fb4352..4751352093a 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager.go @@ -803,24 +803,6 @@ func (m *kubeGenericRuntimeManager) killPodWithSyncResult(pod *v1.Pod, runningPo return } -// isHostNetwork checks whether the pod is running in host-network mode. -func (m *kubeGenericRuntimeManager) isHostNetwork(podSandBoxID string, pod *v1.Pod) (bool, error) { - if pod != nil { - return kubecontainer.IsHostNetworkPod(pod), nil - } - - podStatus, err := m.runtimeService.PodSandboxStatus(podSandBoxID) - if err != nil { - return false, err - } - - if podStatus.GetLinux().GetNamespaces().GetOptions().GetNetwork() == runtimeapi.NamespaceMode_NODE { - return true, nil - } - - return false, nil -} - // GetPodStatus retrieves the status of the pod, including the // information of all containers in the pod that are visible in Runtime. func (m *kubeGenericRuntimeManager) GetPodStatus(uid kubetypes.UID, name, namespace string) (*kubecontainer.PodStatus, error) { diff --git a/pkg/kubelet/runtime.go b/pkg/kubelet/runtime.go index 18883cb7ff9..2ee89b3891b 100644 --- a/pkg/kubelet/runtime.go +++ b/pkg/kubelet/runtime.go @@ -53,12 +53,6 @@ func (s *runtimeState) setRuntimeSync(t time.Time) { s.lastBaseRuntimeSync = t } -func (s *runtimeState) setInternalError(err error) { - s.Lock() - defer s.Unlock() - s.internalError = err -} - func (s *runtimeState) setNetworkState(err error) { s.Lock() defer s.Unlock()