Merge branch 'improvement/mk8s-151-migrate-to-containerd.io' into q/133.0

Author: bert-e

.github/workflows/lifecycle-dev.yaml

@@ -58,6 +58,9 @@ jobs:
     needs:
       - get-dev-artifacts-url
     uses: ./.github/workflows/downgrade-test.yaml
+    # NOTE: Downgrade is not supported from 133 to 132 (see CHANGELOG.md)
+    # Should be removed in `development/134.0`
+    if: ${{ ! startsWith(inputs.dev-branch, 'development/132') }}
     secrets: inherit
     with:
       from-artifacts-url: ${{ inputs.artifacts-url }}

.github/workflows/lifecycle-promoted.yaml

@@ -208,6 +208,9 @@ jobs:
 
   promoted-downgrade:
     uses: ./.github/workflows/downgrade-test.yaml
+    # NOTE: Downgrade is not supported from 133 to 132 (see CHANGELOG.md)
+    # Should be removed in `development/134.0`
+    if: ${{ ! startsWith(inputs.promoted-version, '132.') }}
     secrets: inherit
     with:
       from-artifacts-url: ${{ inputs.artifacts-url }}

.pylint-dict

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

BUMPING.md

@@ -148,7 +148,7 @@ This guide is applied for both `metalk8s-operator` and `storage-operator`.
 
 ## Containerd
 
-Instructions to bump Containerd version are in its [spec file](./packages/redhat/common/containerd.spec)
+The version just needs to be updated in `buildchain/buildchain/versions.py`.
 
 ## Update the sls state
 

CHANGELOG.md

@@ -2,11 +2,21 @@
 
 ## Release 133.0.0 (in development)
 
+### Breaking changes
+
+- Due to the migration from our own RPM for containerd v1 to the official
+  containerd.io RPM from docker.io, downgrading from 133 to 132 will not be
+  possible.
+
 ### Enhancements
 
 - Bump Kubernetes version to [1.33.7](https://github.com/kubernetes/kubernetes/releases/tag/v1.33.7)
   (PR[#4769](https://github.com/scality/metalk8s/pull/4769))
 
+- Move from our own RPM for containerd v1 to the official containerd.io RPM from docker.io
+  to version [v2.2.2](https://github.com/containerd/containerd/releases/tag/v2.2.2)
+  (PR[#4821](https://github.com/scality/metalk8s/pull/4821))
+
 - Bump etcd version to [3.5.26](https://github.com/etcd-io/etcd/releases/tag/v3.5.26)
   (PR[#4769](https://github.com/scality/metalk8s/pull/4769))
 
@@ -30,6 +40,10 @@
   and Loki image version to [3.6.5](https://github.com/grafana/loki/releases/tag/v3.6.5)
   (PR[#4792](https://github.com/scality/metalk8s/pull/4792))
 
+- Configure containerd using `config_path` for registries so that changes of
+  registries mirrors does no longer require a restart of the containerd service
+  (PR[#4821](https://github.com/scality/metalk8s/pull/4821))
+
 - Allow to enable metrics collection for the solutions operators
   (PR[#4813](https://github.com/scality/metalk8s/pull/4813))
 

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"
 
 
@@ -399,6 +398,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"),
@@ -424,11 +424,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