Skip to content

Commit b473c29

Browse files
AkihiroSudaAkihiroSuda
committed
release: Add "cri-containerd.DEPRECATED.txt" in the deprecated cri-containerd-* bundles
Signed-off-by: Akihiro Suda <[email protected]>
1 parent b896209 commit b473c29

2 files changed

Lines changed: 22 additions & 6 deletions

File tree

‎Makefile‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -360,22 +360,26 @@ install-cri-deps: $(BINARIES)
360360
@$(INSTALL) $(BINARIES) $(CRIDIR)/bin
361361
endif
362362

363+
$(CRIDIR)/cri-containerd.DEPRECATED.txt:
364+
@mkdir -p $(CRIDIR)
365+
@$(INSTALL) -m 644 releases/cri-containerd.DEPRECATED.txt $@
366+
363367
ifeq ($(GOOS),windows)
364-
releases/$(CRIRELEASE).tar.gz: install-cri-deps
368+
releases/$(CRIRELEASE).tar.gz: install-cri-deps $(CRIDIR)/cri-containerd.DEPRECATED.txt
365369
@echo "$(WHALE) $@"
366370
@cd $(CRIDIR) && tar -czf ../../releases/$(CRIRELEASE).tar.gz *
367371

368-
releases/$(CRICNIRELEASE).tar.gz: install-cri-deps
372+
releases/$(CRICNIRELEASE).tar.gz: install-cri-deps $(CRIDIR)/cri-containerd.DEPRECATED.txt
369373
@echo "$(WHALE) $@"
370374
@cd $(CRIDIR) && tar -czf ../../releases/$(CRICNIRELEASE).tar.gz *
371375
else
372-
releases/$(CRIRELEASE).tar.gz: install-cri-deps
376+
releases/$(CRIRELEASE).tar.gz: install-cri-deps $(CRIDIR)/cri-containerd.DEPRECATED.txt
373377
@echo "$(WHALE) $@"
374-
@tar -czf releases/$(CRIRELEASE).tar.gz -C $(CRIDIR) etc/crictl.yaml etc/systemd usr opt/containerd
378+
@tar -czf releases/$(CRIRELEASE).tar.gz -C $(CRIDIR) cri-containerd.DEPRECATED.txt etc/crictl.yaml etc/systemd usr opt/containerd
375379

376-
releases/$(CRICNIRELEASE).tar.gz: install-cri-deps
380+
releases/$(CRICNIRELEASE).tar.gz: install-cri-deps $(CRIDIR)/cri-containerd.DEPRECATED.txt
377381
@echo "$(WHALE) $@"
378-
@tar -czf releases/$(CRICNIRELEASE).tar.gz -C $(CRIDIR) etc usr opt
382+
@tar -czf releases/$(CRICNIRELEASE).tar.gz -C $(CRIDIR) cri-containerd.DEPRECATED.txt etc usr opt
379383
endif
380384

381385
cri-release: releases/$(CRIRELEASE).tar.gz

‎releases/cri-containerd.DEPRECATED.txt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
The "cri-containerd-(cni-)-VERSION-OS-ARCH.tar.gz" release bundle has been deprecated since containerd 1.6,
2+
does not work on some Linux distributions, and will be removed in containerd 2.0.
3+
4+
Instead of this, install the following components separately, either from the binary or from the source:
5+
* containerd: https://github.com/containerd/containerd/releases
6+
* runc: https://github.com/opencontainers/runc/releases
7+
* CNI plugins: https://github.com/containernetworking/plugins/releases
8+
9+
The CRI plugin has been included in containerd since containerd 1.1.
10+
11+
See also the "Getting started" document:
12+
https://github.com/containerd/containerd/blob/main/docs/getting-started.md

0 commit comments

Comments
 (0)