Skip to content

Commit

Permalink
support ubuntu nobel (#1858)
Browse files Browse the repository at this point in the history
  • Loading branch information
moadqassem authored Oct 14, 2024
1 parent 46cfdfe commit abbb86c
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions pkg/cloudprovider/provider/aws/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,13 @@ var (
providerconfigtypes.OperatingSystemUbuntu: {
awstypes.CPUArchitectureX86_64: {
// Be as precise as possible - otherwise we might get a nightly dev build
description: "Canonical, Ubuntu, 22.04 LTS, amd64 jammy image build on ????-??-??",
description: "Canonical, Ubuntu, 24.04 LTS, amd64 noble image build on ????-??-??",
// The AWS marketplace ID from Canonical
owner: "099720109477",
},
awstypes.CPUArchitectureARM64: {
// Be as precise as possible - otherwise we might get a nightly dev build
description: "Canonical, Ubuntu, 22.04 LTS, arm64 jammy image build on ????-??-??",
description: "Canonical, Ubuntu, 24.04 LTS, arm64 noble image build on 2024-05-29 ????-??-??",
// The AWS marketplace ID from Canonical
owner: "099720109477",
},
Expand Down
4 changes: 2 additions & 2 deletions pkg/cloudprovider/provider/azure/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ var imageReferences = map[providerconfigtypes.OperatingSystem]compute.ImageRefer
},
providerconfigtypes.OperatingSystemUbuntu: {
Publisher: to.StringPtr("Canonical"),
Offer: to.StringPtr("0001-com-ubuntu-server-jammy"),
Sku: to.StringPtr("22_04-lts"),
Offer: to.StringPtr("ubuntu-24_04-lts"),
Sku: to.StringPtr("server-gen1"),
Version: to.StringPtr("latest"),
},
providerconfigtypes.OperatingSystemRHEL: {
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloudprovider/provider/digitalocean/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (t *TokenSource) Token() (*oauth2.Token, error) {
func getSlugForOS(os providerconfigtypes.OperatingSystem) (string, error) {
switch os {
case providerconfigtypes.OperatingSystemUbuntu:
return "ubuntu-22-04-x64", nil
return "ubuntu-24-04-x64", nil
case providerconfigtypes.OperatingSystemCentOS:
return "centos-7-x64", nil
case providerconfigtypes.OperatingSystemRockyLinux:
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloudprovider/provider/equinixmetal/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ func getDeviceByTag(client *packngo.Client, projectID, tag string) (*packngo.Dev
func getNameForOS(os providerconfigtypes.OperatingSystem) (string, error) {
switch os {
case providerconfigtypes.OperatingSystemUbuntu:
return "ubuntu_22_04", nil
return "ubuntu_24_04", nil
case providerconfigtypes.OperatingSystemCentOS:
return "centos_7", nil
case providerconfigtypes.OperatingSystemFlatcar:
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloudprovider/provider/gce/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ var imageProjects = map[providerconfigtypes.OperatingSystem]string{

// imageFamilies maps the OS to the Google Cloud image projects.
var imageFamilies = map[providerconfigtypes.OperatingSystem]string{
providerconfigtypes.OperatingSystemUbuntu: "ubuntu-2204-lts",
providerconfigtypes.OperatingSystemUbuntu: "ubuntu-2404-lts-amd64",
providerconfigtypes.OperatingSystemFlatcar: "flatcar-stable",
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/cloudprovider/provider/hetzner/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ type Config struct {
func getNameForOS(os providerconfigtypes.OperatingSystem) (string, error) {
switch os {
case providerconfigtypes.OperatingSystemUbuntu:
return "ubuntu-22.04", nil
return "ubuntu-24.04", nil
case providerconfigtypes.OperatingSystemCentOS:
return "centos-7", nil
case providerconfigtypes.OperatingSystemRockyLinux:
Expand Down

0 comments on commit abbb86c

Please sign in to comment.