From 95bf11147078b5cf48a6ce50121900eef2276f56 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Mon, 26 Feb 2024 09:39:52 -0500 Subject: [PATCH] OCPBUGS-29437: install the smaller openshift-kubelet package The packaging has recently been refactored to offer a kubelet only package, which is all that RHCOS should require. This removes extraneous server binaries kube-apiserver, kube-controller-manager, and kube-scheduler --- manifest-rhel-9.2.yaml | 2 +- manifest-rhel-9.4.yaml | 4 ++-- packages-openshift.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest-rhel-9.2.yaml b/manifest-rhel-9.2.yaml index 63440a91..e4009edf 100644 --- a/manifest-rhel-9.2.yaml +++ b/manifest-rhel-9.2.yaml @@ -127,6 +127,6 @@ repo-packages: - cri-o - cri-tools - openshift-clients - - openshift-hyperkube + - openshift-kubelet # Use legacy coreos/toolbox until we're ready to use containers/toolbox - toolbox diff --git a/manifest-rhel-9.4.yaml b/manifest-rhel-9.4.yaml index de8d2350..1f0fcdd8 100644 --- a/manifest-rhel-9.4.yaml +++ b/manifest-rhel-9.4.yaml @@ -21,7 +21,7 @@ repos: - baseos - appstream - rhel-9.2-fast-datapath - # Include RHCOS 9 repo for oc, hyperkube + # Include RHCOS 9 repo for oc, kubelet - rhel-9.2-server-ose-4.16 # We include hours/minutes to avoid version number reuse @@ -139,4 +139,4 @@ repo-packages: - cri-o - cri-tools - openshift-clients - - openshift-hyperkube + - openshift-kubelet diff --git a/packages-openshift.yaml b/packages-openshift.yaml index 3469fa4e..fece50b5 100644 --- a/packages-openshift.yaml +++ b/packages-openshift.yaml @@ -2,7 +2,7 @@ packages: # The packages below are required by OpenShift/OKD # but are not present in CentOS Stream and RHEL. - cri-o cri-tools conmon-rs - - openshift-clients openshift-hyperkube + - openshift-clients openshift-kubelet - openvswitch3.1 # The packages below are present in CentOS Stream/RHEL, # and depend on one or more of the above.