Skip to content

Commit 1fb0500

Browse files
committed
WIP force RHEL10 + EnableNFTables
1 parent d4c604e commit 1fb0500

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 == "" {
@@ -1269,12 +1273,14 @@ func setupNetworking(opt *NewClusterOptions, cluster *api.Cluster) error {
12691273
cluster.Spec.Networking.Kopeio = &api.KopeioNetworkingSpec{}
12701274
case "flannel", "flannel-vxlan":
12711275
cluster.Spec.Networking.Flannel = &api.FlannelNetworkingSpec{
1272-
Backend: "vxlan",
1276+
Backend: "vxlan",
1277+
EnableNFTables: true,
12731278
}
12741279
case "flannel-udp":
12751280
klog.Warningf("flannel UDP mode is not recommended; consider flannel-vxlan instead")
12761281
cluster.Spec.Networking.Flannel = &api.FlannelNetworkingSpec{
1277-
Backend: "udp",
1282+
Backend: "udp",
1283+
EnableNFTables: true,
12781284
}
12791285
case "calico":
12801286
cluster.Spec.Networking.Calico = &api.CalicoNetworkingSpec{}

0 commit comments

Comments
 (0)