Skip to content

Commit 8cc2263

Browse files
committed
WIP test flannel presubmit w/ rocky10
1 parent 71cea44 commit 8cc2263

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

upup/pkg/fi/cloudup/new_cluster.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,11 @@ func NewCluster(opt *NewClusterOptions, clientset simple.Clientset) (*NewCluster
514514
}
515515
}
516516

517+
// TODO: Remove this temporary override once RHEL10 nftables validation is complete.
518+
if cluster.GetCloudProvider() == api.CloudProviderAWS {
519+
g.Spec.MachineType = "m6g.large"
520+
}
521+
517522
// TODO: Clean up
518523
if g.IsControlPlane() {
519524
if g.Spec.MachineType == "" {
@@ -1665,6 +1670,11 @@ func defaultImage(cluster *api.Cluster, channel *api.Channel, architecture archi
16651670
return "", fmt.Errorf("unable to parse kubernetes version %q", cluster.Spec.KubernetesVersion)
16661671
}
16671672

1673+
// TODO: Remove this temporary override once RHEL10 nftables validation is complete.
1674+
if cluster.GetCloudProvider() == api.CloudProviderAWS {
1675+
return "309956199498/RHEL-10.1.0_HVM-20260331-arm64-0-Hourly2-GP3", nil
1676+
}
1677+
16681678
if channel != nil {
16691679
image := channel.FindImage(cluster.GetCloudProvider(), *kubernetesVersion, architecture)
16701680
if image != nil {

0 commit comments

Comments
 (0)