From a50b3386affccac1c24030a4577c81bbcf365962 Mon Sep 17 00:00:00 2001 From: Kubermatic Bot <41968677+kubermatic-bot@users.noreply.github.com> Date: Wed, 3 Sep 2025 10:27:25 +0200 Subject: [PATCH 1/2] Use flatcar-container-linux-corevm-amd64 for flatcar on Azure (#1957) Signed-off-by: Waleed Malik Co-authored-by: Waleed Malik --- pkg/cloudprovider/provider/azure/provider.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkg/cloudprovider/provider/azure/provider.go b/pkg/cloudprovider/provider/azure/provider.go index c46fb5475..274b46a1b 100644 --- a/pkg/cloudprovider/provider/azure/provider.go +++ b/pkg/cloudprovider/provider/azure/provider.go @@ -154,9 +154,10 @@ var imageReferences = map[providerconfig.OperatingSystem]compute.ImageReference{ }, providerconfig.OperatingSystemFlatcar: { Publisher: to.StringPtr("kinvolk"), - Offer: to.StringPtr("flatcar-container-linux"), - Sku: to.StringPtr("stable"), - Version: to.StringPtr("3374.2.0"), + // flatcar-container-linux-corevm-amd64 doesn't require a plan. For more info: https://www.flatcar.org/docs/latest/installing/cloud/azure/#corevm + Offer: to.StringPtr("flatcar-container-linux-corevm-amd64"), + Sku: to.StringPtr("stable"), + Version: to.StringPtr("4230.2.2"), }, providerconfig.OperatingSystemRockyLinux: { Publisher: to.StringPtr("resf"), @@ -167,11 +168,6 @@ var imageReferences = map[providerconfig.OperatingSystem]compute.ImageReference{ } var osPlans = map[providerconfig.OperatingSystem]*compute.Plan{ - providerconfig.OperatingSystemFlatcar: { - Name: ptr.To("stable"), - Publisher: ptr.To("kinvolk"), - Product: ptr.To("flatcar-container-linux"), - }, providerconfig.OperatingSystemRHEL: { Name: ptr.To("rhel-lvm85"), Publisher: ptr.To("redhat"), From fddedb032c239a14abd47ef2f9611de6e01c3ac1 Mon Sep 17 00:00:00 2001 From: Kubermatic Bot <41968677+kubermatic-bot@users.noreply.github.com> Date: Mon, 15 Sep 2025 09:43:58 +0200 Subject: [PATCH 2/2] add support for rhel 9 (#1962) Signed-off-by: rajaSahil Co-authored-by: rajaSahil --- pkg/cloudprovider/provider/aws/provider.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/cloudprovider/provider/aws/provider.go b/pkg/cloudprovider/provider/aws/provider.go index d6e51ad7e..8c48823d6 100644 --- a/pkg/cloudprovider/provider/aws/provider.go +++ b/pkg/cloudprovider/provider/aws/provider.go @@ -1176,13 +1176,13 @@ func getInstanceCountForMachine(machine clusterv1alpha1.Machine, reservations [] func filterSupportedRHELImages(images []ec2types.Image) ([]ec2types.Image, error) { var filteredImages []ec2types.Image for _, image := range images { - if strings.HasPrefix(*image.Name, "RHEL-8") { + if strings.HasPrefix(*image.Name, "RHEL-9") { filteredImages = append(filteredImages, image) } } if filteredImages == nil { - return nil, errors.New("rhel 8 images are not found") + return nil, errors.New("rhel 9 images are not found") } return filteredImages, nil