Re-add ipv4 output needed for tests run remotely

- Remove image name and port variables to simplify example.
- Update docs

Author: karlkfi

examples/instance_with_config_file/README.md

@@ -10,12 +10,8 @@ This example illustrates how to deploy and expose a container to a Google Comput
 | additional\_metadata | Additional metadata to attach to the instance | map(string) | `<map>` | no |
 | client\_email | Service account email address | string | `""` | no |
 | cos\_image\_name | The forced COS image to use instead of latest | string | `"cos-stable-77-12371-89-0"` | no |
-| image | The Docker image to deploy to GCE instances | string | `"gcr.io/google-samples/hello-app:1.0"` | no |
-| image\_port | The port the image exposes for HTTP requests | string | `"8080"` | no |
 | instance\_name | The desired name to assign to the deployed instance | string | `"hello-world-container-vm"` | no |
-| machine\_type | The GCP machine type to deploy | string | `"n1-standard-1"` | no |
 | project\_id | The project ID to deploy resources into | string | n/a | yes |
-| restart\_policy | The desired Docker restart policy for the deployed image | string | `"Always"` | no |
 | subnetwork | The name of the subnetwork to deploy instances into | string | n/a | yes |
 | subnetwork\_project | The project ID where the desired subnetwork is provisioned | string | n/a | yes |
 | zone | The GCP zone to deploy instances into | string | n/a | yes |
@@ -25,9 +21,6 @@ This example illustrates how to deploy and expose a container to a Google Comput
 | Name | Description |
 |------|-------------|
 | container | The container metadata provided to the module |
-| cos\_image\_name | The cos image used |
-| http\_address | The IP address on which the HTTP service is exposed |
-| http\_port | The port on which the HTTP service is exposed |
 | instance\_name | The deployed instance name |
 | ipv4 | The public IP address of the deployed instance |
 | vm\_container\_label | The instance label containing container configuration |

examples/instance_with_config_file/main.tf

@@ -34,7 +34,7 @@ module "gce-container" {
   cos_image_name = var.cos_image_name
 
   container = {
-    image = var.image
+    image = "gcr.io/google-samples/hello-app:1.0"
 
     volumeMounts = [
       {

examples/instance_with_config_file/outputs.tf

@@ -16,7 +16,7 @@
 
 output "instance_name" {
   description = "The deployed instance name"
-  value       = google_compute_instance.vm.instance_name
+  value       = google_compute_instance.vm.name
 }
 
 output "vm_container_label" {
@@ -33,3 +33,8 @@ output "volumes" {
   description = "The volume metadata provided to the module"
   value       = module.gce-container.volumes
 }
+
+output "ipv4" {
+  description = "The public IP address of the deployed instance"
+  value       = google_compute_instance.vm.network_interface.0.access_config.0.nat_ip
+}

examples/instance_with_config_file/variables.tf

@@ -31,16 +31,6 @@ variable "instance_name" {
   default     = "hello-world-container-vm"
 }
 
-variable "image" {
-  description = "The Docker image to deploy to GCE instances"
-  default     = "gcr.io/google-samples/hello-app:1.0"
-}
-
-variable "image_port" {
-  description = "The port the image exposes for HTTP requests"
-  default     = "8080"
-}
-
 variable "zone" {
   description = "The GCP zone to deploy instances into"
   type        = string

test/fixtures/instance_with_config_file/example.tf

@@ -38,9 +38,6 @@ module "example" {
   instance_name      = "cft-test-${local.example_name}-${random_string.suffix.result}"
   client_email       = var.sa_email
 
-  image          = "gcr.io/google-samples/hello-app:1.0"
-  image_port     = "8080"
-
   additional_metadata = {
     "sshKeys" = "user:${tls_private_key.gce-keypair.public_key_openssh}"
   }