Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automated cherry pick of #11271: Add Azure image to alpha/stable channel #11272

Merged
merged 1 commit into from
Apr 20, 2021
Merged

Automated cherry pick of #11271: Add Azure image to alpha/stable channel #11272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/apis/kops/channel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 2 additions & 5 deletions upup/pkg/fi/cloudup/populate_instancegroup_spec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,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
Expand Down Expand Up @@ -254,8 +253,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 ""
Expand Down