Update terraform-provider-google to v3.40.0

cmd/openshift-install/main.go

@@ -41,8 +41,8 @@ func main() {
 	if len(os.Args) > 0 {
 		base := filepath.Base(os.Args[0])
 		cname := strings.TrimSuffix(base, filepath.Ext(base))
-		if pluginRunner, ok := plugins.KnownPlugins[cname]; ok {
-			pluginRunner()
+		if plugin, ok := plugins.KnownPlugins[cname]; ok {
+			plugin.Exec()
 			return
 		}
 	}

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/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/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/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" {

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/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/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/masters/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/versions.tf

@@ -1,3 +1,12 @@
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.14"
+  required_providers {
+    kubernetes = {
+      source = "openshift/local/kubernetes"
+    }
+    kubevirt = {
+      source = "openshift/local/kubevirt"
+    }
+  }
 }
+

data/data/libvirt/bootstrap/versions.tf

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

data/data/libvirt/versions.tf

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

data/data/libvirt/volume/versions.tf

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

data/data/openstack/bootstrap/main.tf

@@ -49,7 +49,7 @@ resource "openstack_compute_instance_v2" "bootstrap" {
 
   user_data = var.bootstrap_shim_ignition
 
-  dynamic block_device {
+  dynamic "block_device" {
     for_each = var.root_volume_size == null ? [] : [openstack_blockstorage_volume_v3.bootstrap_volume[0].id]
     content {
       uuid                  = block_device.value
@@ -64,7 +64,7 @@ resource "openstack_compute_instance_v2" "bootstrap" {
     port = openstack_networking_port_v2.bootstrap_port.id
   }
 
-  dynamic network {
+  dynamic "network" {
     for_each = var.additional_network_ids
 
     content {