diff options
| author | Fabricio Voznika <fvoznika@google.com> | 2021-01-12 17:50:33 -0800 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-01-12 17:54:10 -0800 |
| commit | 8b0f0b4d11e0938eec8da411323b2ce35976ab56 (patch) | |
| tree | aab8e37ca51133da5bfa4a055ea0dfa0bda514cf /Makefile | |
| parent | be2b9d75d75e0e7371cd868589d57f4ddee44781 (diff) | |
Delete shim v1
gvisor-containerd-shim is not compatible with containerd 1.1 or earlier.
Starting from containerd 1.2, shim v2 is the preferred interface.
PiperOrigin-RevId: 351485556
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -298,13 +298,9 @@ containerd-test-%: load-basic_alpine load-basic_python load-basic_busybox load-b @$(call sudo,tools/installers:shim) @$(call sudo,test/root:root_test,--runtime=$(RUNTIME) -test.v) -# Note that we can't run containerd-test-1.1.8 tests here. -# -# Containerd 1.1.8 should work, but because of a bug in loading images locally -# (https://github.com/kubernetes-sigs/cri-tools/issues/421), we are unable to -# actually drive the tests. The v1 API is tested exclusively through 1.2.13. +# The shim builds with containerd 1.3.9 and it's not backward compatible. Test +# with 1.3.9 and newer versions. containerd-tests: ## Runs all supported containerd version tests. -containerd-tests: containerd-test-1.2.13 containerd-tests: containerd-test-1.3.9 containerd-tests: containerd-test-1.4.3 @@ -433,8 +429,7 @@ $(RELEASE_KEY): $(RELEASE_ARTIFACTS)/%: @mkdir -p $@ @$(call copy,//runsc:runsc,$@) - @$(call copy,//shim/v1:gvisor-containerd-shim,$@) - @$(call copy,//shim/v2:containerd-shim-runsc-v1,$@) + @$(call copy,//shim:containerd-shim-runsc-v1,$@) @$(call copy,//debian:debian,$@) release: $(RELEASE_KEY) $(RELEASE_ARTIFACTS)/$(ARCH) |