containerd2: provide and obsolete moby-containerd-cc (#14364)

Signed-off-by: Saul Paredes <[email protected]>

Author: Redent0r

SPECS/containerd2/containerd2.spec

@@ -5,7 +5,7 @@
 Summary: Industry-standard container runtime
 Name: %{upstream_name}2
 Version: 2.0.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: ASL 2.0
 Group: Tools/Container
 URL: https://www.containerd.io
@@ -40,6 +40,10 @@ Obsoletes: containerd < %{version}-%{release}
 Provides: moby-containerd = %{version}-%{release}
 Obsoletes: moby-containerd < %{version}-%{release}
 
+# This package replaces moby-containerd-cc
+Provides: moby-containerd-cc = %{version}-%{release}
+Obsoletes: moby-containerd-cc < %{version}-%{release}
+
 %description
 containerd is an industry-standard container runtime with an emphasis on
 simplicity, robustness and portability. It is available as a daemon for Linux
@@ -94,6 +98,9 @@ fi
 %dir /opt/containerd/lib
 
 %changelog
+* Mon Jul 21 2025 Saul Paredes <[email protected]> - 2.0.0-13
+- Add "Provides/Obsoletes:" to shift all installs of moby-containerd-cc to containerd2
+
 * Tue Jun 10 2025 Mitch Zhu <[email protected]> - 2.0.0-12
 - Add updated tardev-snapshotter support patch
 

SPECS/kata-containers-cc/kata-containers-cc.spec

@@ -3,7 +3,7 @@
 
 Name:         kata-containers-cc
 Version:      3.15.0.aks0
-Release:      2%{?dist}
+Release:      3%{?dist}
 Summary:      Kata Confidential Containers package developed for Confidential Containers on AKS
 License:      ASL 2.0
 URL:          https://github.com/microsoft/kata-containers
@@ -28,7 +28,7 @@ BuildRequires:  fuse-devel
 # kernel-uvm is required for debuggability, exercising confidential guest (confidential_guest=true)
 # code paths without actual SEV SNP enablement (sev_snp_guest=false)
 Requires:  kernel-uvm
-Requires:  moby-containerd-cc
+Requires:  containerd2
 # Must match the version specified by the `assets.virtiofsd.version` field in the source's versions.yaml.
 Requires:  virtiofsd = 1.8.0
 
@@ -150,6 +150,9 @@ fi
 %{tools_pkg}/tools/osbuilder/node-builder/azure-linux/agent-install/usr/lib/systemd/system/kata-agent.service
 
 %changelog
+* Mon Jul 21 2025 Saul Paredes <[email protected]> - 3.15.0.aks0-3
+- Update dependency on containerd2
+
 * Fri Jun 13 2025 Kavya Sree Kaitepalli <[email protected]> - 3.15.0.aks0-2
 - Bump release to rebuild with rust
 

SPECS/kata-containers/kata-containers.spec

@@ -2,7 +2,7 @@
 
 Name:           kata-containers
 Version:        3.18.0.kata0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Kata Containers package developed for Pod Sandboxing on AKS
 License:        ASL 2.0
 URL:            https://github.com/microsoft/kata-containers
@@ -26,6 +26,7 @@ BuildRequires:  cmake
 Requires:       kernel-uvm
 # Must match the version specified by the `assets.virtiofsd.version` field in the source's versions.yaml.
 Requires:       virtiofsd = 1.8.0
+Requires:       containerd2
 
 %description
 The Kata Containers package ships the Kata components for Pod Sandboxing on AKS.
@@ -114,6 +115,9 @@ popd
 %{tools_pkg}/tools/osbuilder/node-builder/azure-linux/agent-install/usr/lib/systemd/system/kata-agent.service
 
 %changelog
+* Mon Jul 21 2025 Saul Paredes <[email protected]> - 3.18.0.kata0-2
+- Add dependency on containerd2
+
 * Wed Jun 25 2025 CBL-Mariner Servicing Account <[email protected]> - 3.18.0.kata0-1
 - Auto-upgrade to 3.18.0.kata0