Merge pull request #43 from omazin/public-ip

[instance_template] Support public IPs.

.gitignore

@@ -5,7 +5,6 @@ terraform.tfvars
 **/account.json
 **/credentials
 .DS_Store
-.kitchen
 .terraform
 .terraform.tfstate.d
 *.pyc
@@ -16,3 +15,9 @@ __pycache__/
 *.iml
 
 *.json
+
+# Kitchen files
+**/inspec.lock
+**/.kitchen
+**/kitchen.local.yml
+**/Gemfile.lock

CHANGELOG.md

@@ -7,6 +7,10 @@ project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Added
+
+- Support for public IPs. Added `access_config` variable. [#43]
+
 ## [1.1.1] - 2019-10-25
 ### Fixed
 
@@ -57,3 +61,4 @@ project adheres to [Semantic Versioning](http://semver.org/).
 [#26]: https://github.com/terraform-google-modules/terraform-google-vm/pull/26
 [#37]: https://github.com/terraform-google-modules/terraform-google-vm/pull/37
 [#38]: https://github.com/terraform-google-modules/terraform-google-vm/pull/38
+[#43]: https://github.com/terraform-google-modules/terraform-google-vm/pull/43

Makefile

@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.1.0
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 

README.md

@@ -28,7 +28,7 @@ See also the [project_services](modules/project_services) module (optional).
 ## Notes
 
 `distribution_policy_zones` cannot be changed during use. If you have changed them yourself or
- used to have a default value, then you'll have to force recreate a MIG group yourself.
+used to have a default value, then you'll have to force recreate a MIG group yourself.
 
 ## Test Configuration
 

build/int.cloudbuild.yaml

@@ -38,4 +38,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.1.0'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0'

build/lint.cloudbuild.yaml

@@ -21,4 +21,4 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.1.0'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0'

examples/instance_template/simple/main.tf

@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,18 @@
  * limitations under the License.
  */
 
+
+resource "google_compute_address" "ip_address" {
+  name = "external-ip"
+}
+
+locals {
+  access_config = {
+    nat_ip       = google_compute_address.ip_address.address
+    network_tier = "PREMIUM"
+  }
+}
+
 provider "google" {
   credentials = file(var.credentials_path)
   project     = var.project_id
@@ -29,5 +41,6 @@ module "instance_template" {
   name_prefix     = "simple"
   tags            = var.tags
   labels          = var.labels
+  access_config   = [local.access_config]
 }
 

modules/instance_template/README.md

@@ -15,6 +15,7 @@ See the [simple](../../examples/instance_template/simple) for a usage example.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
+| access\_config | Access configurations, i.e. IPs via which the VM instance can be accessed via the Internet. | object | `<list>` | no |
 | additional\_disks | List of maps of additional disks. See https://www.terraform.io/docs/providers/google/r/compute_instance_template.html#disk_name | object | `<list>` | no |
 | auto\_delete | Whether or not the boot disk should be auto-deleted | string | `"true"` | no |
 | can\_ip\_forward | Enable IP forwarding, for NAT instances for example | string | `"false"` | no |

modules/instance_template/main.tf

@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -99,6 +99,13 @@ resource "google_compute_instance_template" "tpl" {
     network            = var.network
     subnetwork         = var.subnetwork
     subnetwork_project = var.subnetwork_project
+    dynamic "access_config" {
+      for_each = var.access_config
+      content {
+        nat_ip       = access_config.value.nat_ip
+        network_tier = access_config.value.network_tier
+      }
+    }
   }
 
   lifecycle {

modules/instance_template/variables.tf

@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -164,3 +164,15 @@ variable "shielded_instance_config" {
     enable_integrity_monitoring = true
   }
 }
+
+###########################
+# Public IP
+###########################
+variable "access_config" {
+  description = "Access configurations, i.e. IPs via which the VM instance can be accessed via the Internet."
+  type        = list(object({
+    nat_ip       = string
+    network_tier = string
+  }))
+  default     = []
+}

modules/preemptible_and_regular_instance_templates/README.md

@@ -12,6 +12,7 @@ See the [simple](../../examples/preemptible_and_regular_instance_templates/simpl
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
+| access\_config | Access configurations, i.e. IPs via which the VM instance can be accessed via the Internet. | object | `<list>` | no |
 | additional\_disks | List of maps of additional disks. See https://www.terraform.io/docs/providers/google/r/compute_instance_template.html#disk_name | object | `<list>` | no |
 | auto\_delete | Whether or not the boot disk should be auto-deleted | string | `"true"` | no |
 | can\_ip\_forward | Enable IP forwarding, for NAT instances for example | string | `"false"` | no |

modules/preemptible_and_regular_instance_templates/main.tf

@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,7 @@ module "preemptible" {
   network              = var.network
   subnetwork           = var.subnetwork
   subnetwork_project   = var.subnetwork_project
+  access_config        = var.access_config
   preemptible          = true
 }
 
@@ -63,5 +64,6 @@ module "regular" {
   network              = var.network
   subnetwork           = var.subnetwork
   subnetwork_project   = var.subnetwork_project
+  access_config        = var.access_config
   preemptible          = false
 }

modules/preemptible_and_regular_instance_templates/variables.tf

@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -135,3 +135,15 @@ variable "service_account" {
   })
   description = "Service account to attach to the instance. See https://www.terraform.io/docs/providers/google/r/compute_instance_template.html#service_account."
 }
+
+###########################
+# Public IP
+###########################
+variable "access_config" {
+  description = "Access configurations, i.e. IPs via which the VM instance can be accessed via the Internet."
+  type        = list(object({
+    nat_ip       = string
+    network_tier = string
+  }))
+  default     = []
+}