kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add Azure image to alpha/stable channel 

Remove the default image hard-coded in populate_instancegroup_spec.go.
This commit is contained in:
Kenji Kaneda 2021-04-20 09:09:58 -07:00
parent af9abb4052
commit 221568a7a6
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channels/alpha
View File

@ -78,6 +78,10 @@ spec:
providerID: gce providerID: gce
architectureID: amd64 architectureID: amd64
kubernetesVersion: ">=1.18.0" kubernetesVersion: ">=1.18.0"
- name: "Canonical:UbuntuServer:20.04-LTS:latest"
providerID: azure
architectureID: amd64
kubernetesVersion: ">=1.20.0"
cluster: cluster:
kubernetesVersion: v1.5.8 kubernetesVersion: v1.5.8
networking: networking:

4
channels/stable
View File

@ -78,6 +78,10 @@ spec:
providerID: gce providerID: gce
architectureID: amd64 architectureID: amd64
kubernetesVersion: ">=1.18.0" kubernetesVersion: ">=1.18.0"
- name: "Canonical:UbuntuServer:20.04-LTS:latest"
providerID: azure
architectureID: amd64
kubernetesVersion: ">=1.20.0"
cluster: cluster:
kubernetesVersion: v1.5.8 kubernetesVersion: v1.5.8
networking: networking:

3
pkg/apis/kops/channel.go
View File

@ -335,5 +335,6 @@ func (c *Channel) HasUpstreamImagePrefix(image string) bool {
return strings.HasPrefix(image, "kope.io/k8s-") || return strings.HasPrefix(image, "kope.io/k8s-") ||
strings.HasPrefix(image, "099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-") || strings.HasPrefix(image, "099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-") ||
strings.HasPrefix(image, "cos-cloud/cos-stable-") || 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:")
} }

3
upup/pkg/fi/cloudup/populate_instancegroup_spec.go
View File

@ -51,7 +51,6 @@ const (
defaultDONodeImage = "ubuntu-20-04-x64" defaultDONodeImage = "ubuntu-20-04-x64"
defaultALINodeImage = "centos_7_04_64_20G_alibase_201701015.vhd" defaultALINodeImage = "centos_7_04_64_20G_alibase_201701015.vhd"
defaultAzureNodeImage = "Canonical:UbuntuServer:20.04-LTS:latest"
) )
// TODO: this hardcoded list can be replaced with DescribeInstanceTypes' DedicatedHostsSupported field // 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 return defaultDONodeImage
case kops.CloudProviderALI: case kops.CloudProviderALI:
return defaultALINodeImage return defaultALINodeImage
case kops.CloudProviderAzure:
return defaultAzureNodeImage
} }
klog.Infof("Cannot set default Image for CloudProvider=%q", cluster.Spec.CloudProvider) klog.Infof("Cannot set default Image for CloudProvider=%q", cluster.Spec.CloudProvider)
return "" return ""