Skip to content

Commit 59a1436

Browse files
AkihiroSudathaJeztah
authored andcommitted
release: Add "cri-containerd.DEPRECATED.txt" in the deprecated cri-containerd-* bundles
Signed-off-by: Akihiro Suda <[email protected]> (cherry picked from commit b473c29) Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 3787ef4 commit 59a1436

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
@@ -332,22 +332,26 @@ install-cri-deps: $(BINARIES)
332332
@$(INSTALL) $(BINARIES) $(CRIDIR)/bin
333333
endif
334334

335+
$(CRIDIR)/cri-containerd.DEPRECATED.txt:
336+
@mkdir -p $(CRIDIR)
337+
@$(INSTALL) -m 644 releases/cri-containerd.DEPRECATED.txt $@
338+
335339
ifeq ($(GOOS),windows)
336-
releases/$(CRIRELEASE).tar.gz: install-cri-deps
340+
releases/$(CRIRELEASE).tar.gz: install-cri-deps $(CRIDIR)/cri-containerd.DEPRECATED.txt
337341
@echo "$(WHALE) $@"
338342
@cd $(CRIDIR) && tar -czf ../../releases/$(CRIRELEASE).tar.gz *
339343

340-
releases/$(CRICNIRELEASE).tar.gz: install-cri-deps
344+
releases/$(CRICNIRELEASE).tar.gz: install-cri-deps $(CRIDIR)/cri-containerd.DEPRECATED.txt
341345
@echo "$(WHALE) $@"
342346
@cd $(CRIDIR) && tar -czf ../../releases/$(CRICNIRELEASE).tar.gz *
343347
else
344-
releases/$(CRIRELEASE).tar.gz: install-cri-deps
348+
releases/$(CRIRELEASE).tar.gz: install-cri-deps $(CRIDIR)/cri-containerd.DEPRECATED.txt
345349
@echo "$(WHALE) $@"
346-
@tar -czf releases/$(CRIRELEASE).tar.gz -C $(CRIDIR) etc/crictl.yaml etc/systemd usr opt/containerd
350+
@tar -czf releases/$(CRIRELEASE).tar.gz -C $(CRIDIR) cri-containerd.DEPRECATED.txt etc/crictl.yaml etc/systemd usr opt/containerd
347351

348-
releases/$(CRICNIRELEASE).tar.gz: install-cri-deps
352+
releases/$(CRICNIRELEASE).tar.gz: install-cri-deps $(CRIDIR)/cri-containerd.DEPRECATED.txt
349353
@echo "$(WHALE) $@"
350-
@tar -czf releases/$(CRICNIRELEASE).tar.gz -C $(CRIDIR) etc usr opt
354+
@tar -czf releases/$(CRICNIRELEASE).tar.gz -C $(CRIDIR) cri-containerd.DEPRECATED.txt etc usr opt
351355
endif
352356

353357
cri-release: releases/$(CRIRELEASE).tar.gz
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)