Skip to content

CWCOW: Misc fixes #2605

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

Open
MahatiC wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −9
Open

CWCOW: Misc fixes #2605

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
12 changes: 6 additions & 6 deletions internal/gcs-sidecar/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,13 @@ func (b *Bridge) createContainer(req *request) (err error) {
log.G(ctx).Tracef("Container exists in the map.")
return err
}
defer func(err error) {
defer func() {
if err != nil {
b.hostState.RemoveContainer(ctx, containerID)
if removeErr := b.hostState.RemoveContainer(ctx, containerID); removeErr != nil {
log.G(ctx).WithError(removeErr).Errorf("Failed to remove container: %v", containerID)
}
}
}(err)
}()

if oci.ParseAnnotationsBool(ctx, spec.Annotations, annotations.WCOWSecurityPolicyEnv, true) {
if err := b.hostState.securityOptions.WriteSecurityContextDir(&spec); err != nil {
Expand Down Expand Up @@ -459,13 +461,11 @@ func (b *Bridge) deleteContainerState(req *request) (err error) {
if err := commonutils.UnmarshalJSONWithHresult(req.message, &r); err != nil {
return fmt.Errorf("failed to unmarshal deleteContainerState: %w", err)
}
_, err = b.hostState.GetCreatedContainer(req.ctx, r.ContainerID)
err = b.hostState.RemoveContainer(req.ctx, r.ContainerID)
if err != nil {
log.G(req.ctx).Tracef("Container not found during deleteContainerState: %v", r.ContainerID)
return fmt.Errorf("container not found: %w", err)
}
// remove container state regardless of delete's success
defer b.hostState.RemoveContainer(req.ctx, r.ContainerID)

b.forwardRequestToGcs(req)
return nil
Expand Down
5 changes: 3 additions & 2 deletions internal/gcs-sidecar/host.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,18 @@ func (h *Host) AddContainer(ctx context.Context, id string, c *Container) error
return nil
}

func (h *Host) RemoveContainer(ctx context.Context, id string) {
func (h *Host) RemoveContainer(ctx context.Context, id string) error {
h.containersMutex.Lock()
defer h.containersMutex.Unlock()

_, ok := h.containers[id]
if !ok {
log.G(ctx).Tracef("RemoveContainer: Container not found: ID: %v", id)
return
return gcserr.NewHresultError(gcserr.HrVmcomputeSystemNotFound)
}

delete(h.containers, id)
return nil
}

func (h *Host) GetCreatedContainer(ctx context.Context, id string) (*Container, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/securitypolicy/securitypolicy_options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func (s *SecurityOptions) SetConfidentialOptions(ctx context.Context, enforcerTy
// The other point is on startup where we take a flag to set the default
// policy enforcer to use before a policy arrives. After that flag is set,
// we use the enforcer in question to set up logging as well.
if err = s.PolicyEnforcer.EnforceRuntimeLoggingPolicy(ctx); err == nil {
if err = p.EnforceRuntimeLoggingPolicy(ctx); err == nil {
logrus.SetOutput(s.logWriter)
} else {
logrus.SetOutput(io.Discard)
Expand Down