pdates GCE channels to use ubuntu over COS

This commit is contained in:
geojaz 2021-01-10 15:32:41 -08:00
parent 75623366e6
commit 803c7bcd4e
3 changed files with 10 additions and 1 deletions

View File

@ -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:

View File

@ -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:

View File

@ -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-")
}