From 34c9a840628b3efdf32200f918eb9b67d0c7300e Mon Sep 17 00:00:00 2001 From: David Cassany Date: Mon, 6 Sep 2021 12:45:36 +0200 Subject: [PATCH] Bump k8s version to 1.18.20 K8s 1.18.20 includes a backport for bsc#1189416 (CVE-2021-25741) Signed-off-by: David Cassany --- internal/pkg/skuba/kubernetes/versions.go | 25 +++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/internal/pkg/skuba/kubernetes/versions.go b/internal/pkg/skuba/kubernetes/versions.go index a370907d8..9b6384884 100644 --- a/internal/pkg/skuba/kubernetes/versions.go +++ b/internal/pkg/skuba/kubernetes/versions.go @@ -86,6 +86,31 @@ type ClusterAddonsKnownVersions = func(clusterVersion *version.Version) AddonsVe var ( supportedVersions = KubernetesVersions{ + "1.18.20": KubernetesVersion{ + ComponentHostVersion: ComponentHostVersion{ + KubeletVersion: "1.18.20", + ContainerRuntimeVersion: "1.18.4", + }, + ComponentContainerVersion: ComponentContainerVersion{ + APIServer: &ContainerImageTag{Name: "kube-apiserver", Tag: "v1.18.20"}, + ControllerManager: &ContainerImageTag{Name: "kube-controller-manager", Tag: "v1.18.20"}, + Scheduler: &ContainerImageTag{Name: "kube-scheduler", Tag: "v1.18.20"}, + Proxy: &ContainerImageTag{Name: "kube-proxy", Tag: "v1.18.20"}, + Etcd: &ContainerImageTag{Name: "etcd", Tag: "3.4.13"}, + CoreDNS: &ContainerImageTag{Name: "coredns", Tag: "1.6.7"}, + Pause: &ContainerImageTag{Name: "pause", Tag: "3.2"}, + Tooling: &ContainerImageTag{Name: "skuba-tooling", Tag: "0.1.0"}, + }, + AddonsVersion: AddonsVersion{ + Cilium: &AddonVersion{"1.7.6-rev6", 4540}, + Kured: &AddonVersion{"1.4.3-rev6", 4540}, + Dex: &AddonVersion{"2.23.0-rev3", 4540}, + Gangway: &AddonVersion{"3.1.0-rev7", 4540}, + MetricsServer: &AddonVersion{"0.3.6-rev3", 4540}, + Kucero: &AddonVersion{"1.3.0-rev6", 4540}, + PSP: &AddonVersion{"", 4540}, + }, + }, "1.18.10": KubernetesVersion{ ComponentHostVersion: ComponentHostVersion{ KubeletVersion: "1.18.10",