Revert "project-lakitu: update containerd to 1.5.3"
Revert submission 19531
Reason for revert: k8s e2e tests failing on master
Reverted Changes:
I9bb37f166:project-lakitu: update containerd to 1.5.3
I40c756b22:project-lakitu: update kubernetes to v1.21.3
Change-Id: Ia79770710b28b92fda1ec7d907d5932ec8e7d4fa
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/19795
Reviewed-by: Varsha Teratipally <teratipally@google.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/project-lakitu/app-emulation/containerd/Manifest b/project-lakitu/app-emulation/containerd/Manifest
index e8be4f0..95dd8bf 100644
--- a/project-lakitu/app-emulation/containerd/Manifest
+++ b/project-lakitu/app-emulation/containerd/Manifest
@@ -1 +1 @@
-DIST containerd-1.5.3.tar.gz 7674357 BLAKE2B e48e133786dede13197f1763d2b6c5dd30ef71ebfde637631cc75d853c80ca71f938133e51d83fe28517dd15d3c2cda1572b629f108560cef59dd2f254b360fc SHA512 38054e6851b288023452ff8b00b7fa8d621c28e6ea1e82428b7449346d7112ee7a55c238e658cf30e1d6eb7f3dc8480a863e17bdb355234d9798226636f7e872
+DIST containerd-1.4.4.tar.gz 6174959 BLAKE2B 62d0a6bafbdb8da2b7d0f8b9371b566a971eda87b993e54af7a1d40a3d8ee3876bb38cb18c876f6911f91a531235bb448446acc690854b833bd51657df294d6e SHA512 f09930d19f53381d86cf522954458ecc949f15a0c6a49f990bdb61fe19afee075356338998ed84bd756f16ba85211f55f9c638de8b7083d71e24d8e87335e070
diff --git a/project-lakitu/app-emulation/containerd/containerd-1.4.4-r3.ebuild b/project-lakitu/app-emulation/containerd/containerd-1.4.4-r3.ebuild
new file mode 120000
index 0000000..3c06236
--- /dev/null
+++ b/project-lakitu/app-emulation/containerd/containerd-1.4.4-r3.ebuild
@@ -0,0 +1 @@
+containerd-1.4.4.ebuild
\ No newline at end of file
diff --git a/project-lakitu/app-emulation/containerd/containerd-1.5.3.ebuild b/project-lakitu/app-emulation/containerd/containerd-1.4.4.ebuild
similarity index 96%
rename from project-lakitu/app-emulation/containerd/containerd-1.5.3.ebuild
rename to project-lakitu/app-emulation/containerd/containerd-1.4.4.ebuild
index 73ede13..5df8ec2 100644
--- a/project-lakitu/app-emulation/containerd/containerd-1.5.3.ebuild
+++ b/project-lakitu/app-emulation/containerd/containerd-1.4.4.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-CONTAINERD_COMMIT=0e8719f54c6dc6571fc1170da75a85e86c17636b
+CONTAINERD_COMMIT=05f951a3781f4f2c1911b05e61c160e9c30eaa8e
EGO_PN="github.com/containerd/${PN}"
# lakitu: inherits eutils and systemd to install the containerd.service.
@@ -106,7 +106,7 @@
# before installing docs directory
rm -r docs/man || die
- local DOCS=( README.md docs/. )
+ local DOCS=( README.md PLUGINS.md docs/. )
einstalldocs
# lakitu: runs containerd as an individual service. This prevents
diff --git a/project-lakitu/app-emulation/containerd/containerd-1.5.3-r1.ebuild b/project-lakitu/app-emulation/containerd/containerd-1.5.3-r1.ebuild
deleted file mode 120000
index 3617fd1..0000000
--- a/project-lakitu/app-emulation/containerd/containerd-1.5.3-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-containerd-1.5.3.ebuild
\ No newline at end of file
