From 9ec14f4c41d75d0a923a1767cefd9463f81b30b1 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 13 Jan 2022 14:44:30 -0800 Subject: [PATCH 1/2] ignore adding kube images to kubeadm constants --- .../update_kubeadm_constants.go | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/hack/update/kubeadm_constants/update_kubeadm_constants.go b/hack/update/kubeadm_constants/update_kubeadm_constants.go index ae182c5749..22b58fc50f 100644 --- a/hack/update/kubeadm_constants/update_kubeadm_constants.go +++ b/hack/update/kubeadm_constants/update_kubeadm_constants.go @@ -136,10 +136,13 @@ func formatKubeadmImageList(version, data string) (string, error) { lines := strings.Split(data, "\n") for _, line := range lines { imageTag := strings.Split(line, ":") - if len(imageTag) == 2 { - // removing the repo from image name - imageName := strings.Split(imageTag[0], "/") - imageTag[0] = strings.Join(imageName[1:], "/") + if len(imageTag) != 2 { + continue + } + // removing the repo from image name + imageName := strings.Split(imageTag[0], "/") + imageTag[0] = strings.Join(imageName[1:], "/") + if !isKubeImage(imageTag[0]) { templateData[majorMinorVersion][imageTag[0]] = imageTag[1] } } @@ -159,6 +162,16 @@ func formatKubeadmImageList(version, data string) (string, error) { return bytesBuffer.String(), nil } +func isKubeImage(name string) bool { + kubeImages := map[string]bool{ + "kube-apiserver": true, + "kube-controller-manager": true, + "kube-proxy": true, + "kube-scheduler": true, + } + return kubeImages[name] +} + func downloadFile(url, fileName string) error { file, err := os.Create(fileName) if err != nil { From dd2a7ae9d2f3175f734418e88bc6e46a28c9a707 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 13 Jan 2022 23:06:15 +0000 Subject: [PATCH 2/2] update constants file --- .../constants/constants_kubeadm_images.go | 140 ++++++------------ 1 file changed, 42 insertions(+), 98 deletions(-) diff --git a/pkg/minikube/constants/constants_kubeadm_images.go b/pkg/minikube/constants/constants_kubeadm_images.go index b7f8fcf07b..f99fa6e295 100644 --- a/pkg/minikube/constants/constants_kubeadm_images.go +++ b/pkg/minikube/constants/constants_kubeadm_images.go @@ -19,130 +19,74 @@ package constants var ( KubeadmImages = map[string]map[string]string{ "v1.24": { - "coredns/coredns": "v1.8.6", - "etcd": "3.5.1-0", - "kube-apiserver": "v1.23.1", - "kube-controller-manager": "v1.23.1", - "kube-proxy": "v1.23.1", - "kube-scheduler": "v1.23.1", - "pause": "3.6", + "coredns/coredns": "v1.8.6", + "etcd": "3.5.1-0", + "pause": "3.6", }, "v1.23": { - "coredns/coredns": "v1.8.6", - "etcd": "3.5.1-0", - "kube-apiserver": "v1.23.1", - "kube-controller-manager": "v1.23.1", - "kube-proxy": "v1.23.1", - "kube-scheduler": "v1.23.1", - "pause": "3.6", + "coredns/coredns": "v1.8.6", + "etcd": "3.5.1-0", + "pause": "3.6", }, "v1.22": { - "coredns/coredns": "v1.8.4", - "etcd": "3.5.0-0", - "kube-apiserver": "v1.22.4", - "kube-controller-manager": "v1.22.4", - "kube-proxy": "v1.22.4", - "kube-scheduler": "v1.22.4", - "pause": "3.5", + "coredns/coredns": "v1.8.4", + "etcd": "3.5.0-0", + "pause": "3.5", }, "v1.21": { - "coredns/coredns": "v1.8.0", - "etcd": "3.4.13-0", - "kube-apiserver": "v1.21.6", - "kube-controller-manager": "v1.21.6", - "kube-proxy": "v1.21.6", - "kube-scheduler": "v1.21.6", - "pause": "3.4.1", + "coredns/coredns": "v1.8.0", + "etcd": "3.4.13-0", + "pause": "3.4.1", }, "v1.20": { - "coredns": "1.7.0", - "etcd": "3.4.13-0", - "kube-apiserver": "v1.20.12", - "kube-controller-manager": "v1.20.12", - "kube-proxy": "v1.20.12", - "kube-scheduler": "v1.20.12", - "pause": "3.2", + "coredns": "1.7.0", + "etcd": "3.4.13-0", + "pause": "3.2", }, "v1.19": { - "coredns": "1.7.0", - "etcd": "3.4.9-1", - "kube-apiserver": "v1.19.16", - "kube-controller-manager": "v1.19.16", - "kube-proxy": "v1.19.16", - "kube-scheduler": "v1.19.16", - "pause": "3.2", + "coredns": "1.7.0", + "etcd": "3.4.9-1", + "pause": "3.2", }, "v1.18": { - "coredns": "1.6.7", - "etcd": "3.4.3-0", - "kube-apiserver": "v1.18.20", - "kube-controller-manager": "v1.18.20", - "kube-proxy": "v1.18.20", - "kube-scheduler": "v1.18.20", - "pause": "3.2", + "coredns": "1.6.7", + "etcd": "3.4.3-0", + "pause": "3.2", }, "v1.17": { - "coredns": "1.6.5", - "etcd": "3.4.3-0", - "kube-apiserver": "v1.17.17", - "kube-controller-manager": "v1.17.17", - "kube-proxy": "v1.17.17", - "kube-scheduler": "v1.17.17", - "pause": "3.1", + "coredns": "1.6.5", + "etcd": "3.4.3-0", + "pause": "3.1", }, "v1.16": { - "coredns": "1.6.2", - "etcd": "3.3.15-0", - "kube-apiserver": "v1.16.15", - "kube-controller-manager": "v1.16.15", - "kube-proxy": "v1.16.15", - "kube-scheduler": "v1.16.15", - "pause": "3.1", + "coredns": "1.6.2", + "etcd": "3.3.15-0", + "pause": "3.1", }, "v1.15": { - "coredns": "1.3.1", - "etcd": "3.3.10", - "kube-apiserver": "v1.15.12", - "kube-controller-manager": "v1.15.12", - "kube-proxy": "v1.15.12", - "kube-scheduler": "v1.15.12", - "pause": "3.1", + "coredns": "1.3.1", + "etcd": "3.3.10", + "pause": "3.1", }, "v1.14": { - "coredns": "1.3.1", - "etcd": "3.3.10", - "kube-apiserver": "v1.14.10", - "kube-controller-manager": "v1.14.10", - "kube-proxy": "v1.14.10", - "kube-scheduler": "v1.14.10", - "pause": "3.1", + "coredns": "1.3.1", + "etcd": "3.3.10", + "pause": "3.1", }, "v1.13": { - "coredns": "1.2.6", - "etcd": "3.2.24", - "kube-apiserver": "v1.13.12", - "kube-controller-manager": "v1.13.12", - "kube-proxy": "v1.13.12", - "kube-scheduler": "v1.13.12", - "pause": "3.1", + "coredns": "1.2.6", + "etcd": "3.2.24", + "pause": "3.1", }, "v1.12": { - "coredns": "1.2.2", - "etcd": "3.2.24", - "kube-apiserver": "v1.22.3", - "kube-controller-manager": "v1.22.3", - "kube-proxy": "v1.22.3", - "kube-scheduler": "v1.22.3", - "pause": "3.1", + "coredns": "1.2.2", + "etcd": "3.2.24", + "pause": "3.1", }, "v1.11": { - "coredns": "1.1.3", - "etcd-amd64": "3.2.18", - "kube-apiserver-amd64": "v1.11.10", - "kube-controller-manager-amd64": "v1.11.10", - "kube-proxy-amd64": "v1.11.10", - "kube-scheduler-amd64": "v1.11.10", - "pause-amd64": "3.1", + "coredns": "1.1.3", + "etcd-amd64": "3.2.18", + "pause-amd64": "3.1", }, } )