Skip to content

K
k3s
Commit b79765e3 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #40002 from apprenda/kubeadm_dns_1_11_0

Automatic merge from submit-queue (batch tested with PRs 39911, 40002, 39969, 40012, 40009) kubeadm: upgrade kube-dns to 1.11.0. **What this PR does / why we need it**: See kubernetes/dns#25 **Which issue this PR fixes**: fixes kubernetes/kubeadm#121 **Special notes for your reviewer**: /cc @luxas I know this is not the template solution you are looking for but seems to me it's important enough to do this now because of the issues it fixes. Tested manually and it works. `NONE`
parents 6d19340d 262eeea0
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
cmd/kubeadm/app/images/images.go
View file @ b79765e3
...@@ -39,10 +39,8 @@ const ( ...@@ -39,10 +39,8 @@ const (
gcrPrefix = "gcr.io/google_containers" gcrPrefix = "gcr.io/google_containers"
etcdVersion = "3.0.14-kubeadm" etcdVersion = "3.0.14-kubeadm"
kubeDNSVersion = "1.10.1" kubeDNSVersion = "1.11.0"
dnsmasqVersion = "1.10.1" pauseVersion = "3.0"
kubeDNSSidecarVersion = "1.10.1"
pauseVersion = "3.0"
) )
func GetCoreImage(image string, cfg *kubeadmapi.MasterConfiguration, overrideImage string) string { func GetCoreImage(image string, cfg *kubeadmapi.MasterConfiguration, overrideImage string) string {
...@@ -63,8 +61,8 @@ func GetAddonImage(image string) string { ...@@ -63,8 +61,8 @@ func GetAddonImage(image string) string {
repoPrefix := kubeadmapi.GlobalEnvParams.RepositoryPrefix repoPrefix := kubeadmapi.GlobalEnvParams.RepositoryPrefix
return map[string]string{ return map[string]string{
KubeDNSImage: fmt.Sprintf("%s/%s-%s:%s", repoPrefix, KubeDNSImage, runtime.GOARCH, kubeDNSVersion), KubeDNSImage: fmt.Sprintf("%s/%s-%s:%s", repoPrefix, KubeDNSImage, runtime.GOARCH, kubeDNSVersion),
KubeDNSmasqImage: fmt.Sprintf("%s/%s-%s:%s", repoPrefix, KubeDNSmasqImage, runtime.GOARCH, dnsmasqVersion), KubeDNSmasqImage: fmt.Sprintf("%s/%s-%s:%s", repoPrefix, KubeDNSmasqImage, runtime.GOARCH, kubeDNSVersion),
KubeDNSSidecarImage: fmt.Sprintf("%s/%s-%s:%s", repoPrefix, KubeDNSSidecarImage, runtime.GOARCH, kubeDNSSidecarVersion), KubeDNSSidecarImage: fmt.Sprintf("%s/%s-%s:%s", repoPrefix, KubeDNSSidecarImage, runtime.GOARCH, kubeDNSVersion),
Pause: fmt.Sprintf("%s/%s-%s:%s", repoPrefix, Pause, runtime.GOARCH, pauseVersion), Pause: fmt.Sprintf("%s/%s-%s:%s", repoPrefix, Pause, runtime.GOARCH, pauseVersion),
}[image] }[image]
} }
cmd/kubeadm/app/images/images_test.go
View file @ b79765e3
...@@ -88,11 +88,11 @@ func TestGetAddonImage(t *testing.T) { ...@@ -88,11 +88,11 @@ func TestGetAddonImage(t *testing.T) {
}, },
{ {
KubeDNSmasqImage, KubeDNSmasqImage,
fmt.Sprintf("%s/%s-%s:%s", gcrPrefix, KubeDNSmasqImage, runtime.GOARCH, dnsmasqVersion), fmt.Sprintf("%s/%s-%s:%s", gcrPrefix, KubeDNSmasqImage, runtime.GOARCH, kubeDNSVersion),
}, },
{ {
KubeDNSSidecarImage, KubeDNSSidecarImage,
fmt.Sprintf("%s/%s-%s:%s", gcrPrefix, KubeDNSSidecarImage, runtime.GOARCH, kubeDNSSidecarVersion), fmt.Sprintf("%s/%s-%s:%s", gcrPrefix, KubeDNSSidecarImage, runtime.GOARCH, kubeDNSVersion),
}, },
{ {
Pause, Pause,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment