Skip to content

Conversation

@samuelkarp
Copy link
Member

make cri-integration wasn't properly propagating ENABLE_CRI_SANDBOXES, meaning we were not fully testing the sbserver CRI implementation. This PR fixes that and also ports over some changes from #6517 that hadn't made it into sbserver (and weren't caught because CI wasn't running the tests against that implementation).

(cc @ruiwen-zhao)

Copy link
Member

@mxpv mxpv left a comment

Choose a reason for hiding this comment

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

Thanks for looking into this!

sudo(8) strips environment variables by default.  Explicitly set
ENABLE_CRI_SANDBOXES so we can ensure we test the sbserver CRI
implementation.

Signed-off-by: Samuel Karp <samuelkarp@google.com>
Port of b7b1200 to sbserver

Signed-off-by: Samuel Karp <samuelkarp@google.com>
@samuelkarp samuelkarp force-pushed the cri-integration-sandboxed branch from 5335e56 to c8010b9 Compare September 21, 2022 01:38
@samuelkarp
Copy link
Member Author

samuelkarp force-pushed the cri-integration-sandboxed branch from 5335e56 to c8010b9

Fixed the changes in the script to only apply when sudo is present (it isn't on Windows, so we don't need this behavior there).

Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants