From 10d621c02a5d6df9376a0ccf7b1c6a481fb2f7a4 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Fri, 5 Jun 2020 19:49:31 +0300 Subject: [PATCH] Use Ubuntu 20.04 as the default image for Kubernetes 1.18+ --- channels/alpha | 5 ++++- channels/stable | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/channels/alpha b/channels/alpha index 8e2d06dff5..f1254d17f8 100644 --- a/channels/alpha +++ b/channels/alpha @@ -43,7 +43,10 @@ spec: kubernetesVersion: ">=1.16.0 <1.17.0" - name: kope.io/k8s-1.17-debian-stretch-amd64-hvm-ebs-2020-01-17 providerID: aws - kubernetesVersion: ">=1.17.0" + kubernetesVersion: ">=1.17.0 <1.18.0" + - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20200528 + providerID: aws + kubernetesVersion: ">=1.18.0" - providerID: gce kubernetesVersion: "<1.16.0-alpha.1" name: "cos-cloud/cos-stable-65-10323-99-0" diff --git a/channels/stable b/channels/stable index 1da0b08c5d..6bcc499bba 100644 --- a/channels/stable +++ b/channels/stable @@ -43,7 +43,10 @@ spec: kubernetesVersion: ">=1.16.0 <1.17.0" - name: kope.io/k8s-1.17-debian-stretch-amd64-hvm-ebs-2020-01-17 providerID: aws - kubernetesVersion: ">=1.17.0" + kubernetesVersion: ">=1.17.0 <1.18.0" + - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20200528 + providerID: aws + kubernetesVersion: ">=1.18.0" - providerID: gce kubernetesVersion: "<1.16.0-alpha.1" name: "cos-cloud/cos-stable-65-10323-99-0"