manifest: Use cri-o module from Fedora

openshift · Nov 13, 2021 · 5cbde26 · 5cbde26
1 parent 0aca0a6
commit 5cbde26
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/manifest.yaml b/manifest.yaml
@@ -14,11 +14,11 @@ ref: fedora/${basearch}/coreos/okd
 repos:
   - fedora
   - fedora-updates
+  - fedora-modular
+  - fedora-updates-modular
   - updates-archive
   - fedora-coreos-pool
   - copr:copr.fedorainfracloud.org:networkmanager:NetworkManager-1.32
-  - crio
-  - cri-tools
   - okd-rpms
 
 packages:
@@ -33,6 +33,11 @@ packages:
   # User metrics
   - fedora-coreos-pinger
 
+modules:
+  enable:
+    # cri-o and cri-tools
+    - cri-o:1.22
+
 # We include hours/minutes to avoid version number reuse
 automatic-version-prefix: "410.34.<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