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

Merge pull request #11271 from cloudnatix/kenji/azure_channel 

Add Azure image to alpha/stable channel
This commit is contained in:
Kubernetes Prow Robot 2021-04-20 11:18:33 -07:00 committed by GitHub
parent 5547e690c9 221568a7a6
commit 06ca1ff169
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
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:

4
channels/stable
View File

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

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

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

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