manifest: Use cri-o module from Fedora

openshift · Jun 8, 2022 · 67025f3 · 67025f3
1 parent f63369e
commit 67025f3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/crio.repo b/crio.repo
diff --git a/manifest.yaml b/manifest.yaml
@@ -14,8 +14,8 @@ ref: fedora/${basearch}/coreos/okd
 repos:
   - fedora
   - fedora-updates
-  - crio
-  - cri-tools
+  - fedora-modular
+  - fedora-updates-modular
   - okd-rpms
   - updates-archive
 
@@ -31,6 +31,13 @@ packages:
   # User metrics
   - fedora-coreos-pinger
 
+modules:
+  enable:
+    - cri-o:1.24
+  install:
+    # cri-o and cri-tools
+    - cri-o:1.24/default
+
 # We include hours/minutes to avoid version number reuse
 automatic-version-prefix: "411.36.<date:%Y%m%d%H%M>"
 # This ensures we're semver-compatible which OpenShift wants

diff --git a/okd-packages.yaml b/okd-packages.yaml
@@ -4,7 +4,5 @@ packages:
 - qemu-guest-agent
 - glusterfs
 - glusterfs-fuse
-- crio
-- cri-tools
 - openshift-hyperkube
 - openshift-clients