Skip to content

add support for rocky linux 9 i.e default to 9.6 #1951

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

Merged
merged 2 commits into from
Aug 22, 2025
Merged

add support for rocky linux 9 i.e default to 9.6 #1951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e50a16e
add support for rocky linux 9 i.e default to 9.6
rajaSahil Jul 30, 2025
693d745
fix tests
rajaSahil Aug 18, 2025
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
2 changes: 1 addition & 1 deletion examples/azure-machinedeployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ spec:
location: "westeurope"
resourceGroup: "<< YOUR_RESOURCE_GROUP >>"
vnetResourceGroup: "<< YOUR_VNET_RESOURCE_GROUP >>"
vmSize: "Standard_F2"
vmSize: "Standard_F2s_v2"
# optional disk size values in GB. If not set, the defaults for the vmSize will be used.
osDiskSize: 30
dataDiskSize: 30
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloudprovider/provider/anexia/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import (
"go.anx.io/go-anxcloud/pkg/vsphere/provisioning/progress"
"go.anx.io/go-anxcloud/pkg/vsphere/provisioning/vm"
"go.uber.org/zap"
"sigs.k8s.io/controller-runtime/pkg/client/fake"

cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors"
cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types"
Expand All @@ -51,6 +50,7 @@ import (
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions pkg/cloudprovider/provider/aws/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,12 @@ var (
amiFilters = map[providerconfig.OperatingSystem]map[awstypes.CPUArchitecture]amiFilter{
providerconfig.OperatingSystemRockyLinux: {
awstypes.CPUArchitectureX86_64: {
description: "*Rocky-8-EC2-*.x86_64",
description: "*Rocky-9-EC2-*.x86_64",
// The AWS marketplace ID from Rocky Linux Community Platform Engineering (CPE)
owner: "792107900819",
},
awstypes.CPUArchitectureARM64: {
description: "*Rocky-8-EC2-*.aarch64",
description: "*Rocky-9-EC2-*.aarch64",
// The AWS marketplace ID from Rocky Linux Community Platform Engineering (CPE)
owner: "792107900819",
},
Expand Down
14 changes: 7 additions & 7 deletions pkg/cloudprovider/provider/azure/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,10 @@ var imageReferences = map[providerconfig.OperatingSystem]compute.ImageReference{
Version: to.StringPtr("3374.2.0"),
},
providerconfig.OperatingSystemRockyLinux: {
Publisher: to.StringPtr("procomputers"),
Offer: to.StringPtr("rocky-linux-8-5"),
Sku: to.StringPtr("rocky-linux-8-5"),
Version: to.StringPtr("8.5.20211118"),
Publisher: to.StringPtr("resf"),
Offer: to.StringPtr("rockylinux-x86_64"),
Sku: to.StringPtr("9-base"),
Version: to.StringPtr("9.6.20250531"),
},
}

Expand All @@ -178,9 +178,9 @@ var osPlans = map[providerconfig.OperatingSystem]*compute.Plan{
Product: ptr.To("rhel-byos"),
},
providerconfig.OperatingSystemRockyLinux: {
Name: ptr.To("rocky-linux-8-5"),
Publisher: ptr.To("procomputers"),
Product: ptr.To("rocky-linux-8-5"),
Name: ptr.To("9-base"),
Publisher: ptr.To("resf"),
Product: ptr.To("rockylinux-x86_64"),
},
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/cloudprovider/provider/digitalocean/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func getSlugForOS(os providerconfig.OperatingSystem) (string, error) {
case providerconfig.OperatingSystemUbuntu:
return "ubuntu-24-04-x64", nil
case providerconfig.OperatingSystemRockyLinux:
return "rockylinux-8-x64", nil
return "rockylinux-9-x64", nil
}
return "", providerconfig.ErrOSNotSupported
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloudprovider/provider/hetzner/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func getNameForOS(os providerconfig.OperatingSystem) (string, error) {
case providerconfig.OperatingSystemUbuntu:
return "ubuntu-24.04", nil
case providerconfig.OperatingSystemRockyLinux:
return "rocky-8", nil
return "rocky-9", nil
}
return "", providerconfig.ErrOSNotSupported
}
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/provisioning/testdata/machinedeployment-azure.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
location: "westeurope"
resourceGroup: "machine-controller-e2e"
vnetResourceGroup: ""
vmSize: "Standard_F2"
vmSize: "Standard_F2s_v2"
# optional disk size values in GB. If not set, the defaults for the vmSize will be used.
osDiskSize: << OS_DISK_SIZE >>
osDiskSKU: << AZURE_OS_DISK_SKU >>
Expand Down