From 5069955d9f85951733624c507746229518ff7b54 Mon Sep 17 00:00:00 2001
From: Kinara Shah <kinara@rancher.com>
Date: Mon, 13 Feb 2023 13:46:30 -0800
Subject: [PATCH 1/3] use custom kubelet from rancher/kubernetes

---
 Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 2c06b77..8c3c104 100644
--- a/Makefile
+++ b/Makefile
@@ -28,11 +28,13 @@ all-push: all-push-images push-manifest
 
 k8s-tars/${K8S_VERSION}/${ARCH}/${K8S_SERVER_TARBALL}:
 	mkdir -p k8s-tars/${K8S_VERSION}/${ARCH}
-	cd k8s-tars/${K8S_VERSION}/${ARCH} && curl -sSLO --retry 5 https://dl.k8s.io/${K8S_VERSION}/${K8S_SERVER_TARBALL}
-
+	cd k8s-tars/${K8S_VERSION}/${ARCH} && curl -sSLO --retry 5 https://dl.k8s.io/${K8S_VERSION}/${K8S_SERVER_TARBALL} \
+	&& curl -sSLO --retry 5 https://github.com/rancher/kubernetes/releases/download/${K8S_VERSION}-rc.1-rancher1/kubelet-${K8S_VERSION}-${ARCH}.tar.gz
+	
 k8s-binaries: k8s-tars/${K8S_VERSION}/${ARCH}/$(K8S_SERVER_TARBALL)
 	mkdir -p ${K8S_STAGING}/k8s-server-untarred
 	tar -xz -C ${K8S_STAGING}/k8s-server-untarred -f "k8s-tars/${K8S_VERSION}/${ARCH}/${K8S_SERVER_TARBALL}"
+	tar -xz -C ${K8S_STAGING}/k8s-server-untarred -f "k8s-tars/${K8S_VERSION}/${ARCH}/kubelet-${K8S_VERSION}-${ARCH}.tar.gz"
 
 	mkdir -p ${K8S_STAGING}/k8s-binaries
 
@@ -41,7 +43,7 @@ k8s-binaries: k8s-tars/${K8S_VERSION}/${ARCH}/$(K8S_SERVER_TARBALL)
 	cp ${K8S_STAGING}/k8s-server-untarred/kubernetes/server/bin/kube-proxy ${K8S_STAGING}/k8s-binaries
 	cp ${K8S_STAGING}/k8s-server-untarred/kubernetes/server/bin/kube-scheduler ${K8S_STAGING}/k8s-binaries
 	cp ${K8S_STAGING}/k8s-server-untarred/kubernetes/server/bin/kubectl ${K8S_STAGING}/k8s-binaries
-	cp ${K8S_STAGING}/k8s-server-untarred/kubernetes/server/bin/kubelet ${K8S_STAGING}/k8s-binaries
+	cp ${K8S_STAGING}/k8s-server-untarred/kubelet ${K8S_STAGING}/k8s-binaries
 	
 	mkdir -p k8s-binaries
 	cp -r ${K8S_STAGING}/k8s-binaries/* k8s-binaries/

From 0b6c8eb3fd3979524c5e4cf3868c04133134f398 Mon Sep 17 00:00:00 2001
From: Kinara Shah <kinara@rancher.com>
Date: Mon, 13 Feb 2023 18:21:01 -0800
Subject: [PATCH 2/3] update hyperkube-base to v0.0.16

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 01552bd..f7efdf1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,3 @@
-FROM rancher/hyperkube-base:v0.0.15
+FROM rancher/hyperkube-base:v0.0.16
 
 COPY k8s-binaries/kube* /usr/local/bin/

From 3f7bbdf7a960a54d106ae68d5829596e1f00b172 Mon Sep 17 00:00:00 2001
From: Kinara Shah <kinara@rancher.com>
Date: Wed, 22 Feb 2023 09:16:52 -0800
Subject: [PATCH 3/3] download kubelet from release tag

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8c3c104..5c07ecf 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ all-push: all-push-images push-manifest
 k8s-tars/${K8S_VERSION}/${ARCH}/${K8S_SERVER_TARBALL}:
 	mkdir -p k8s-tars/${K8S_VERSION}/${ARCH}
 	cd k8s-tars/${K8S_VERSION}/${ARCH} && curl -sSLO --retry 5 https://dl.k8s.io/${K8S_VERSION}/${K8S_SERVER_TARBALL} \
-	&& curl -sSLO --retry 5 https://github.com/rancher/kubernetes/releases/download/${K8S_VERSION}-rc.1-rancher1/kubelet-${K8S_VERSION}-${ARCH}.tar.gz
+	&& curl -sSLO --retry 5 https://github.com/rancher/kubernetes/releases/download/${K8S_VERSION}/kubelet-${K8S_VERSION}-${ARCH}.tar.gz
 	
 k8s-binaries: k8s-tars/${K8S_VERSION}/${ARCH}/$(K8S_SERVER_TARBALL)
 	mkdir -p ${K8S_STAGING}/k8s-server-untarred