[WIP] terraform: Consolidate bootstrap resources with module count feature

data/data/aws/bootstrap/versions.tf

@@ -0,0 +1,9 @@
+terraform {
+  required_version = ">= 0.14"
+  required_providers {
+    aws = {
+      source = "openshift/local/aws"
+    }
+  }
+}
+

data/data/aws/iam/versions.tf

@@ -0,0 +1,9 @@
+terraform {
+  required_version = ">= 0.14"
+  required_providers {
+    aws = {
+      source = "openshift/local/aws"
+    }
+  }
+}
+

data/data/aws/main.tf

@@ -25,6 +25,7 @@ provider "aws" {
 
 module "bootstrap" {
   source = "./bootstrap"
+  count  = var.bootstrapping ? 1 : 0
 
   ami                      = var.aws_region == var.aws_ami_region ? var.aws_ami : aws_ami_copy.imported[0].id
   instance_type            = var.aws_bootstrap_instance_type

data/data/aws/master/versions.tf

@@ -0,0 +1,9 @@
+terraform {
+  required_version = ">= 0.14"
+  required_providers {
+    aws = {
+      source = "openshift/local/aws"
+    }
+  }
+}
+

data/data/aws/route53/versions.tf

@@ -0,0 +1,8 @@
+terraform {
+  required_version = ">= 0.14"
+  required_providers {
+    aws = {
+      source = "openshift/local/aws"
+    }
+  }
+}

data/data/aws/versions.tf

@@ -0,0 +1,9 @@
+terraform {
+  required_version = ">= 0.14"
+  required_providers {
+    aws = {
+      source = "openshift/local/aws"
+    }
+  }
+}
+

data/data/aws/vpc/versions.tf

@@ -0,0 +1,9 @@
+terraform {
+  required_version = ">= 0.14"
+  required_providers {
+    aws = {
+      source = "openshift/local/aws"
+    }
+  }
+}
+

data/data/azure/bootstrap/versions.tf

@@ -1,4 +1,15 @@
-
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.14"
+  required_providers {
+    local = {
+      source = "openshift/local/local"
+    }
+    azurerm = {
+      source = "openshift/local/azurerm"
+    }
+    ignition = {
+      source = "openshift/local/ignition"
+    }
+  }
 }
+

data/data/azure/dns/versions.tf

@@ -1,4 +1,12 @@
-
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.14"
+  required_providers {
+    azureprivatedns = {
+      source = "openshift/local/azureprivatedns"
+    }
+    azurerm = {
+      source = "openshift/local/azurerm"
+    }
+  }
 }
+

data/data/azure/main.tf

@@ -27,6 +27,7 @@ provider "azureprivatedns" {
 
 module "bootstrap" {
   source                 = "./bootstrap"
+  count                  = var.bootstrapping ? 1 : 0
   resource_group_name    = data.azurerm_resource_group.main.name
   region                 = var.azure_region
   vm_size                = var.azure_bootstrap_vm_type

data/data/azure/master/versions.tf

@@ -1,4 +1,9 @@
-
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.14"
+  required_providers {
+    azurerm = {
+      source = "openshift/local/azurerm"
+    }
+  }
 }
+

data/data/azure/versions.tf

@@ -1,4 +1,15 @@
-
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.14"
+  required_providers {
+    random = {
+      source = "openshift/local/random"
+    }
+    azurerm = {
+      source = "openshift/local/azurerm"
+    }
+    azureprivatedns = {
+      source = "openshift/local/azureprivatedns"
+    }
+  }
 }
+

data/data/azure/vnet/versions.tf

@@ -1,4 +1,9 @@
-
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.14"
+  required_providers {
+    azurerm = {
+      source = "openshift/local/azurerm"
+    }
+  }
 }
+

data/data/baremetal/bootstrap/versions.tf

@@ -1,4 +1,9 @@
-
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.14"
+  required_providers {
+    libvirt = {
+      source = "openshift/local/libvirt"
+    }
+  }
 }
+

data/data/baremetal/main.tf

@@ -16,6 +16,7 @@ provider "ironic" {
 
 module "bootstrap" {
   source = "./bootstrap"
+  count  = var.bootstrapping ? 1 : 0
 
   cluster_id = var.cluster_id
   image      = var.bootstrap_os_image

data/data/baremetal/masters/versions.tf

@@ -1,4 +1,9 @@
-
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.14"
+  required_providers {
+    ironic = {
+      source = "openshift/local/ironic"
+    }
+  }
 }
+

data/data/baremetal/versions.tf

@@ -1,4 +1,12 @@
-
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.14"
+  required_providers {
+    ironic = {
+      source = "openshift/local/ironic"
+    }
+    libvirt = {
+      source = "openshift/local/libvirt"
+    }
+  }
 }
+

data/data/config.tf

@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.14"
 }
 
 variable "machine_v4_cidrs" {
@@ -20,6 +20,13 @@ EOF
 
 }
 
+variable "boostrapping" {
+  type = bool
+  description = <<EOF
+The switch that is used to keep/destroy the bootstrap modules.
+EOF
+}
+
 variable "master_count" {
   type = string
 

data/data/gcp/bootstrap/versions.tf

@@ -0,0 +1,12 @@
+terraform {
+  required_version = ">= 0.14"
+  required_providers {
+    google = {
+      source = "openshift/local/google"
+    }
+    ignition = {
+      source = "openshift/local/ignition"
+    }
+  }
+}
+

data/data/gcp/dns/versions.tf

@@ -0,0 +1,9 @@
+terraform {
+  required_version = ">= 0.14"
+  required_providers {
+    google = {
+      source = "openshift/local/google"
+    }
+  }
+}
+

data/data/gcp/iam/versions.tf

@@ -0,0 +1,9 @@
+terraform {
+  required_version = ">= 0.14"
+  required_providers {
+    google = {
+      source = "openshift/local/google"
+    }
+  }
+}
+

data/data/gcp/main.tf

@@ -22,8 +22,9 @@ provider "google" {
 
 module "bootstrap" {
   source = "./bootstrap"
+  count  = var.bootstrapping ? 1 : 0
 
-  bootstrap_enabled = var.gcp_bootstrap_enabled
+  bootstrap_enabled = var.bootstrapping
 
   image            = local.gcp_image
   machine_type     = var.gcp_bootstrap_instance_type
@@ -76,7 +77,7 @@ module "network" {
   network_cidr       = var.machine_v4_cidrs[0]
   public_endpoints   = local.public_endpoints
 
-  bootstrap_lb              = var.gcp_bootstrap_enabled && var.gcp_bootstrap_lb
+  bootstrap_lb              = var.bootstrapping
   bootstrap_instances       = module.bootstrap.bootstrap_instances
   bootstrap_instance_groups = module.bootstrap.bootstrap_instance_groups
 

data/data/gcp/master/variables.tf

@@ -51,5 +51,5 @@ variable "root_volume_kms_key_link" {
 }
 
 variable "zones" {
-  type = list
+  type = list(any)
 }

data/data/gcp/master/versions.tf

@@ -0,0 +1,9 @@
+terraform {
+  required_version = ">= 0.14"
+  required_providers {
+    google = {
+      source = "openshift/local/google"
+    }
+  }
+}
+

data/data/gcp/network/variables.tf

@@ -4,12 +4,12 @@ variable "cluster_id" {
 }
 
 variable "bootstrap_instances" {
-  type        = list
+  type        = list(any)
   description = "The bootstrap instance."
 }
 
 variable "bootstrap_instance_groups" {
-  type        = list
+  type        = list(any)
   description = "The bootstrap instance groups."
 }
 
@@ -20,12 +20,12 @@ variable "bootstrap_lb" {
 }
 
 variable "master_instances" {
-  type        = list
+  type        = list(any)
   description = "The master instances."
 }
 
 variable "master_instance_groups" {
-  type        = list
+  type        = list(any)
   description = "The master instance groups."
 }
 

data/data/gcp/network/versions.tf

@@ -0,0 +1,9 @@
+terraform {
+  required_version = ">= 0.14"
+  required_providers {
+    google = {
+      source = "openshift/local/google"
+    }
+  }
+}
+

data/data/gcp/variables-gcp.tf

@@ -24,18 +24,6 @@ EOF
   default = {}
 }
 
-variable "gcp_bootstrap_enabled" {
-  type = bool
-  description = "Setting this to false allows the bootstrap resources to be disabled."
-  default = true
-}
-
-variable "gcp_bootstrap_lb" {
-  type = bool
-  description = "Setting this to false allows the bootstrap resources to be removed from the cluster load balancers."
-  default = true
-}
-
 variable "gcp_bootstrap_instance_type" {
   type = string
   description = "Instance type for the bootstrap node. Example: `n1-standard-4`"

data/data/gcp/versions.tf

@@ -0,0 +1,9 @@
+terraform {
+  required_version = ">= 0.14"
+  required_providers {
+    google = {
+      source = "openshift/local/google"
+    }
+  }
+}
+

data/data/kubevirt/bootstrap/versions.tf

@@ -0,0 +1,15 @@
+terraform {
+  required_version = ">= 0.14"
+  required_providers {
+    ignition = {
+      source = "openshift/local/ignition"
+    }
+    kubernetes = {
+      source = "openshift/local/kubernetes"
+    }
+    kubevirt = {
+      source = "openshift/local/kubevirt"
+    }
+  }
+}
+

data/data/kubevirt/datavolume/versions.tf

@@ -0,0 +1,9 @@
+terraform {
+  required_version = ">= 0.14"
+  required_providers {
+    kubevirt = {
+      source = "openshift/local/kubevirt"
+    }
+  }
+}
+

data/data/kubevirt/main.tf

@@ -32,6 +32,7 @@ module "masters" {
 
 module "bootstrap" {
   source         = "./bootstrap"
+  count          = var.bootstrapping ? 1 : 0
   cluster_id     = var.cluster_id
   ignition_data  = var.ignition_bootstrap
   namespace      = var.kubevirt_namespace