build: Move from our own containerd to containerd.io

Let's migrate to the official containerd package from
docker repository and no longer build and maintain our own
containerd package.

Fixes: MK8S-151

Author: TeddyAndrieux

.pylint-dict

@@ -78,6 +78,7 @@ scality
 sdk
 skopeo
 sls
+sosreport
 srv
 Thanos
 timestamp

buildchain/buildchain/builder.py

@@ -53,6 +53,7 @@ def _builder_image(name: str, dockerfile: Path, **kwargs: Any) -> LocalImage:
         file_dep=[
             REDHAT_REPOS_ROOT / "kubernetes.repo",
             REDHAT_REPOS_ROOT / "saltstack.repo",
+            REDHAT_REPOS_ROOT / "docker-ce.repo",
         ],
         build_args={
             # Used to template the repository definition

buildchain/buildchain/packaging.py

@@ -22,7 +22,7 @@
 ┌─────────┐       │──────>│  build   │──────>│    build     │
 │  mkdir  │──────>│       │ packages │       │ repositories │
 └─────────┘               └──────────┘       └──────────────┘
-                        (e.g: containerd)     (e.g.: scality)
+                        (e.g.: sosreport)     (e.g.: scality)
 """
 
 
@@ -311,20 +311,6 @@ def _rpm_repository(
     )
 
 
-def _rpm_package_containerd(releasever: str) -> targets.RPMPackage:
-    """Containerd RPM package."""
-    return _rpm_package(
-        name="containerd",
-        releasever=releasever,
-        sources=[
-            Path("0001-Revert-commit-for-Windows-metrics.patch"),
-            Path("containerd.service"),
-            Path("containerd.toml"),
-            Path(f"v{versions.CONTAINERD_VERSION}.tar.gz"),
-        ],
-    )
-
-
 def _rpm_package_metalk8s_sosreport(releasever: str) -> targets.RPMPackage:
     """SOS report custom plugins RPM package."""
     return _rpm_package(
@@ -339,10 +325,7 @@ def _rpm_package_metalk8s_sosreport(releasever: str) -> targets.RPMPackage:
 
 RPM_TO_BUILD: Dict[str, Dict[str, Tuple[targets.RPMPackage, ...]]] = {
     "scality": {
-        "8": (
-            _rpm_package_containerd("8"),
-            _rpm_package_metalk8s_sosreport("8"),
-        ),
+        "8": (_rpm_package_metalk8s_sosreport("8"),),
     },
 }
 
@@ -381,6 +364,7 @@ def _rpm_package_metalk8s_sosreport(releasever: str) -> targets.RPMPackage:
         _rpm_repository(name="epel", releasever="8"),
         _rpm_repository(name="kubernetes", releasever="8"),
         _rpm_repository(name="saltstack", releasever="8"),
+        _rpm_repository(name="docker-ce", releasever="8"),
     ),
 }
 

buildchain/buildchain/versions.py

@@ -27,9 +27,8 @@
 
 CALICO_VERSION: str = "3.29.3"
 SALT_VERSION: str = "3002.9"
-CONTAINERD_VERSION: str = "1.6.38"
+CONTAINERD_VERSION: str = "2.2.2"
 
-CONTAINERD_RELEASE: str = "1"
 SOSREPORT_RELEASE: str = "2"
 
 
@@ -394,6 +393,7 @@ def rpm_full_name(self) -> str:
         # Pinned packages
         PackageVersion(name="kubectl", version=K8S_VERSION),
         PackageVersion(name="kubelet", version=K8S_VERSION),
+        PackageVersion(name="containerd.io", version=CONTAINERD_VERSION),
         # Latest packages
         PackageVersion(name="coreutils"),
         PackageVersion(name="cri-tools"),
@@ -419,11 +419,6 @@ def rpm_full_name(self) -> str:
     ),
     "redhat": {
         "8": (
-            PackageVersion(
-                name="containerd",
-                version=CONTAINERD_VERSION,
-                release=f"{CONTAINERD_RELEASE}.el8",
-            ),
             PackageVersion(name="container-selinux"),
             PackageVersion(name="iptables-ebtables", override="ebtables"),
             PackageVersion(

packages/redhat/8/Dockerfile

@@ -30,13 +30,3 @@ RUN dnf install -y --setopt=skip_missing_names_on_install=False \
         libseccomp-devel \
         && \
     dnf clean all
-
-# To build containerd
-RUN curl -ORL https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz \
-    && tar xzvf go${GO_VERSION}.linux-amd64.tar.gz \
-    && rm go${GO_VERSION}.linux-amd64.tar.gz \
-    && mv go /usr/local \
-    && ln -s $GOROOT/bin/go /usr/local/bin/go \
-    && ln -s $GOROOT/bin/gofmt /usr/local/bin/gofmt \
-    && go install github.com/cpuguy83/go-md2man/v2@v2.0.2 \
-    && ln -s $GOPATH/bin/go-md2man /usr/local/bin/go-md2man