Update azure configs (#353)

* Use my own fork Signed-off-by: Raul Sevilla <[email protected]> * Enable azure Signed-off-by: Raul Sevilla <[email protected]> * Use managed-csi storageclass Signed-off-by: Raul Sevilla <[email protected]> --------- Signed-off-by: Raul Sevilla <[email protected]>
cloud-bulldozer · Nov 15, 2023 · 8de2c3b · 8de2c3b
1 parent 618effd
commit 8de2c3b
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 8 deletions.
diff --git a/dags/openshift_nightlies/config/install/azure/acs.json b/dags/openshift_nightlies/config/install/azure/acs.json
@@ -16,9 +16,9 @@
     "openshift_workload_node_volume_size": 512,
     "openshift_workload_node_volume_type": "Premium_LRS",
     "openshift_prometheus_retention_period": "15d",
-    "openshift_prometheus_storage_class": "managed-premium",
+    "openshift_prometheus_storage_class": "managed-csi",
     "openshift_prometheus_storage_size": "500Gi",
-    "openshift_alertmanager_storage_class": "managed-premium",
+    "openshift_alertmanager_storage_class": "managed-csi",
     "openshift_alertmanager_storage_size": "20Gi",
     "rhacs_enable": "true",
     "rhacs_image_main_registry": "quay.io/rhacs-eng",

diff --git a/dags/openshift_nightlies/config/install/azure/ovn-cp.json b/dags/openshift_nightlies/config/install/azure/ovn-cp.json
@@ -17,8 +17,8 @@
     "openshift_workload_node_volume_size": 50,
     "openshift_workload_node_volume_type": "Premium_LRS",
     "openshift_prometheus_retention_period": "15d",
-    "openshift_prometheus_storage_class": "managed-premium",
+    "openshift_prometheus_storage_class": "managed-csi",
     "openshift_prometheus_storage_size": "50Gi",
-    "openshift_alertmanager_storage_class": "managed-premium",
+    "openshift_alertmanager_storage_class": "managed-csi",
     "openshift_alertmanager_storage_size": "2Gi"
 }
diff --git a/dags/openshift_nightlies/config/install/azure/ovn-dp-v2.json b/dags/openshift_nightlies/config/install/azure/ovn-dp-v2.json
@@ -0,0 +1,24 @@
+{
+    "openshift_master_count": 3,
+    "openshift_worker_count": 9,
+    "openshift_base_domain": "ats.azure.devcluster.openshift.com",
+    "openshift_host_prefix": "23",
+    "openshift_network_type": "OVNKubernetes",
+    "openshift_master_vm_size": "Standard_E4s_v3",
+    "openshift_worker_vm_size": "Standard_D8s_v3",
+    "openshift_master_root_volume_size": 100,
+    "openshift_worker_root_volume_size": 50,
+    "openshift_cidr": "10.128.0.0/14",
+    "machineset_metadata_label_prefix": "machine.openshift.io",
+    "openshift_infra_node_vm_size": "Standard_F16s_v2",
+    "openshift_infra_node_volume_size": 50,
+    "openshift_infra_node_volume_type": "Premium_LRS",
+    "openshift_workload_node_volume_size": 50,
+    "openshift_workload_node_volume_type": "Premium_LRS",
+    "openshift_prometheus_retention_period": "15d",
+    "openshift_prometheus_storage_class": "managed-csi",
+    "openshift_prometheus_storage_size": "50Gi",
+    "openshift_alertmanager_storage_class": "managed-csi",
+    "openshift_alertmanager_storage_size": "2Gi",
+    "openshift_toggle_workload_node": false
+}
diff --git a/dags/openshift_nightlies/config/install/azure/ovn-dp.json b/dags/openshift_nightlies/config/install/azure/ovn-dp.json
@@ -17,8 +17,8 @@
     "openshift_workload_node_volume_size": 50,
     "openshift_workload_node_volume_type": "Premium_LRS",
     "openshift_prometheus_retention_period": "15d",
-    "openshift_prometheus_storage_class": "managed-premium",
+    "openshift_prometheus_storage_class": "managed-csi",
     "openshift_prometheus_storage_size": "50Gi",
-    "openshift_alertmanager_storage_class": "managed-premium",
+    "openshift_alertmanager_storage_class": "managed-csi",
     "openshift_alertmanager_storage_size": "2Gi"
 }
diff --git a/dags/openshift_nightlies/config/install/azure/ovn-large-cp.json b/dags/openshift_nightlies/config/install/azure/ovn-large-cp.json
@@ -17,8 +17,8 @@
     "openshift_workload_node_volume_size": 512,
     "openshift_workload_node_volume_type": "Premium_LRS",
     "openshift_prometheus_retention_period": "15d",
-    "openshift_prometheus_storage_class": "managed-premium",
+    "openshift_prometheus_storage_class": "managed-csi",
     "openshift_prometheus_storage_size": "500Gi",
-    "openshift_alertmanager_storage_class": "managed-premium",
+    "openshift_alertmanager_storage_class": "managed-csi",
     "openshift_alertmanager_storage_size": "20Gi"
 }