From b42bdd125d48d85275061a311e4ad814626def19 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 13 Sep 2023 22:54:00 +0900 Subject: [PATCH] release: remove `cri-containerd-*.tar.gz` release bundles The `cri-containerd-*.tar.gz` release bundles have been deprecated since containerd v1.6. These bundles are no longer created in the CI, however, the corresponding Makefile targets are still kept, as they are still used by external CIs. Signed-off-by: Akihiro Suda --- .github/workflows/release.yml | 4 ++-- .github/workflows/release/Dockerfile | 5 +++-- Makefile | 4 ++-- RELEASES.md | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 96c730bbd..10157529d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -121,8 +121,8 @@ jobs: docker buildx build ${cache} --build-arg RELEASE_VER --build-arg UBUNTU_VERSION=${{ matrix.dockerfile-ubuntu }} --build-arg GO_VERSION ${BUILD_ARGS} -f .github/workflows/release/Dockerfile --platform=${PLATFORM} -o releases/ . echo PLATFORM_CLEAN=${PLATFORM/\//-} >> $GITHUB_ENV - # Remove symlinks since we don't want these in the release Artifacts - find ./releases/ -maxdepth 1 -type l | xargs rm + # Remove symlinks since we don't want these in the release Artifacts (if any) + find ./releases/ -maxdepth 1 -type l | xargs rm -f working-directory: src/github.com/containerd/containerd env: PLATFORM: ${{ matrix.dockerfile-platform }} diff --git a/.github/workflows/release/Dockerfile b/.github/workflows/release/Dockerfile index 84938ead0..8023bf880 100644 --- a/.github/workflows/release/Dockerfile +++ b/.github/workflows/release/Dockerfile @@ -27,7 +27,8 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get install -y dpkg-dev git make pkg-config ARG TARGETPLATFORM -RUN xx-apt-get install -y libseccomp-dev btrfs-progs gcc +# gcc is needed for github.com/containerd/btrfs/v2 +RUN xx-apt-get install -y gcc ENV PATH=/usr/local/go/bin:$PATH ENV GOPATH=/go ENV CGO_ENABLED=1 @@ -49,7 +50,7 @@ RUN \ --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg \ export CC=$(xx-info)-gcc && xx-go --wrap && \ - make release static-release cri-release cri-cni-release && \ + make release static-release && \ for f in $(find bin -executable -type f); do xx-verify $f; done # check git working tree after build diff --git a/Makefile b/Makefile index ecf1d4c39..dcc8030a2 100644 --- a/Makefile +++ b/Makefile @@ -380,11 +380,11 @@ releases/$(CRICNIRELEASE).tar.gz: install-cri-deps $(CRIDIR)/cri-containerd.DEPR @tar -czf releases/$(CRICNIRELEASE).tar.gz -C $(CRIDIR) cri-containerd.DEPRECATED.txt etc usr opt endif -cri-release: releases/$(CRIRELEASE).tar.gz +cri-release: releases/$(CRIRELEASE).tar.gz ## Deprecated (only kept for external CI) @echo "$(WHALE) $@" @cd releases && sha256sum $(CRIRELEASE).tar.gz >$(CRIRELEASE).tar.gz.sha256sum && ln -sf $(CRIRELEASE).tar.gz cri-containerd.tar.gz -cri-cni-release: releases/$(CRICNIRELEASE).tar.gz +cri-cni-release: releases/$(CRICNIRELEASE).tar.gz ## Deprecated (only kept for external CI) @echo "$(WHALE) $@" @cd releases && sha256sum $(CRICNIRELEASE).tar.gz >$(CRICNIRELEASE).tar.gz.sha256sum && ln -sf $(CRICNIRELEASE).tar.gz cri-cni-containerd.tar.gz diff --git a/RELEASES.md b/RELEASES.md index 086ba6f1f..21f8bb516 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -386,7 +386,7 @@ The deprecated features are shown in the following table: | config.toml `version = 1` | containerd v1.5 | containerd v2.0 ✅ | Use config.toml `version = 2` | | Built-in `aufs` snapshotter | containerd v1.5 | containerd v2.0 ✅ | Use `overlayfs` snapshotter | | Container label `containerd.io/restart.logpath` | containerd v1.5 | containerd v2.0 ✅ | Use `containerd.io/restart.loguri` label | -| `cri-containerd-*.tar.gz` release bundles | containerd v1.6 | containerd v2.0 | Use `containerd-*.tar.gz` bundles | +| `cri-containerd-*.tar.gz` release bundles | containerd v1.6 | containerd v2.0 ✅ | Use `containerd-*.tar.gz` bundles | | Pulling Schema 1 images (`application/vnd.docker.distribution.manifest.v1+json`) | containerd v1.7 | containerd v2.0 | Use Schema 2 or OCI images | | CRI `v1alpha2` | containerd v1.7 | containerd v2.0 ✅ | Use CRI `v1` | | Legacy CRI implementation of podsandbox support | containerd v2.0 | containerd v2.1 | Disabled by default in 2.0 in favor of core sandboxed CRI plugin (use `DISABLE_CRI_SANDBOXES=1` to fallback to prior CRI podsandbox implementation) |