From 803c7bcd4e13843574aefa43d308157e02fabcb6 Mon Sep 17 00:00:00 2001
From: geojaz <eric.hole@gmail.com>
Date: Sun, 10 Jan 2021 15:32:41 -0800
Subject: [PATCH] pdates GCE channels to use ubuntu over COS

---
 channels/alpha           | 4 ++++
 channels/stable          | 4 ++++
 pkg/apis/kops/channel.go | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/channels/alpha b/channels/alpha
index f911926df9..157aebb8ea 100644
--- a/channels/alpha
+++ b/channels/alpha
@@ -53,6 +53,10 @@ spec:
     - providerID: gce
       kubernetesVersion: ">=1.16.0-alpha.1"
       name: "cos-cloud/cos-stable-77-12371-114-0"
+    # Note: Updated from cos to ubuntu for parity with aws.
+    - providerID: gce
+      kubernetesVersion: ">=1.17.0"
+      name: "ubuntu-os-cloud/ubuntu-2004-focal-v20210108"
   cluster:
     kubernetesVersion: v1.5.8
     networking:
diff --git a/channels/stable b/channels/stable
index f911926df9..64e50505fc 100644
--- a/channels/stable
+++ b/channels/stable
@@ -53,6 +53,10 @@ spec:
     - providerID: gce
       kubernetesVersion: ">=1.16.0-alpha.1"
       name: "cos-cloud/cos-stable-77-12371-114-0"
+      # Note: Updated from cos to ubuntu for parity with aws.
+    - providerID: gce
+      kubernetesVersion: ">=1.17.0"
+      name: "ubuntu-os-cloud/ubuntu-2004-focal-v20210108"
   cluster:
     kubernetesVersion: v1.5.8
     networking:
diff --git a/pkg/apis/kops/channel.go b/pkg/apis/kops/channel.go
index db05bd9aa7..976ea949e6 100644
--- a/pkg/apis/kops/channel.go
+++ b/pkg/apis/kops/channel.go
@@ -328,5 +328,6 @@ func RecommendedKubernetesVersion(c *Channel, kopsVersionString string) *semver.
 func (c *Channel) HasUpstreamImagePrefix(image string) bool {
 	return strings.HasPrefix(image, "kope.io/k8s-") ||
 		strings.HasPrefix(image, "099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-") ||
-		strings.HasPrefix(image, "cos-cloud/cos-stable-")
+		strings.HasPrefix(image, "cos-cloud/cos-stable-") ||
+		strings.HasPrefix(image, "ubuntu-os-cloud/ubuntu-")
 }