Merge pull request #2745 from LorbusChris/gomod

Go Modules Migration

data/assets_generate.go

@@ -1,4 +1,4 @@
-// +build ignore
+// +build tools
 
 package main
 

data/data/aws/vpc/vpc.tf

@@ -27,6 +27,8 @@ resource "aws_vpc_endpoint" "s3" {
     aws_route_table.private_routes.*.id,
     aws_route_table.default.*.id,
   )
+
+  tags = var.tags
 }
 
 resource "aws_vpc_dhcp_options" "main" {

data/data/azure/bootstrap/main.tf

@@ -116,7 +116,7 @@ resource "azurerm_network_interface" "bootstrap" {
         primary : ! var.use_ipv4,
         name : local.bootstrap_nic_ip_v6_configuration_name,
         ip_address_version : "IPv6",
-        public_ip_id : var.private ? null : azurerm_public_ip.bootstrap_public_ip_v6[0].id,
+        public_ip_id : var.private || ! var.use_ipv6 ? null : azurerm_public_ip.bootstrap_public_ip_v6[0].id,
         include : var.use_ipv6,
       },
       ] : {

data/data/azure/main.tf

@@ -177,7 +177,6 @@ resource "azurerm_storage_blob" "rhcos_image" {
   type                   = "block"
   source_uri             = var.azure_image_url
   metadata               = map("source_uri", var.azure_image_url)
-  attempts               = 2
 }
 
 resource "azurerm_image" "cluster" {

data/data/azure/vnet/public-lb.tf

@@ -52,7 +52,7 @@ resource "azurerm_lb" "public" {
     for_each = [for ip in [
       // DEBUG: Azure apparently requires dual stack LB for external load balancers v6
       { name : local.public_lb_frontend_ip_v4_configuration_name, value : azurerm_public_ip.cluster_public_ip_v4[0].id, include : true, ipv6 : false },
-      { name : local.public_lb_frontend_ip_v6_configuration_name, value : azurerm_public_ip.cluster_public_ip_v6[0].id, include : var.use_ipv6, ipv6 : true },
+      { name : local.public_lb_frontend_ip_v6_configuration_name, value : var.use_ipv6 ? azurerm_public_ip.cluster_public_ip_v6[0].id : null, include : var.use_ipv6, ipv6 : true },
       ] : {
       name : ip.name
       value : ip.value

data/data/gcp/bootstrap/main.tf

@@ -3,20 +3,20 @@ resource "google_storage_bucket" "ignition" {
 }
 
 resource "google_storage_bucket_object" "ignition" {
-  bucket  = "${google_storage_bucket.ignition.name}"
+  bucket  = google_storage_bucket.ignition.name
   name    = "bootstrap.ign"
   content = var.ignition
 }
 
 data "google_storage_object_signed_url" "ignition_url" {
-  bucket   = "${google_storage_bucket.ignition.name}"
+  bucket   = google_storage_bucket.ignition.name
   path     = "bootstrap.ign"
   duration = "1h"
 }
 
 data "ignition_config" "redirect" {
   replace {
-    source = "${data.google_storage_object_signed_url.ignition_url.signed_url}"
+    source = data.google_storage_object_signed_url.ignition_url.signed_url
   }
 }
 

data/data/openstack/bootstrap/main.tf

@@ -52,5 +52,5 @@ resource "openstack_networking_floatingip_v2" "bootstrap_fip" {
   port_id     = openstack_networking_port_v2.bootstrap_port.id
   tags        = ["openshiftClusterID=${var.cluster_id}"]
 
-  depends_on = ["openstack_compute_instance_v2.bootstrap"]
+  depends_on = [openstack_compute_instance_v2.bootstrap]
 }

data/data/openstack/main.tf

@@ -90,5 +90,5 @@ resource "openstack_images_image_v2" "base_image" {
 data "openstack_images_image_v2" "base_image" {
   name = var.openstack_base_image_name
 
-  depends_on = ["openstack_images_image_v2.base_image"]
+  depends_on = [openstack_images_image_v2.base_image]
 }

data/data/openstack/masters/main.tf

@@ -23,7 +23,7 @@ data "ignition_config" "master_ignition_config" {
   }
 
   files = [
-    element(data.ignition_file.hostname.*.id, count.index)
+    element(data.ignition_file.hostname.*.rendered, count.index)
   ]
 }