Skip to content

Commit

Permalink
manifest-ocp-rhel-9.6: get toolbox from ART plashet
Browse files Browse the repository at this point in the history
RHCOS is trying to move to a point where all container tool
packages come from RHEL instead of the ART plashet[0]. This is part
of the effort to have a RHEL only bootstrap image and a layered container
image for the node. Unfortunately there is already a package in RHEL
called toolbox which conflicts with the RHCOS toolbox.

Ensure that RHCOS gets the RHCOS toolbox by only getting the package
from the ART plashet.

[0] https://issues.redhat.com/browse/RHELPLAN-170883
  • Loading branch information
mike-nguyen committed Jan 22, 2025
1 parent d84188a commit cc14ffc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions manifest-ocp-rhel-9.4.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,4 @@ repo-packages:
- cri-tools
- openshift-clients
- openshift-kubelet
- toolbox
4 changes: 3 additions & 1 deletion manifest-ocp-rhel-9.6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ repo-packages:
- podman
- runc
- skopeo
- toolbox
- repo: rhel-9.6-appstream
packages:
- ignition
- repo: rhel-9.6-server-ose-4.19
packages:
- toolbox
1 change: 0 additions & 1 deletion packages-rhcos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ packages:
- nss-altfiles
- ostree
- rpm-ostree
- toolbox
# for kdump:
# https://github.com/coreos/fedora-coreos-tracker/issues/622
- kexec-tools

0 comments on commit cc14ffc

Please sign in to comment.