diff --git a/channels/alpha b/channels/alpha index 0cbaef881c..d70db9d926 100644 --- a/channels/alpha +++ b/channels/alpha @@ -78,6 +78,10 @@ spec: providerID: gce architectureID: amd64 kubernetesVersion: ">=1.18.0" + - name: "Canonical:UbuntuServer:20.04-LTS:latest" + providerID: azure + architectureID: amd64 + kubernetesVersion: ">=1.20.0" cluster: kubernetesVersion: v1.5.8 networking: diff --git a/channels/stable b/channels/stable index 3f73bc1d33..b7fd4fd9b9 100644 --- a/channels/stable +++ b/channels/stable @@ -78,6 +78,10 @@ spec: providerID: gce architectureID: amd64 kubernetesVersion: ">=1.18.0" + - name: "Canonical:UbuntuServer:20.04-LTS:latest" + providerID: azure + architectureID: amd64 + kubernetesVersion: ">=1.20.0" cluster: kubernetesVersion: v1.5.8 networking: diff --git a/pkg/apis/kops/channel.go b/pkg/apis/kops/channel.go index fa4846e4eb..f08db1813b 100644 --- a/pkg/apis/kops/channel.go +++ b/pkg/apis/kops/channel.go @@ -335,5 +335,6 @@ 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-") || strings.HasPrefix(image, "cos-cloud/cos-stable-") || - strings.HasPrefix(image, "ubuntu-os-cloud/ubuntu-") + strings.HasPrefix(image, "ubuntu-os-cloud/ubuntu-") || + strings.HasPrefix(image, "Canonical:UbuntuServer:") } diff --git a/upup/pkg/fi/cloudup/populate_instancegroup_spec.go b/upup/pkg/fi/cloudup/populate_instancegroup_spec.go index e7628da7fb..e3f5361472 100644 --- a/upup/pkg/fi/cloudup/populate_instancegroup_spec.go +++ b/upup/pkg/fi/cloudup/populate_instancegroup_spec.go @@ -49,9 +49,8 @@ const ( defaultMasterMachineTypeALI = "ecs.n2.medium" defaultMasterMachineTypeAzure = "Standard_B2ms" - defaultDONodeImage = "ubuntu-20-04-x64" - defaultALINodeImage = "centos_7_04_64_20G_alibase_201701015.vhd" - defaultAzureNodeImage = "Canonical:UbuntuServer:20.04-LTS:latest" + defaultDONodeImage = "ubuntu-20-04-x64" + defaultALINodeImage = "centos_7_04_64_20G_alibase_201701015.vhd" ) // TODO: this hardcoded list can be replaced with DescribeInstanceTypes' DedicatedHostsSupported field @@ -258,8 +257,6 @@ func defaultImage(cluster *kops.Cluster, channel *kops.Channel, architecture arc return defaultDONodeImage case kops.CloudProviderALI: return defaultALINodeImage - case kops.CloudProviderAzure: - return defaultAzureNodeImage } klog.Infof("Cannot set default Image for CloudProvider=%q", cluster.Spec.CloudProvider) return ""