Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[release-1.27] Fix events generated by Evented PLEG #6878

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

Merged
openshift-merge-robot merged 1 commit into from
May 9, 2023
Merged

[release-1.27] Fix events generated by Evented PLEG #6878

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion server/container_stop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ func (s *Server) StopContainer(ctx context.Context, req *types.StopContainerRequ
log.Warnf(ctx, "NRI stop failed for container %q: %v", c.ID(), err)
}

s.generateCRIEvent(ctx, c, types.ContainerEventType_CONTAINER_DELETED_EVENT)
log.Infof(ctx, "Stopped container %s: %s", c.ID(), c.Description())
return &types.StopContainerResponse{}, nil
}
Expand Down
7 changes: 6 additions & 1 deletion server/sandbox_stop_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,12 @@ func (s *Server) stopPodSandbox(ctx context.Context, sb *sandbox.Sandbox) error

log.Infof(ctx, "Stopped pod sandbox: %s", sb.ID())
sb.SetStopped(ctx, true)
s.generateCRIEvent(ctx, sb.InfraContainer(), types.ContainerEventType_CONTAINER_STOPPED_EVENT)

if podInfraContainer.Spoofed() {
// event generation would be needed in case of a spoofed infra container where there is no
// exit process that hits the handleExit() code.
s.generateCRIEvent(ctx, sb.InfraContainer(), types.ContainerEventType_CONTAINER_STOPPED_EVENT)
}

return nil
}