From a1d5ffb96bb1f695d92879d64ff1cb2225b2249a Mon Sep 17 00:00:00 2001 From: Daniel Lipovetsky Date: Tue, 30 Apr 2019 11:50:06 -0700 Subject: [PATCH] Set Kubernetes version to v1.12.8, CoreDNS version to v1.2.2 --- cmd/workaround_kubeadm_issue_857.go | 2 +- constants/constants.go | 4 ++-- utils/images.go | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/workaround_kubeadm_issue_857.go b/cmd/workaround_kubeadm_issue_857.go index 6145332..156d2fa 100644 --- a/cmd/workaround_kubeadm_issue_857.go +++ b/cmd/workaround_kubeadm_issue_857.go @@ -126,7 +126,7 @@ func isPatchedKubeProxyDaemonSet() (bool, error) { } func patchKubeProxyDaemonSet() error { - patchWithKubeProxyVersion := fmt.Sprintf(patchTemplate, fmt.Sprintf("k8s.gcr.io/kube-proxy-amd64:%s", constants.KubernetesVersion)) + patchWithKubeProxyVersion := fmt.Sprintf(patchTemplate, fmt.Sprintf("k8s.gcr.io/kube-proxy:%s", constants.KubernetesVersion)) name := "/bin/sh" arg := fmt.Sprintf("%s --kubeconfig=%s --namespace=kube-system patch --type=json daemonset kube-proxy --patch='%s'", filepath.Join(constants.BaseInstallDir, constants.KubectlFilename), constants.AdminKubeconfigFile, patchWithKubeProxyVersion) diff --git a/constants/constants.go b/constants/constants.go index e8ab10b..6289209 100644 --- a/constants/constants.go +++ b/constants/constants.go @@ -8,7 +8,7 @@ import ( ) const ( - KubernetesVersion = "v1.11.9" + KubernetesVersion = "v1.12.8" CNIVersion = "v0.6.0" BaseInstallDir = "/opt/bin" CNIBaseDir = "/opt/cni/bin" @@ -22,7 +22,7 @@ const ( DefaultDNSDomain = "cluster.local" DefaultRouterID = 42 KubeadmConfig = "/tmp/kubeadm.yaml" - CoreDNSVersion = "1.1.3" + CoreDNSVersion = "1.2.2" PauseContainerVersion = "3.1" KeepalivedImage = "platform9/keepalived:v2.0.4" CacheDir = "/var/cache/nodeadm/" diff --git a/utils/images.go b/utils/images.go index 1594663..c8ff658 100644 --- a/utils/images.go +++ b/utils/images.go @@ -8,10 +8,10 @@ import ( var DOCKER_IMAGES = []string{ constants.KeepalivedImage, - fmt.Sprintf("k8s.gcr.io/kube-apiserver-amd64:%s", constants.KubernetesVersion), - fmt.Sprintf("k8s.gcr.io/kube-controller-manager-amd64:%s", constants.KubernetesVersion), - fmt.Sprintf("k8s.gcr.io/kube-scheduler-amd64:%s", constants.KubernetesVersion), - fmt.Sprintf("k8s.gcr.io/kube-proxy-amd64:%s", constants.KubernetesVersion), + fmt.Sprintf("k8s.gcr.io/kube-apiserver:%s", constants.KubernetesVersion), + fmt.Sprintf("k8s.gcr.io/kube-controller-manager:%s", constants.KubernetesVersion), + fmt.Sprintf("k8s.gcr.io/kube-scheduler:%s", constants.KubernetesVersion), + fmt.Sprintf("k8s.gcr.io/kube-proxy:%s", constants.KubernetesVersion), fmt.Sprintf("k8s.gcr.io/coredns:%s", constants.CoreDNSVersion), fmt.Sprintf("quay.io/coreos/flannel:%s-amd64", constants.FlannelVersion), fmt.Sprintf("k8s.gcr.io/pause:%s", constants.PauseContainerVersion),