Skip to content

Commit

Permalink
Set Kubernetes version to v1.12.8, CoreDNS version to v1.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Lipovetsky authored and dlipovetsky committed May 7, 2019
1 parent d2e502f commit a1d5ffb
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cmd/workaround_kubeadm_issue_857.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions constants/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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/"
Expand Down
8 changes: 4 additions & 4 deletions utils/images.go
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down

0 comments on commit a1d5ffb

Please sign in to comment.