libc/int/userns: add build tag to C file #4616
Conversation
This fixes k3s cross-compilation on Windows, broken by commit 1912d59 ("*: actually support joining a userns with a new container"). [@kolyshkin: commit message] Fixes: 1912d59 Signed-off-by: Brad Davidson <[email protected]> Signed-off-by: Kir Kolyshkin <[email protected]>
kolyshkin
added
the
backport/1.2-todo
|
@brandond PTAL. Sorry if you have reported the issue before but we missed it. Also, if you can suggest a way to test this, that'd be great. |
|
I think the underlying issue is that runc isn't normally used on windows. On windows you use runhcs instead. However, K3s links in some of the runc libcontainer library code on windows, so we do need build tags on stuff that only works on linux. I did ping @cyphar internally a while back but I haven't followed up. |
Yes, I think this depends on which runc/libcontainer packages are being imported (directly or indirectly). In case of libcontainer/nsenter, we only import it from the main package and libcontainer/integration, so it can't be imported indirectly (unless someone imports libcontainer/integration, and of course no one does it). In this case, userns is being imported by libcontainer, so anyone who's using it for non-linux is affected. I'm still trying to figure out how to create a test case for this though :( |
| @@ -1,3 +1,5 @@ | |||
| //go:build linux | |||
There was a problem hiding this comment.
Do we need both of the comment line and the file name suffix?
There was a problem hiding this comment.
idk but that seems to be the convention in Kubernetes at least.
There was a problem hiding this comment.
It's a tad redundant but I guess OK to have just in case.
|
1.2 backport: #4619 |
kolyshkin
added
backport/1.2-done
This is to see how windows compile is broken (see opencontainers/runc#4616). Signed-off-by: Kir Kolyshkin <[email protected]>
|
Ended up finding out it's not needed for a variety of reasons (see k3s-io/k3s#11722 (comment) for details). Won't hurt either, so let's consider this change a NOP. |
This fixes k3s cross-compilation on Windows, broken by commit 1912d59 ("*: actually support joining a userns with a new container").
[@kolyshkin: commit message]
Fixes: 1912d59
As far as I can see, this is first mentioned in k3s-io/k3s#9332 a year ago but was never reported to runc 😞
Indeed, Go recognizes
//go:buildin C files, and also matches GOOS and GOARCH in file names even for.cfiles.Also, I don't know how to reproduce it here (
GOOS=windows CGO_ENABLED=1 go build ./libcontainer/...gives too many errors).