rebased and squashed

libs/platforms/platform.py

@@ -21,6 +21,9 @@ def __init__(self, arguments, logging, utils, es):
 
         self.environment["platform"] = arguments["platform"]
 
+        if arguments["subplatform"]:
+            self.environment["subplatform"] = arguments["subplatform"]
+
         self.environment["ocm_url"] = arguments["ocm_url"]
         self.environment["ocm_token"] = arguments["ocm_token"]
 
@@ -184,7 +187,7 @@ def create_cluster(self, platform, cluster_name):
     def delete_cluster(self, platform, cluster_name):
         pass
 
-    def platform_cleanup(self):
+    def platform_cleanup(self, platform=""):
         pass
 
     def watcher(self):

libs/platforms/rosa/hypershift/hypershift.py

@@ -114,8 +114,8 @@ def _get_mc(self, cluster_id):
         )
         return json.loads(resp_out).get("management_cluster", None) if resp_code == 0 else None
 
-    def platform_cleanup(self):
-        super().platform_cleanup()
+    def platform_cleanup(self, platform=""):
+        super().platform_cleanup(platform)
         self.logging.info("Cleaning resources")
         # Delete Operator Roles
         self._delete_operator_roles() if self.environment[

libs/platforms/rosa/rosa.py

@@ -199,8 +199,8 @@ def _delete_operator_roles(self):
             )
             return True
 
-    def platform_cleanup(self):
-        super().platform_cleanup()
+    def platform_cleanup(self, platform=""):
+        super().platform_cleanup(platform)
 
     def create_cluster(self, platform, cluster_name):
         super().create_cluster(platform, cluster_name)
@@ -240,25 +240,28 @@ def _preflight_wait(self, cluster_id, cluster_name):
                 self.logging.error(f"Exiting preflight times capturing on {cluster_name} cluster after capturing Ctrl-C")
                 return 0
             self.logging.info(f"Getting status for cluster {cluster_name}")
-            status_code, status_out, status_err = self.utils.subprocess_exec("rosa describe cluster -c " + cluster_id + " -o json", extra_params={"universal_newlines": True})
+            status_code, status_out, status_err = self.utils.subprocess_exec("rosa describe cluster -c " + cluster_id + " -o json", extra_params={"universal_newlines": True}, log_output=False)
             current_time = int(datetime.datetime.utcnow().timestamp())
-            try:
-                current_status = json.loads(status_out)["state"]
-            except Exception as err:
-                self.logging.error(f"Cannot load metadata for cluster {cluster_name}")
-                self.logging.error(err)
-                continue
-            if current_status != previous_status and previous_status != "":
-                return_data[previous_status] = current_time - start_time
-                start_time = current_time
-                self.logging.info(f"Cluster {cluster_name} moved from {previous_status} status to {current_status} status after {return_data[previous_status]} seconds")
-                if current_status == "installing":
-                    self.logging.info(f"Cluster {cluster_name} is on installing status. Exiting preflights waiting...")
-                    return return_data
+            if status_code != 0:
+                self.logging.debug("Cluster data not available yet, retrying..")
             else:
-                self.logging.debug(f"Cluster {cluster_name} on {current_status} status. Waiting 2 seconds until {datetime.datetime.fromtimestamp(start_time + 60 * 60)} for next check")
-                time.sleep(1)
-            previous_status = current_status
+                try:
+                    current_status = json.loads(status_out)["state"]
+                except Exception as err:
+                    self.logging.error(f"Cannot load metadata for cluster {cluster_name}")
+                    self.logging.error(err)
+                    continue
+                if current_status != previous_status and previous_status != "":
+                    return_data[previous_status] = current_time - start_time
+                    start_time = current_time
+                    self.logging.info(f"Cluster {cluster_name} moved from {previous_status} status to {current_status} status after {return_data[previous_status]} seconds")
+                    if current_status == "installing":
+                        self.logging.info(f"Cluster {cluster_name} is on installing status. Exiting preflights waiting...")
+                        return return_data
+                else:
+                    self.logging.debug(f"Cluster {cluster_name} on {current_status} status. Waiting 2 seconds until {datetime.datetime.fromtimestamp(start_time + 60 * 60)} for next check")
+                    time.sleep(1)
+                previous_status = current_status
         self.logging.error(f"Cluster {cluster_name} on {current_status} status (not installing) after 60 minutes. Exiting preflight waiting...")
         return return_data
 

libs/platforms/rosa/terraform/files/main.tf

@@ -31,18 +31,6 @@ provider "rhcs" {
   url   = var.url
 }
 
-# Create managed OIDC config
-module "oidc_config" {
-  token                = var.token
-  url                  = var.url
-  source               = "./oidc_provider"
-  managed              = true
-  operator_role_prefix = var.operator_role_prefix
-  account_role_prefix  = var.account_role_prefix
-  tags                 = var.tags
-  path                 = var.path
-}
-
 locals {
   path = coalesce(var.path, "/")
   sts_roles = {
@@ -53,7 +41,7 @@ locals {
       worker_role_arn = "arn:aws:iam::${data.aws_caller_identity.current.account_id}:role${local.path}${var.account_role_prefix}-Worker-Role"
     },
     operator_role_prefix = var.operator_role_prefix,
-    oidc_config_id       = module.oidc_config.id
+    oidc_config_id       = var.oidc_config_id
   }
 }
 
@@ -65,7 +53,8 @@ locals {
 }
 
 resource "rhcs_cluster_rosa_classic" "rosa_sts_cluster" {
-  name                 = var.cluster_name
+  count                = var.clusters_per_apply
+  name                 = "${var.cluster_name}-${format("%04d", var.loop_factor + count.index + 1)}"
   cloud_region         = var.cloud_region
   aws_account_id       = data.aws_caller_identity.current.account_id
   availability_zones   = var.availability_zones
@@ -79,5 +68,6 @@ resource "rhcs_cluster_rosa_classic" "rosa_sts_cluster" {
     rosa_creator_arn = data.aws_caller_identity.current.arn
   }
   sts                      = local.sts_roles
-  wait_for_create_complete = true
+  wait_for_create_complete = false
+  disable_waiting_in_destroy = true
 }

libs/platforms/rosa/terraform/files/variables.tf

@@ -23,6 +23,21 @@ variable "cluster_name" {
   default = "rbur-000-0001"
 }
 
+variable "clusters_per_apply" {
+  type    = number
+  default = null
+}
+
+variable "loop_factor" {
+  type    = number
+  default = null
+}
+
+variable "oidc_config_id" {
+  type    = string
+  default = null
+}
+
 variable "cloud_region" {
   type    = string
   default = "us-east-2"