From f4d8f258a11ff214a80274e303df118c6d2281c9 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 17 Apr 2023 13:56:09 -0700 Subject: [PATCH] CI: Fix incorrect preload images --- hack/jenkins/preload_generation.sh | 1 + .../kubeadm_constants/update_kubeadm_constants.go | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hack/jenkins/preload_generation.sh b/hack/jenkins/preload_generation.sh index 2aeddd3aaf..459f178bfa 100755 --- a/hack/jenkins/preload_generation.sh +++ b/hack/jenkins/preload_generation.sh @@ -25,5 +25,6 @@ source ./hack/jenkins/installers/check_install_linux_crons.sh # Make sure the right golang version is installed based on Makefile ./hack/jenkins/installers/check_install_golang.sh /usr/local +make update-kubeadm-constants make upload-preloaded-images-tar make clean diff --git a/hack/update/kubeadm_constants/update_kubeadm_constants.go b/hack/update/kubeadm_constants/update_kubeadm_constants.go index 46e08d0cd5..ced262b9a7 100644 --- a/hack/update/kubeadm_constants/update_kubeadm_constants.go +++ b/hack/update/kubeadm_constants/update_kubeadm_constants.go @@ -24,6 +24,7 @@ import ( "net/http" "os" "os/exec" + "runtime" "strings" "text/template" "time" @@ -38,8 +39,8 @@ import ( const ( // default context timeout cxTimeout = 5 * time.Minute - kubeadmReleaseURL = "https://dl.k8s.io/release/%s/bin/linux/amd64/kubeadm" - kubeadmBinaryName = "kubeadm-linux-amd64-%s" + kubeadmReleaseURL = "https://dl.k8s.io/release/%s/bin/linux/%s/kubeadm" + kubeadmBinaryName = "kubeadm-linux-%s-%s" minikubeConstantsFilePath = "pkg/minikube/constants/constants_kubeadm_images.go" kubeadmImagesTemplate = ` {{- range $version, $element := .}} @@ -109,8 +110,9 @@ func main() { } func getKubeadmImagesMapString(version string) (string, error) { - url := fmt.Sprintf(kubeadmReleaseURL, version) - fileName := fmt.Sprintf(kubeadmBinaryName, version) + arch := runtime.GOARCH + url := fmt.Sprintf(kubeadmReleaseURL, version, arch) + fileName := fmt.Sprintf(kubeadmBinaryName, arch, version) if err := downloadFile(url, fileName); err != nil { klog.Errorf("failed to download kubeadm binary %s", err.Error()) return "", err