Merge pull request openshift#97 from clnperez/merge-20220112

Merge 20220112

OWNERS_ALIASES

@@ -24,16 +24,12 @@ aliases:
     - cfergeau
   openstack-approvers:
     - EmilienM
-    - adduarte
-    - iamemilio
     - mandre
     - mdbooth
     - pierreprinetti
     - stephenfin
   openstack-reviewers:
     - EmilienM
-    - adduarte
-    - iamemilio
     - mandre
     - mdbooth
     - pierreprinetti

data/data/alibabacloud/bootstrap/versions.tf

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

data/data/alibabacloud/cluster/dns/versions.tf

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

data/data/alibabacloud/cluster/main.tf

@@ -23,12 +23,17 @@ module "resource_group" {
 }
 
 module "vpc" {
-  source              = "./vpc"
-  vpc_id              = var.ali_vpc_id
-  vswitch_ids         = var.ali_vswitch_ids
-  cluster_id          = var.cluster_id
-  region_id           = var.ali_region_id
-  zone_ids            = distinct(var.ali_zone_ids)
+  source      = "./vpc"
+  vpc_id      = var.ali_vpc_id
+  vswitch_ids = var.ali_vswitch_ids
+  cluster_id  = var.cluster_id
+  region_id   = var.ali_region_id
+  zone_ids = distinct(
+    concat(
+      var.ali_master_availability_zone_ids,
+      var.ali_worker_availability_zone_ids,
+    ),
+  )
   nat_gateway_zone_id = var.ali_nat_gateway_zone_id
   resource_group_id   = module.resource_group.resource_group_id
   vpc_cidr_block      = var.machine_v4_cidrs[0]
@@ -59,7 +64,7 @@ module "master" {
   cluster_id           = var.cluster_id
   resource_group_id    = module.resource_group.resource_group_id
   vpc_id               = module.vpc.vpc_id
-  zone_ids             = var.ali_zone_ids
+  zone_ids             = var.ali_master_availability_zone_ids
   az_to_vswitch_id     = module.vpc.az_to_vswitch_id
   sg_id                = module.vpc.sg_master_id
   slb_ids              = module.vpc.slb_ids

data/data/alibabacloud/cluster/master/versions.tf

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

data/data/alibabacloud/cluster/ram/versions.tf

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

data/data/alibabacloud/cluster/resourcegroup/versions.tf

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

data/data/alibabacloud/cluster/versions.tf

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

data/data/alibabacloud/cluster/vpc/nat_gateway.tf

@@ -1,11 +1,11 @@
 
 resource "alicloud_nat_gateway" "nat_gateway" {
-  vpc_id           = local.vpc_id
-  specification    = "Small"
-  nat_gateway_name = "${local.prefix}-ngw"
-  vswitch_id       = alicloud_vswitch.vswitch_nat_gateway.id
-  nat_type         = "Enhanced"
-  description      = local.description
+  vpc_id               = local.vpc_id
+  nat_gateway_name     = "${local.prefix}-ngw"
+  vswitch_id           = alicloud_vswitch.vswitch_nat_gateway.id
+  internet_charge_type = "PayByLcu"
+  nat_type             = "Enhanced"
+  description          = local.description
   tags = merge(
     {
       "Name" = "${local.prefix}-ngw"

data/data/alibabacloud/cluster/vpc/variables.tf

@@ -16,7 +16,7 @@ variable "vswitch_ids" {
 
 variable "zone_ids" {
   type        = list(string)
-  description = "The availability zones in which to create the masters."
+  description = "The availability zones in which to create the masters, workers and bootstrap node."
 }
 
 variable "nat_gateway_zone_id" {

data/data/alibabacloud/cluster/vpc/versions.tf

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

data/data/alibabacloud/variables-alibabacloud.tf

@@ -23,11 +23,16 @@ variable "ali_private_zone_id" {
   type = string
 }
 
-variable "ali_zone_ids" {
+variable "ali_master_availability_zone_ids" {
   type        = list(string)
   description = "The availability zones in which to create the masters. The length of this list must match master_count."
 }
 
+variable "ali_worker_availability_zone_ids" {
+  type        = list(string)
+  description = "The availability zones to provision for workers. Worker instances are created by the machine-API operator, but this variable controls their supporting VSwitches."
+}
+
 variable "ali_nat_gateway_zone_id" {
   type        = string
   description = "The availability zone in which to create the NAT gateway."

data/data/aws/bootstrap/versions.tf

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

data/data/aws/cluster/iam/versions.tf

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

data/data/aws/cluster/master/versions.tf

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

data/data/aws/cluster/route53/base.tf

@@ -13,6 +13,8 @@ data "aws_route53_zone" "public" {
   count = local.public_endpoints ? 1 : 0
 
   name = var.base_domain
+
+  depends_on = [aws_route53_record.api_external_internal_zone_alias, aws_route53_record.api_external_internal_zone_cname]
 }
 
 data "aws_route53_zone" "int" {
@@ -35,8 +37,6 @@ resource "aws_route53_zone" "new_int" {
     },
     var.tags,
   )
-
-  depends_on = [aws_route53_record.api_external_alias, aws_route53_record.api_external_cname]
 }
 
 resource "aws_route53_record" "api_external_alias" {

data/data/aws/cluster/route53/versions.tf

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

data/data/aws/cluster/versions.tf

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

data/data/aws/cluster/vpc/versions.tf

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

data/data/azure/bootstrap/versions.tf

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

data/data/azure/cluster/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/cluster/master/versions.tf

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

data/data/azure/cluster/versions.tf

@@ -1,4 +1,14 @@
-
 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/variables-azure.tf

@@ -63,76 +63,88 @@ variable "azure_image_url" {
 
 variable "azure_arm_endpoint" {
   type        = string
-  default     = ""
   description = "The endpoint for the Azure API. Only used when installing to Azure Stack"
 }
 
-variable "azure_subscription_id" {
+variable "azure_bootstrap_ignition_stub" {
+  type        = string
+  description = "The bootstrap ignition stub. Only used when installing to Azure Stack"
+}
+
+variable "azure_bootstrap_ignition_url_placeholder" {
   type        = string
+  description = <<EOF
+The placeholder value in the bootstrap ignition to be replaced with the ignition URL.
+Only used when installing to Azure Stack
+EOF
+}
+
+variable "azure_subscription_id" {
+  type = string
   description = "The subscription that should be used to interact with Azure API"
 }
 
 variable "azure_client_id" {
-  type        = string
+  type = string
   description = "The app ID that should be used to interact with Azure API"
 }
 
 variable "azure_client_secret" {
-  type        = string
+  type = string
   description = "The password that should be used to interact with Azure API"
 }
 
 variable "azure_tenant_id" {
-  type        = string
+  type = string
   description = "The tenant ID that should be used to interact with Azure API"
 }
 
 variable "azure_master_availability_zones" {
-  type        = list(string)
+  type = list(string)
   description = "The availability zones in which to create the masters. The length of this list must match master_count."
 }
 
 variable "azure_preexisting_network" {
-  type        = bool
-  default     = false
+  type = bool
+  default = false
   description = "Specifies whether an existing network should be used or a new one created for installation."
 }
 
 variable "azure_resource_group_name" {
-  type        = string
+  type = string
   description = <<EOF
 The name of the resource group for the cluster. If this is set, the cluster is installed to that existing resource group
 otherwise a new resource group will be created using cluster id.
 EOF
 }
 
 variable "azure_network_resource_group_name" {
-  type = string
+  type        = string
   description = "The name of the network resource group, either existing or to be created."
 }
 
 variable "azure_virtual_network" {
-  type = string
+  type        = string
   description = "The name of the virtual network, either existing or to be created."
 }
 
 variable "azure_control_plane_subnet" {
-  type = string
+  type        = string
   description = "The name of the subnet for the control plane, either existing or to be created."
 }
 
 variable "azure_compute_subnet" {
-  type = string
+  type        = string
   description = "The name of the subnet for worker nodes, either existing or to be created"
 }
 
 variable "azure_private" {
-  type = bool
+  type        = bool
   description = "This determines if this is a private cluster or not."
 }
 
 variable "azure_outbound_user_defined_routing" {
-  type = bool
+  type    = bool
   default = false
 
   description = <<EOF