kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

CI: Fix incorrect preload images

pull/16338/head
Steven Powell 2023-04-17 13:56:09 -07:00
parent 03fa6d3796
commit f4d8f258a1
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/jenkins/preload_generation.sh
View File

@ -25,5 +25,6 @@ source ./hack/jenkins/installers/check_install_linux_crons.sh
# Make sure the right golang version is installed based on Makefile # Make sure the right golang version is installed based on Makefile
./hack/jenkins/installers/check_install_golang.sh /usr/local ./hack/jenkins/installers/check_install_golang.sh /usr/local
make update-kubeadm-constants
make upload-preloaded-images-tar make upload-preloaded-images-tar
make clean make clean

10
hack/update/kubeadm_constants/update_kubeadm_constants.go
View File

@ -24,6 +24,7 @@ import (
"net/http" "net/http"
"os" "os"
"os/exec" "os/exec"
"runtime"
"strings" "strings"
"text/template" "text/template"
"time" "time"
@ -38,8 +39,8 @@ import (
const ( const (
// default context timeout // default context timeout
cxTimeout = 5 * time.Minute cxTimeout = 5 * time.Minute
kubeadmReleaseURL = "https://dl.k8s.io/release/%s/bin/linux/amd64/kubeadm" kubeadmReleaseURL = "https://dl.k8s.io/release/%s/bin/linux/%s/kubeadm"
kubeadmBinaryName = "kubeadm-linux-amd64-%s" kubeadmBinaryName = "kubeadm-linux-%s-%s"
minikubeConstantsFilePath = "pkg/minikube/constants/constants_kubeadm_images.go" minikubeConstantsFilePath = "pkg/minikube/constants/constants_kubeadm_images.go"
kubeadmImagesTemplate = ` kubeadmImagesTemplate = `
{{- range $version, $element := .}} {{- range $version, $element := .}}
@ -109,8 +110,9 @@ func main() {
} }
func getKubeadmImagesMapString(version string) (string, error) { func getKubeadmImagesMapString(version string) (string, error) {
url := fmt.Sprintf(kubeadmReleaseURL, version) arch := runtime.GOARCH
fileName := fmt.Sprintf(kubeadmBinaryName, version) url := fmt.Sprintf(kubeadmReleaseURL, version, arch)
fileName := fmt.Sprintf(kubeadmBinaryName, arch, version)
if err := downloadFile(url, fileName); err != nil { if err := downloadFile(url, fileName); err != nil {
klog.Errorf("failed to download kubeadm binary %s", err.Error()) klog.Errorf("failed to download kubeadm binary %s", err.Error())
return "", err return "", err