From e17b57a98f063df38fa8f1f4816c46330e317cdb Mon Sep 17 00:00:00 2001
From: Aashish Radhakrishnan <aaradhak@redhat.com>
Date: Wed, 2 Sep 2026 14:06:27 -0700
Subject: [PATCH] OCPBUGS-115309: Re-enable sandboxed-containers extension for
 5.0

KATA-4726 made kata-containers available again for RHCOS 9.8 and 10.2.
Restore the sandboxed-containers extension in those definitions so 5.0
builds can ship it.
---
 extensions/rhel-10.2.yaml | 21 +++++++++------------
 extensions/rhel-9.8.yaml  | 21 +++++++++------------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/extensions/rhel-10.2.yaml b/extensions/rhel-10.2.yaml
index 458d92f8..b81e50e4 100644
--- a/extensions/rhel-10.2.yaml
+++ b/extensions/rhel-10.2.yaml
@@ -46,18 +46,15 @@ extensions:
       - kernel-rt-modules-core
       - kernel-rt-modules-extra
       - kernel-rt-devel
-### XXX: Drop kata until it can be in all the repos it needs to be in
-### for us to compose extensions.
-###
-### https://github.com/openshift/machine-config-operator/pull/2456
-### https://github.com/openshift/enhancements/blob/master/enhancements/sandboxed-containers/sandboxed-containers-tech-preview.md
-### GRPA-3123
-##sandboxed-containers:
-##  architectures:
-##    - x86_64
-##    - s390x
-##  packages:
-##    - kata-containers
+  # https://github.com/openshift/machine-config-operator/pull/2456
+  # https://github.com/openshift/enhancements/blob/master/enhancements/sandboxed-containers/sandboxed-containers-tech-preview.md
+  # GRPA-3123
+  sandboxed-containers:
+    architectures:
+      - x86_64
+      - s390x
+    packages:
+      - kata-containers
   # https://issues.redhat.com/browse/COS-2402
   kernel-64k:
     architectures:
diff --git a/extensions/rhel-9.8.yaml b/extensions/rhel-9.8.yaml
index 814996d2..d9a005c7 100644
--- a/extensions/rhel-9.8.yaml
+++ b/extensions/rhel-9.8.yaml
@@ -47,18 +47,15 @@ extensions:
       - kernel-rt-modules-core
       - kernel-rt-modules-extra
       - kernel-rt-devel
-### XXX: Drop kata until it can be in all the repos it needs to be in
-### for us to compose extensions.
-###
-### https://github.com/openshift/machine-config-operator/pull/2456
-### https://github.com/openshift/enhancements/blob/master/enhancements/sandboxed-containers/sandboxed-containers-tech-preview.md
-### GRPA-3123
-##sandboxed-containers:
-##  architectures:
-##    - x86_64
-##    - s390x
-##  packages:
-##    - kata-containers
+  # https://github.com/openshift/machine-config-operator/pull/2456
+  # https://github.com/openshift/enhancements/blob/master/enhancements/sandboxed-containers/sandboxed-containers-tech-preview.md
+  # GRPA-3123
+  sandboxed-containers:
+    architectures:
+      - x86_64
+      - s390x
+    packages:
+      - kata-containers
   # https://issues.redhat.com/browse/COS-2402
   kernel-64k:
     architectures: