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

Merge pull request #13349 from spowelljr/ignoreKubeImages 

Ignore adding kube images to kubeadm constants file
pull/13455/head
Medya Ghazizadeh 2022-01-24 15:42:04 -08:00 committed by GitHub
parent 769e1bd55b dd2a7ae9d2
commit 3ae97a1425
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 59 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,10 +136,13 @@ func formatKubeadmImageList(version, data string) (string, error) {
lines := strings.Split(data, "\n") lines := strings.Split(data, "\n")
for _, line := range lines { for _, line := range lines {
imageTag := strings.Split(line, ":") imageTag := strings.Split(line, ":")
if len(imageTag) == 2 { if len(imageTag) != 2 {
// removing the repo from image name continue
imageName := strings.Split(imageTag[0], "/") }
imageTag[0] = strings.Join(imageName[1:], "/") // 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] templateData[majorMinorVersion][imageTag[0]] = imageTag[1]
} }
} }
@ -159,6 +162,16 @@ func formatKubeadmImageList(version, data string) (string, error) {
return bytesBuffer.String(), nil 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 { func downloadFile(url, fileName string) error {
file, err := os.Create(fileName) file, err := os.Create(fileName)
if err != nil { if err != nil {

140
pkg/minikube/constants/constants_kubeadm_images.go
View File

@ -19,130 +19,74 @@ package constants
var ( var (
KubeadmImages = map[string]map[string]string{ KubeadmImages = map[string]map[string]string{
"v1.24": { "v1.24": {
"coredns/coredns": "v1.8.6", "coredns/coredns": "v1.8.6",
"etcd": "3.5.1-0", "etcd": "3.5.1-0",
"kube-apiserver": "v1.23.1", "pause": "3.6",
"kube-controller-manager": "v1.23.1",
"kube-proxy": "v1.23.1",
"kube-scheduler": "v1.23.1",
"pause": "3.6",
}, },
"v1.23": { "v1.23": {
"coredns/coredns": "v1.8.6", "coredns/coredns": "v1.8.6",
"etcd": "3.5.1-0", "etcd": "3.5.1-0",
"kube-apiserver": "v1.23.1", "pause": "3.6",
"kube-controller-manager": "v1.23.1",
"kube-proxy": "v1.23.1",
"kube-scheduler": "v1.23.1",
"pause": "3.6",
}, },
"v1.22": { "v1.22": {
"coredns/coredns": "v1.8.4", "coredns/coredns": "v1.8.4",
"etcd": "3.5.0-0", "etcd": "3.5.0-0",
"kube-apiserver": "v1.22.4", "pause": "3.5",
"kube-controller-manager": "v1.22.4",
"kube-proxy": "v1.22.4",
"kube-scheduler": "v1.22.4",
"pause": "3.5",
}, },
"v1.21": { "v1.21": {
"coredns/coredns": "v1.8.0", "coredns/coredns": "v1.8.0",
"etcd": "3.4.13-0", "etcd": "3.4.13-0",
"kube-apiserver": "v1.21.6", "pause": "3.4.1",
"kube-controller-manager": "v1.21.6",
"kube-proxy": "v1.21.6",
"kube-scheduler": "v1.21.6",
"pause": "3.4.1",
}, },
"v1.20": { "v1.20": {
"coredns": "1.7.0", "coredns": "1.7.0",
"etcd": "3.4.13-0", "etcd": "3.4.13-0",
"kube-apiserver": "v1.20.12", "pause": "3.2",
"kube-controller-manager": "v1.20.12",
"kube-proxy": "v1.20.12",
"kube-scheduler": "v1.20.12",
"pause": "3.2",
}, },
"v1.19": { "v1.19": {
"coredns": "1.7.0", "coredns": "1.7.0",
"etcd": "3.4.9-1", "etcd": "3.4.9-1",
"kube-apiserver": "v1.19.16", "pause": "3.2",
"kube-controller-manager": "v1.19.16",
"kube-proxy": "v1.19.16",
"kube-scheduler": "v1.19.16",
"pause": "3.2",
}, },
"v1.18": { "v1.18": {
"coredns": "1.6.7", "coredns": "1.6.7",
"etcd": "3.4.3-0", "etcd": "3.4.3-0",
"kube-apiserver": "v1.18.20", "pause": "3.2",
"kube-controller-manager": "v1.18.20",
"kube-proxy": "v1.18.20",
"kube-scheduler": "v1.18.20",
"pause": "3.2",
}, },
"v1.17": { "v1.17": {
"coredns": "1.6.5", "coredns": "1.6.5",
"etcd": "3.4.3-0", "etcd": "3.4.3-0",
"kube-apiserver": "v1.17.17", "pause": "3.1",
"kube-controller-manager": "v1.17.17",
"kube-proxy": "v1.17.17",
"kube-scheduler": "v1.17.17",
"pause": "3.1",
}, },
"v1.16": { "v1.16": {
"coredns": "1.6.2", "coredns": "1.6.2",
"etcd": "3.3.15-0", "etcd": "3.3.15-0",
"kube-apiserver": "v1.16.15", "pause": "3.1",
"kube-controller-manager": "v1.16.15",
"kube-proxy": "v1.16.15",
"kube-scheduler": "v1.16.15",
"pause": "3.1",
}, },
"v1.15": { "v1.15": {
"coredns": "1.3.1", "coredns": "1.3.1",
"etcd": "3.3.10", "etcd": "3.3.10",
"kube-apiserver": "v1.15.12", "pause": "3.1",
"kube-controller-manager": "v1.15.12",
"kube-proxy": "v1.15.12",
"kube-scheduler": "v1.15.12",
"pause": "3.1",
}, },
"v1.14": { "v1.14": {
"coredns": "1.3.1", "coredns": "1.3.1",
"etcd": "3.3.10", "etcd": "3.3.10",
"kube-apiserver": "v1.14.10", "pause": "3.1",
"kube-controller-manager": "v1.14.10",
"kube-proxy": "v1.14.10",
"kube-scheduler": "v1.14.10",
"pause": "3.1",
}, },
"v1.13": { "v1.13": {
"coredns": "1.2.6", "coredns": "1.2.6",
"etcd": "3.2.24", "etcd": "3.2.24",
"kube-apiserver": "v1.13.12", "pause": "3.1",
"kube-controller-manager": "v1.13.12",
"kube-proxy": "v1.13.12",
"kube-scheduler": "v1.13.12",
"pause": "3.1",
}, },
"v1.12": { "v1.12": {
"coredns": "1.2.2", "coredns": "1.2.2",
"etcd": "3.2.24", "etcd": "3.2.24",
"kube-apiserver": "v1.22.3", "pause": "3.1",
"kube-controller-manager": "v1.22.3",
"kube-proxy": "v1.22.3",
"kube-scheduler": "v1.22.3",
"pause": "3.1",
}, },
"v1.11": { "v1.11": {
"coredns": "1.1.3", "coredns": "1.1.3",
"etcd-amd64": "3.2.18", "etcd-amd64": "3.2.18",
"kube-apiserver-amd64": "v1.11.10", "pause-amd64": "3.1",
"kube-controller-manager-amd64": "v1.11.10",
"kube-proxy-amd64": "v1.11.10",
"kube-scheduler-amd64": "v1.11.10",
"pause-amd64": "3.1",
}, },
} }
) )