Skip to content

Commit 84b222f

Browse files
committed
WIP force RHEL10 + EnableNFTables
1 parent ce58e6f commit 84b222f

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

upup/pkg/fi/cloudup/new_cluster.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,11 @@ func NewCluster(opt *NewClusterOptions, clientset simple.Clientset) (*NewCluster
513513
}
514514
}
515515
}
516+
g.Spec.Image = "309956199498/RHEL-10.1.0_HVM-20260331-arm64-0-Hourly2-GP3"
516517

518+
if cluster.GetCloudProvider() == api.CloudProviderAWS {
519+
g.Spec.MachineType = "m6g.large"
520+
}
517521
// TODO: Clean up
518522
if g.IsControlPlane() {
519523
if g.Spec.MachineType == "" {
@@ -1266,12 +1270,14 @@ func setupNetworking(opt *NewClusterOptions, cluster *api.Cluster) error {
12661270
cluster.Spec.Networking.Kopeio = &api.KopeioNetworkingSpec{}
12671271
case "flannel", "flannel-vxlan":
12681272
cluster.Spec.Networking.Flannel = &api.FlannelNetworkingSpec{
1269-
Backend: "vxlan",
1273+
Backend: "vxlan",
1274+
EnableNFTables: true,
12701275
}
12711276
case "flannel-udp":
12721277
klog.Warningf("flannel UDP mode is not recommended; consider flannel-vxlan instead")
12731278
cluster.Spec.Networking.Flannel = &api.FlannelNetworkingSpec{
1274-
Backend: "udp",
1279+
Backend: "udp",
1280+
EnableNFTables: true,
12751281
}
12761282
case "calico":
12771283
cluster.Spec.Networking.Calico = &api.CalicoNetworkingSpec{}

0 commit comments

Comments
 (0)