Skip to content
This repository was archived by the owner on Mar 9, 2022. It is now read-only.

Erase ambient capabilities.#812

Merged
Random-Liu merged 1 commit intocontainerd:release/1.0from
Random-Liu:cherrypick-#808
Jun 11, 2018
Merged

Erase ambient capabilities.#812
Random-Liu merged 1 commit intocontainerd:release/1.0from
Random-Liu:cherrypick-#808

Conversation

@Random-Liu
Copy link
Copy Markdown
Member

Cherrypick #808.

Signed-off-by: Lantao Liu lantaol@google.com

Signed-off-by: Lantao Liu <lantaol@google.com>
Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment.

// is not clearly defined in Kubernetes.
// See https://github.com/kubernetes/kubernetes/issues/56374
// Keep docker's behavior for now.
g.Spec().Process.Capabilities.Ambient = []string{}
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there are ambient caps, let's log that ambient caps are not supported for containers in Kubernetes pods, but that the container will be created with the ambient caps masked.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no ambient cap in CRI, these are all containerd implementation details.

Don't think we need to log it. :)

@Random-Liu
Copy link
Copy Markdown
Member Author

Random-Liu commented Jun 11, 2018

Will fix the presubmit test.

We should not use K8s HEAD to test old release branch.

@Random-Liu
Copy link
Copy Markdown
Member Author

/test pull-cri-containerd-node-e2e

Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/LGTM

@Random-Liu Random-Liu merged commit 4cf084d into containerd:release/1.0 Jun 11, 2018
@Random-Liu Random-Liu deleted the cherrypick-#808 branch June 11, 2018 20:26
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants