Upgrade to k8s from 1.17.4 to 1.17.9

This commit upgrades the k8s version to 1.17.9. This upgrade is motivated in order to include the upstream fixes for bsc#1173984 and CVE-2020-8557. (cherry picked from commit 1ce1321)
mmnelemane · Jul 17, 2020 · 48f33d6 · 48f33d6
1 parent 958ef83
commit 48f33d6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/ci/infra/testrunner/tests/utils.py b/ci/infra/testrunner/tests/utils.py
@@ -3,7 +3,7 @@
 import yaml
 
 PREVIOUS_VERSION = "1.16.2"
-CURRENT_VERSION = "1.17.4"
+CURRENT_VERSION = "1.17.9"
 
 
 def check_nodes_ready(kubectl):

diff --git a/internal/pkg/skuba/kubernetes/versions.go b/internal/pkg/skuba/kubernetes/versions.go
@@ -85,24 +85,24 @@ type ClusterAddonsKnownVersions = func(clusterVersion *version.Version) AddonsVe
 
 var (
 	supportedVersions = KubernetesVersions{
-		"1.17.4": KubernetesVersion{
+		"1.17.9": KubernetesVersion{
 			ComponentHostVersion: ComponentHostVersion{
-				KubeletVersion:          "1.17.4",
+				KubeletVersion:          "1.17.9",
 				ContainerRuntimeVersion: "1.16.1",
 			},
 			ComponentContainerVersion: ComponentContainerVersion{
-				APIServer:         &ContainerImageTag{Name: "hyperkube", Tag: "v1.17.4"},
-				ControllerManager: &ContainerImageTag{Name: "hyperkube", Tag: "v1.17.4"},
-				Scheduler:         &ContainerImageTag{Name: "hyperkube", Tag: "v1.17.4"},
-				Proxy:             &ContainerImageTag{Name: "hyperkube", Tag: "v1.17.4"},
+				APIServer:         &ContainerImageTag{Name: "hyperkube", Tag: "v1.17.9"},
+				ControllerManager: &ContainerImageTag{Name: "hyperkube", Tag: "v1.17.9"},
+				Scheduler:         &ContainerImageTag{Name: "hyperkube", Tag: "v1.17.9"},
+				Proxy:             &ContainerImageTag{Name: "hyperkube", Tag: "v1.17.9"},
 				Etcd:              &ContainerImageTag{Name: "etcd", Tag: "3.4.3"},
 				CoreDNS:           &ContainerImageTag{Name: "coredns", Tag: "1.6.5"},
 				Pause:             &ContainerImageTag{Name: "pause", Tag: "3.1"},
 				Tooling:           &ContainerImageTag{Name: "skuba-tooling", Tag: "0.1.0"},
 			},
 			AddonsVersion: AddonsVersion{
 				Cilium:        &AddonVersion{"1.6.6-rev5", 4},
-				Kured:         &AddonVersion{"1.3.0", 4},
+				Kured:         &AddonVersion{"1.3.0-rev4", 5},
 				Dex:           &AddonVersion{"2.16.0-rev6", 7},
 				Gangway:       &AddonVersion{"3.1.0-rev4", 6},
 				MetricsServer: &AddonVersion{"0.3.6", 1},

diff --git a/pkg/skuba/actions/node/remove/remove_test.go b/pkg/skuba/actions/node/remove/remove_test.go
@@ -37,7 +37,7 @@ func Test_RemoveNode(t *testing.T) {
 		Data: map[string]string{"ClusterConfiguration": `
 apiVersion: kubeadm.k8s.io/v1beta1
 kind: ClusterConfiguration
-kubernetesVersion: "v1.17.4"
+kubernetesVersion: "v1.17.9"
 apiServer:
   extraArgs:
     advertiseAddress: 1.2.3.4