From 27610aa87f261cb3452bf56aaa62e464b21b1038 Mon Sep 17 00:00:00 2001 From: Kinara Shah Date: Mon, 13 Feb 2023 13:46:30 -0800 Subject: [PATCH 1/2] use custom kubelet from rancher/kubernetes --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 15dd7d3..40bc2c0 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 b2e49e6a290afc531f740786289941c5f7778622 Mon Sep 17 00:00:00 2001 From: Kinara Shah Date: Wed, 22 Feb 2023 09:16:52 -0800 Subject: [PATCH 2/2] download kubelet from release tag --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 40bc2c0..7c8dff1 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