diff --git a/pkg/kubelet/cm/fake_internal_container_lifecycle.go b/pkg/kubelet/cm/fake_internal_container_lifecycle.go index 78e3baf7efb..d133f28f17c 100644 --- a/pkg/kubelet/cm/fake_internal_container_lifecycle.go +++ b/pkg/kubelet/cm/fake_internal_container_lifecycle.go @@ -35,10 +35,6 @@ func (f *fakeInternalContainerLifecycle) PreStartContainer(pod *v1.Pod, containe return nil } -func (f *fakeInternalContainerLifecycle) PreStopContainer(containerID string) error { - return nil -} - func (f *fakeInternalContainerLifecycle) PostStopContainer(containerID string) error { return nil } diff --git a/pkg/kubelet/cm/internal_container_lifecycle.go b/pkg/kubelet/cm/internal_container_lifecycle.go index 39a1e96f8c3..5e50fd16662 100644 --- a/pkg/kubelet/cm/internal_container_lifecycle.go +++ b/pkg/kubelet/cm/internal_container_lifecycle.go @@ -27,7 +27,6 @@ import ( type InternalContainerLifecycle interface { PreCreateContainer(pod *v1.Pod, container *v1.Container, containerConfig *runtimeapi.ContainerConfig) error PreStartContainer(pod *v1.Pod, container *v1.Container, containerID string) error - PreStopContainer(containerID string) error PostStopContainer(containerID string) error } @@ -52,10 +51,6 @@ func (i *internalContainerLifecycleImpl) PreStartContainer(pod *v1.Pod, containe return nil } -func (i *internalContainerLifecycleImpl) PreStopContainer(containerID string) error { - return nil -} - func (i *internalContainerLifecycleImpl) PostStopContainer(containerID string) error { return i.topologyManager.RemoveContainer(containerID) } diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container.go b/pkg/kubelet/kuberuntime/kuberuntime_container.go index 881af3f2190..3fd849e4ae2 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_container.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_container.go @@ -725,11 +725,6 @@ func (m *kubeGenericRuntimeManager) killContainer(ctx context.Context, pod *v1.P } m.recordContainerEvent(pod, containerSpec, containerID.ID, v1.EventTypeNormal, events.KillingContainer, message) - // Run internal pre-stop lifecycle hook - if err := m.internalLifecycle.PreStopContainer(containerID.ID); err != nil { - return err - } - // Run the pre-stop lifecycle hooks if applicable and if there is enough time to run it if containerSpec.Lifecycle != nil && containerSpec.Lifecycle.PreStop != nil && gracePeriod > 0 { gracePeriod = gracePeriod - m.executePreStopHook(ctx, pod, containerID, containerSpec, gracePeriod)