Merge pull request #86035 from idealhack/automated-cherry-pick-of-#86…

…027-upstream-release-1.17 Automated cherry pick of #86027: Fix broken SELinux detection
kubernetes · Dec 12, 2019 · 512f096 · 512f096
2 parents 3da6c11 + d95f824
commit 512f096
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 2 deletions.
diff --git a/build/root/.bazelrc b/build/root/.bazelrc
@@ -16,6 +16,9 @@ build --workspace_status_command hack/print-workspace-status.sh
 # Make /tmp hermetic
 build --sandbox_tmpfs_path=/tmp
 
+# This tag is required to build github.com/opencontainers/selinux correctly
+build --define gotags=selinux
+
 # Ensure that Bazel never runs as root, which can cause unit tests to fail.
 # This flag requires Bazel 0.5.0+
 build --sandbox_fake_username

diff --git a/build/root/BUILD.root b/build/root/BUILD.root
@@ -5,6 +5,9 @@
 # gazelle:exclude _output
 # gazelle:exclude _tmp
 
+# This tag is required to build github.com/opencontainers/selinux correctly
+# gazelle:build_tags selinux
+
 # gazelle:prefix k8s.io/kubernetes
 
 # Disable proto rules, since the Go sources are currently generated by

diff --git a/vendor/github.com/opencontainers/selinux/go-selinux/BUILD b/vendor/github.com/opencontainers/selinux/go-selinux/BUILD
diff --git a/vendor/github.com/opencontainers/selinux/go-selinux/label/BUILD b/vendor/github.com/opencontainers/selinux/go-selinux/label/BUILD