Skip to content

Commit e922d55

Browse files
estespestesp
authored
Merge pull request #4849 from AkihiroSuda/remove-selinux-tag
remove "selinux" build tag
2 parents 0c0ff6e + 7e6e4c4 commit e922d55

17 files changed

Lines changed: 268 additions & 124 deletions

File tree

‎BUILDING.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ make generate
107107
> * `no_cri`: A build tag disables building Kubernetes [CRI](http://blog.kubernetes.io/2016/12/container-runtime-interface-cri-in-kubernetes.html) support into containerd.
108108
> See [here](https://github.com/containerd/cri-containerd#build-tags) for build tags of CRI plugin.
109109
> * `no_devmapper`: A build tag disables building the device mapper snapshot driver.
110-
> * `selinux`: Enables selinux support in the cri plugin
111110
>
112111
> For example, adding `BUILDTAGS=no_btrfs` to your environment before calling the **binaries**
113112
> Makefile target will disable the btrfs driver within the containerd Go build.

‎Makefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ MANPAGES=ctr.8 containerd.8 containerd-config.8 containerd-config.toml.5
7777
ifdef BUILDTAGS
7878
GO_BUILDTAGS = ${BUILDTAGS}
7979
endif
80-
# Build tag "selinux" is needed by CRI plugin.
81-
GO_BUILDTAGS ?= selinux
80+
GO_BUILDTAGS ?=
8281
GO_BUILDTAGS += ${DEBUG_TAGS}
8382
GO_TAGS=$(if $(GO_BUILDTAGS),-tags "$(GO_BUILDTAGS)",)
8483
GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) $(EXTRA_LDFLAGS)'

‎docs/installation.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ Information about the binaries in the release tarball:
5353

5454
| Binary Name | Support | OS | Architecture |
5555
|:------------------------------:|:------------------:|:-----:|:------------:|
56-
| containerd | seccomp, apparmor, <br/> overlay, btrfs | linux | amd64 |
56+
| containerd | seccomp, apparmor, selinux<br/> overlay, btrfs | linux | amd64 |
5757
| containerd-shim | overlay, btrfs | linux | amd64 |
58-
| runc | seccomp, apparmor | linux | amd64 |
58+
| runc | seccomp, apparmor, selinux | linux | amd64 |
5959

6060

61-
If you have other requirements for the binaries, e.g. selinux support, another architecture support etc., you need to build the binaries yourself following [the instructions](../BUILDING.md).
61+
If you have other requirements for the binaries, e.g. another architecture support etc., you need to build the binaries yourself following [the instructions](../BUILDING.md).
6262

6363
### Download
6464

@@ -95,7 +95,7 @@ Follow [the instructions](https://kubernetes.io/docs/setup/independent/install-k
9595
## Step 4: Create Systemd Drop-In for Containerd
9696
Create the systemd drop-in file `/etc/systemd/system/kubelet.service.d/0-containerd.conf`:
9797
```
98-
[Service]
98+
[Service]
9999
Environment="KUBELET_EXTRA_ARGS=--container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock"
100100
```
101101
And reload systemd configuration:

‎go.mod‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,14 @@ require (
4242
github.com/opencontainers/image-spec v1.0.1
4343
github.com/opencontainers/runc v1.0.0-rc92
4444
github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6
45-
github.com/opencontainers/selinux v1.6.0
45+
github.com/opencontainers/selinux v1.8.0
4646
github.com/pkg/errors v0.9.1
4747
github.com/prometheus/client_golang v1.7.1
4848
github.com/sirupsen/logrus v1.7.0
4949
github.com/stretchr/testify v1.4.0
5050
github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2
5151
github.com/tchap/go-patricia v2.2.6+incompatible
5252
github.com/urfave/cli v1.22.2
53-
github.com/willf/bitset v1.1.11 // indirect
5453
go.etcd.io/bbolt v1.3.5
5554
golang.org/x/net v0.0.0-20200707034311-ab3426394381
5655
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,8 @@ github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6/go.m
397397
github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
398398
github.com/opencontainers/selinux v1.6.0 h1:+bIAS/Za3q5FTwWym4fTB0vObnfCf3G/NC7K6Jx62mY=
399399
github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE=
400+
github.com/opencontainers/selinux v1.8.0 h1:+77ba4ar4jsCbL1GLbFL8fFM57w6suPfSS9PDLDY7KM=
401+
github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo=
400402
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
401403
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
402404
github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

pkg/cri/server/helpers_selinux_test.go renamed to pkg/cri/server/helpers_selinux_linux_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// +build selinux
2-
31
/*
42
Copyright The containerd Authors.
53

‎test/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ cd "${ROOT}"
2929
make clean
3030

3131
# Build CRI+CNI release
32-
make BUILDTAGS="seccomp selinux no_aufs no_btrfs no_devmapper no_zfs" cri-cni-release
32+
make BUILDTAGS="seccomp no_aufs no_btrfs no_devmapper no_zfs" cri-cni-release
3333

3434
BUILDDIR=$(mktemp -d)
3535
cleanup() {

‎vendor/github.com/opencontainers/selinux/go-selinux/doc.go‎

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/opencontainers/selinux/go-selinux/label/label_selinux.go renamed to vendor/github.com/opencontainers/selinux/go-selinux/label/label_linux.go

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/opencontainers/selinux/go-selinux/label/label_stub.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)