diff --git a/build-node-image.sh b/build-node-image.sh index 00a6a618..3f3f99a1 100755 --- a/build-node-image.sh +++ b/build-node-image.sh @@ -25,7 +25,7 @@ if [ $ID = centos ]; then # this says: "if the line starts with [.*], turn off printing. if the line starts with [our-repo], turn it on." awk "/\[.*\]/{p=0} /\[rhel-9.8-server-ose-4.22\]/{p=1} p" /etc/yum.repos.d/*.repo > /etc/yum.repos.d/okd.repo.tmp sed -i -e 's,\[rhel-9.8-server-ose-4.22\],\[rhel-9.8-server-ose-4.22-okd\],' /etc/yum.repos.d/okd.repo.tmp - echo 'includepkgs=openshift-*,ose-aws-ecr-*,ose-azure-acr-*,ose-gcp-gcr-*,ose-crio-* ' >> /etc/yum.repos.d/okd.repo.tmp + echo 'includepkgs=openshift-*,ose-aws-ecr-*,ose-azure-acr-*,ose-gcp-gcr-*,ose-crio-*,runc ' >> /etc/yum.repos.d/okd.repo.tmp mv /etc/yum.repos.d/okd.repo{.tmp,} fi diff --git a/packages-openshift.yaml b/packages-openshift.yaml index 00057c79..cf23ee4f 100644 --- a/packages-openshift.yaml +++ b/packages-openshift.yaml @@ -62,6 +62,9 @@ packages: - ose-azure-acr-image-credential-provider - ose-gcp-gcr-image-credential-provider - ose-crio-credential-provider + # Override runc version until RHEL version catches up for runc 1.4-3 + # See OCPBUGS-77244 + - runc postprocess: # This is part of e.g. fedora-repos in Fedora; we now want to include it by default