From 5b97251dc25bf4081b75ae248e8f359b0e94bbd8 Mon Sep 17 00:00:00 2001 From: Andrew Collins Date: Tue, 5 Nov 2024 11:37:34 -0600 Subject: [PATCH] Update AWS instances to match what is in prow --- dags/openshift_nightlies/config/install/aws/ovn-large.json | 6 +++--- dags/openshift_nightlies/config/install/aws/ovn-medium.json | 6 +++--- dags/openshift_nightlies/config/install/aws/ovn-small.json | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dags/openshift_nightlies/config/install/aws/ovn-large.json b/dags/openshift_nightlies/config/install/aws/ovn-large.json index eb8936d66..d88e8bd99 100644 --- a/dags/openshift_nightlies/config/install/aws/ovn-large.json +++ b/dags/openshift_nightlies/config/install/aws/ovn-large.json @@ -5,8 +5,8 @@ "openshift_worker_count": 3, "openshift_host_prefix": "22", "openshift_network_type": "OVNKubernetes", - "openshift_master_instance_type": "r5.4xlarge", - "openshift_worker_instance_type": "m5.2xlarge", + "openshift_master_instance_type": "m6a.4xlarge", + "openshift_worker_instance_type": "m5.xlarge", "openshift_master_root_volume_size": 100, "openshift_master_root_volume_type": "gp3", "openshift_master_root_volume_iops": 3000, @@ -14,7 +14,7 @@ "openshift_worker_root_volume_type": "gp3", "openshift_worker_root_volume_iops": 0, "machineset_metadata_label_prefix": "machine.openshift.io", - "openshift_infra_node_instance_type": "m5.12xlarge", + "openshift_infra_node_instance_type": "r5.4xlarge", "openshift_toggle_workload_node": "false", "openshift_infra_node_volume_size": 50, "openshift_infra_node_volume_type": "gp3", diff --git a/dags/openshift_nightlies/config/install/aws/ovn-medium.json b/dags/openshift_nightlies/config/install/aws/ovn-medium.json index 1fdffff0c..81c2765b8 100644 --- a/dags/openshift_nightlies/config/install/aws/ovn-medium.json +++ b/dags/openshift_nightlies/config/install/aws/ovn-medium.json @@ -5,8 +5,8 @@ "openshift_worker_count": 3, "openshift_host_prefix": "22", "openshift_network_type": "OVNKubernetes", - "openshift_master_instance_type": "r5.4xlarge", - "openshift_worker_instance_type": "m5.2xlarge", + "openshift_master_instance_type": "m6a.4xlarge", + "openshift_worker_instance_type": "m5.xlarge", "openshift_master_root_volume_size": 100, "openshift_master_root_volume_type": "gp3", "openshift_master_root_volume_iops": 3000, @@ -14,7 +14,7 @@ "openshift_worker_root_volume_type": "gp3", "openshift_worker_root_volume_iops": 0, "machineset_metadata_label_prefix": "machine.openshift.io", - "openshift_infra_node_instance_type": "m5.4xlarge", + "openshift_infra_node_instance_type": "r5.4xlarge", "openshift_toggle_workload_node": "false", "openshift_infra_node_volume_size": 50, "openshift_infra_node_volume_type": "gp3", diff --git a/dags/openshift_nightlies/config/install/aws/ovn-small.json b/dags/openshift_nightlies/config/install/aws/ovn-small.json index 653a0f1e2..9eaedbe7b 100644 --- a/dags/openshift_nightlies/config/install/aws/ovn-small.json +++ b/dags/openshift_nightlies/config/install/aws/ovn-small.json @@ -5,8 +5,8 @@ "openshift_worker_count": 3, "openshift_host_prefix": "22", "openshift_network_type": "OVNKubernetes", - "openshift_master_instance_type": "r5.4xlarge", - "openshift_worker_instance_type": "m5.2xlarge", + "openshift_master_instance_type": "m6a.xlarge", + "openshift_worker_instance_type": "m6a.xlarge", "openshift_master_root_volume_size": 100, "openshift_master_root_volume_type": "gp3", "openshift_master_root_volume_iops": 3000, @@ -14,7 +14,7 @@ "openshift_worker_root_volume_type": "gp3", "openshift_worker_root_volume_iops": 0, "machineset_metadata_label_prefix": "machine.openshift.io", - "openshift_infra_node_instance_type": "m5.4xlarge", + "openshift_infra_node_instance_type": "r5.xlarge", "openshift_infra_node_volume_size": 50, "openshift_infra_node_volume_type": "gp3", "openshift_infra_node_volume_iops": 0,