Skip to content

Commit cc14ffc

Browse files
committed
manifest-ocp-rhel-9.6: get toolbox from ART plashet
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
1 parent d84188a commit cc14ffc

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

manifest-ocp-rhel-9.4.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,3 +98,4 @@ repo-packages:
9898
- cri-tools
9999
- openshift-clients
100100
- openshift-kubelet
101+
- toolbox

manifest-ocp-rhel-9.6.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ repo-packages:
9797
- podman
9898
- runc
9999
- skopeo
100-
- toolbox
101100
- repo: rhel-9.6-appstream
102101
packages:
103102
- ignition
103+
- repo: rhel-9.6-server-ose-4.19
104+
packages:
105+
- toolbox

packages-rhcos.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ packages:
1515
- nss-altfiles
1616
- ostree
1717
- rpm-ostree
18-
- toolbox
1918
# for kdump:
2019
# https://github.com/coreos/fedora-coreos-tracker/issues/622
2120
- kexec-tools

0 commit comments

Comments
 (0)