Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cleanup(kubelet): remove unused function #115929

Merged
merged 1 commit into from Mar 10, 2023
Merged

cleanup(kubelet): remove unused function #115929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions pkg/kubelet/cm/fake_internal_container_lifecycle.go
View file
Open in desktop
Expand Up @@ -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
}
5 changes: 0 additions & 5 deletions pkg/kubelet/cm/internal_container_lifecycle.go
View file
Open in desktop
Expand Up @@ -29,7 +29,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
}

Expand All @@ -55,10 +54,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 {
if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.TopologyManager) {
err := i.topologyManager.RemoveContainer(containerID)
Expand Down
5 changes: 0 additions & 5 deletions pkg/kubelet/kuberuntime/kuberuntime_container.go
View file
Open in desktop
Expand Up @@ -689,11 +689,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)
Expand Down