Merge pull request #83 from equinix/metros

displague · web-flow · commit ee073d0652fd · 2021-09-30T10:54:24.000-04:00
add support for metros
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -18,15 +18,15 @@ jobs:
       TF_VERSION: ${{ matrix.tf }}
       TF_VAR_control_plane_node_count: 0
       TF_VAR_count_x86: 1
-      TF_VAR_count_arm: 1
+      TF_VAR_count_arm: 0
       KUBERNETES_VERSION: 1.21.0
       TF_VAR_kubernetes_version: 1.21.0-00
       # TODO only provide this to terraform steps that need it
       TF_VAR_auth_token: ${{ secrets.METAL_AUTH_TOKEN }}
     strategy:
       matrix:
         os: [ubuntu-latest]
-        tf: [0.13.2]
+        tf: [0.14.10]
     steps:
     - name: Checkout from Github
       uses: actions/checkout@v2
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        tf: [0.13.2]
+        tf: [0.14.10]
     steps:
     - name: Checkout from Github
       uses: actions/checkout@v2
diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ This project configures your cluster with:
 
 The only required variables are `auth_token` (your [Equinix Metal API](https://metal.equinix.com/developers/api/) key), `count_x86` (the number of x86 devices), and `count_arm` (ARM devices).
 
-Other options include `secrets_encryption` (`"yes"` configures your controller with encryption for secrets--this is disabled by default), and fields like `facility` (the Equinix Metal location to deploy to) and `plan_x86` or `plan_arm` (to determine the server type of these architectures) can be specified as well. Refer to `vars.tf` for a complete catalog of tunable options.
+Other options include `secrets_encryption` (`"yes"` configures your controller with encryption for secrets--this is disabled by default), and fields like `facility` and `metro` (the Equinix Metal location to deploy to) and `plan_x86` or `plan_arm` (to determine the server type of these architectures) can be specified as well. Refer to `vars.tf` for a complete catalog of tunable options.
 
 ## Getting Started
 
diff --git a/examples/controller_pool.tf b/examples/controller_pool.tf
@@ -10,6 +10,7 @@ module "controller_pool_primary" {
   count_gpu                = var.count_gpu
   plan_primary             = var.plan_primary
   facility                 = var.facility
+  metro                    = var.metro
   cluster_name             = var.cluster_name
   kubernetes_lb_block      = metal_reserved_ip_block.kubernetes.cidr_notation
   project_id               = var.project_id
diff --git a/examples/gpu-node_pool.tf b/examples/gpu-node_pool.tf
@@ -7,6 +7,7 @@ module "node_pool_gpu_green" {
   count_gpu          = var.count_gpu
   plan_gpu           = var.plan_gpu
   facility           = var.facility
+  metro              = var.metro
   cluster_name       = var.cluster_name
   controller_address = metal_device.k8s_primary.network.0.address
   project_id         = var.project_id
diff --git a/examples/new_node_pool.tf b/examples/new_node_pool.tf
@@ -12,6 +12,7 @@ module "node_pool_green" {
   plan_x86           = var.plan_x86
   plan_arm           = var.plan_arm
   facility           = var.facility
+  metro              = var.metro
   cluster_name       = var.cluster_name
   controller_address = metal_device.k8s_primary.network.0.address
   project_id         = metal_project.kubernetes_multiarch.id
diff --git a/kubernetes-controller-pool.tf b/kubernetes-controller-pool.tf
@@ -30,7 +30,8 @@ resource "metal_ssh_key" "kubernetes-on-metal" {
 
 resource "metal_reserved_ip_block" "kubernetes" {
   project_id = var.metal_create_project ? metal_project.new_project[0].id : var.project_id
-  facility   = var.facility
+  facility   = var.facility != "" ? var.facility : null
+  metro      = var.metro != "" ? var.metro : null
   quantity   = 4
 }
 
@@ -43,6 +44,7 @@ module "controllers" {
   count_gpu                = var.count_gpu
   plan_primary             = var.plan_primary
   facility                 = var.facility
+  metro                    = var.metro
   cluster_name             = var.cluster_name
   kubernetes_lb_block      = metal_reserved_ip_block.kubernetes.cidr_notation
   project_id               = var.metal_create_project ? metal_project.new_project[0].id : var.project_id
@@ -53,7 +55,7 @@ module "controllers" {
   workloads                = var.workloads
   skip_workloads           = var.skip_workloads
   control_plane_node_count = var.control_plane_node_count
-  ssh_private_key_path     = local_file.cluster_private_key_pem.filename
+  ssh_private_key_path     = abspath(local_file.cluster_private_key_pem.filename)
   ccm_enabled              = var.ccm_enabled
   loadbalancer_type        = var.loadbalancer_type
 }
diff --git a/kubernetes-node-pool.tf b/kubernetes-node-pool.tf
@@ -9,6 +9,7 @@ module "node_pool_blue" {
   plan_x86           = var.plan_x86
   plan_arm           = var.plan_arm
   facility           = var.facility
+  metro              = var.metro
   cluster_name       = var.cluster_name
   controller_address = module.controllers.controller_addresses
   project_id         = var.metal_create_project ? metal_project.new_project[0].id : var.project_id
@@ -26,6 +27,7 @@ module "node_pool_gpu_green" {
   count_gpu          = var.count_gpu
   plan_gpu           = var.plan_gpu
   facility           = var.facility
+  metro              = var.metro
   cluster_name       = var.cluster_name
   controller_address = module.controllers.controller_addresses
   project_id         = var.metal_create_project ? metal_project.new_project[0].id : var.project_id
diff --git a/modules/controller_pool/main.tf b/modules/controller_pool/main.tf
@@ -30,7 +30,8 @@ resource "metal_device" "k8s_primary" {
   hostname         = "${var.cluster_name}-controller-primary"
   operating_system = "ubuntu_18_04"
   plan             = var.plan_primary
-  facilities       = [var.facility]
+  facilities       = var.facility != "" ? [var.facility] : null
+  metro            = var.metro != "" ? var.metro : null
   user_data        = data.template_file.controller-primary.rendered
   tags             = ["kubernetes", "controller-${var.cluster_name}"]
 
@@ -56,7 +57,8 @@ resource "metal_device" "k8s_controller_standby" {
   hostname         = format("${var.cluster_name}-controller-standby-%02d", count.index)
   operating_system = "ubuntu_18_04"
   plan             = var.plan_primary
-  facilities       = [var.facility]
+  facilities       = var.facility != "" ? [var.facility] : null
+  metro            = var.metro != "" ? var.metro : null
   user_data        = data.template_file.controller-standby.rendered
   tags             = ["kubernetes", "controller-${var.cluster_name}"]
   billing_cycle    = "hourly"
diff --git a/modules/controller_pool/variables.tf b/modules/controller_pool/variables.tf
@@ -10,7 +10,12 @@ variable "kubernetes_version" {
 
 variable "facility" {
   type        = string
-  description = "Equinix Metal Facility"
+  description = "Equinix Metal Facility (conflicts with metro)"
+}
+
+variable "metro" {
+  type        = string
+  description = "Equinix Metal Metro (conflicts with facility)"
 }
 
 variable "cluster_name" {
@@ -26,6 +31,7 @@ variable "project_id" {
 variable "auth_token" {
   type        = string
   description = "Your Equinix Metal API token"
+  sensitive   = true
 }
 
 variable "secrets_encryption" {
diff --git a/modules/controller_pool/versions.tf b/modules/controller_pool/versions.tf
@@ -2,11 +2,11 @@ terraform {
   required_providers {
     metal = {
       source  = "equinix/metal"
-      version = "1.0.0"
+      version = ">= 2.1, <4"
     }
     template = {
       source = "hashicorp/template"
     }
   }
-  required_version = ">= 0.13"
+  required_version = ">= 0.14"
 }
diff --git a/modules/gpu_node_pool/main.tf b/modules/gpu_node_pool/main.tf
@@ -15,7 +15,8 @@ resource "metal_device" "gpu_node" {
   operating_system = "ubuntu_18_04"
   count            = var.count_gpu
   plan             = var.plan_gpu
-  facilities       = [var.facility]
+  facilities       = var.facility != "" ? [var.facility] : null
+  metro            = var.metro != "" ? var.metro : null
   user_data        = data.template_file.gpu_node.rendered
   tags             = ["kubernetes", "pool-${var.cluster_name}-${var.pool_label}-gpu"]
 
diff --git a/modules/gpu_node_pool/variables.tf b/modules/gpu_node_pool/variables.tf
@@ -26,7 +26,12 @@ variable "plan_gpu" {
 
 variable "facility" {
   type        = string
-  description = "Equinix Metal Facility"
+  description = "Equinix Metal Facility (conflicts with metro)"
+}
+
+variable "metro" {
+  type        = string
+  description = "Equinix Metal Metro (conflicts with facility)"
 }
 
 variable "cluster_name" {
diff --git a/modules/gpu_node_pool/versions.tf b/modules/gpu_node_pool/versions.tf
@@ -2,11 +2,11 @@ terraform {
   required_providers {
     metal = {
       source  = "equinix/metal"
-      version = "1.0.0"
+      version = ">= 2.1, <4"
     }
     template = {
       source = "hashicorp/template"
     }
   }
-  required_version = ">= 0.13"
+  required_version = ">= 0.14"
 }
diff --git a/modules/kube-token/versions.tf b/modules/kube-token/versions.tf
@@ -0,0 +1,8 @@
+terraform {
+  required_providers {
+    template = {
+      source = "hashicorp/random"
+    }
+  }
+  required_version = ">= 0.14"
+}
diff --git a/modules/node_pool/main.tf b/modules/node_pool/main.tf
@@ -15,7 +15,8 @@ resource "metal_device" "x86_node" {
   operating_system = "ubuntu_18_04"
   count            = var.count_x86
   plan             = var.plan_x86
-  facilities       = [var.facility]
+  facilities       = var.facility != "" ? [var.facility] : null
+  metro            = var.metro != "" ? var.metro : null
   user_data        = data.template_file.node.rendered
   tags             = ["kubernetes", "pool-${var.cluster_name}-${var.pool_label}-x86"]
 
@@ -28,7 +29,8 @@ resource "metal_device" "arm_node" {
   operating_system = "ubuntu_18_04"
   count            = var.count_arm
   plan             = var.plan_arm
-  facilities       = [var.facility]
+  facilities       = var.facility != "" ? [var.facility] : null
+  metro            = var.metro
   user_data        = data.template_file.node.rendered
   tags             = ["kubernetes", "pool-${var.cluster_name}-${var.pool_label}-arm"]
 
diff --git a/modules/node_pool/variables.tf b/modules/node_pool/variables.tf
@@ -36,7 +36,12 @@ variable "plan_arm" {
 
 variable "facility" {
   type        = string
-  description = "Equinix Metal Facility"
+  description = "Equinix Metal Facility (conflicts with metro)"
+}
+
+variable "metro" {
+  type        = string
+  description = "Equinix Metal Metro (conflicts with facility)"
 }
 
 variable "cluster_name" {
diff --git a/modules/node_pool/versions.tf b/modules/node_pool/versions.tf
@@ -2,11 +2,11 @@ terraform {
   required_providers {
     metal = {
       source  = "equinix/metal"
-      version = "1.0.0"
+      version = ">= 2.1, <4"
     }
     template = {
       source = "hashicorp/template"
     }
   }
-  required_version = ">= 0.13"
+  required_version = ">= 0.14"
 }
diff --git a/terraform.tfvars.sample b/terraform.tfvars.sample
@@ -1,11 +1,6 @@
-auth_token = ""
-
-project_id = ""
-
-count_arm = 2
-
-count_x86 = 1
-
+auth_token         = ""
+project_id         = ""
+count_arm          = 2
+count_x86          = 1
 secrets_encryption = false
-
-facility = "ewr1"
+metro              = "dc"
diff --git a/variables.tf b/variables.tf
@@ -1,12 +1,19 @@
 variable "auth_token" {
   type        = string
   description = "Your Equinix Metal API key"
+  sensitive   = true
 }
 
 variable "facility" {
   type        = string
-  description = "Equinix Metal Facility"
-  default     = "dc13"
+  description = "Equinix Metal Facility (conflicts with metro)"
+  default     = ""
+}
+
+variable "metro" {
+  type        = string
+  description = "Equinix Metal Metro (conflicts with facility)"
+  default     = "dc"
 }
 
 variable "project_id" {
diff --git a/versions.tf b/versions.tf
@@ -2,8 +2,8 @@ terraform {
   required_providers {
     metal = {
       source  = "equinix/metal"
-      version = "1.0.0"
+      version = ">= 2.1, <4"
     }
   }
-  required_version = ">= 0.13"
+  required_version = ">= 0.14"
 }
