Merge pull request GoogleCloudPlatform#31 from wripley/master

Updated tf to 0.12 (patch applied from https://github.com/GoogleCloud…

Jenkinsfile

@@ -35,7 +35,7 @@ metadata:
 spec:
   containers:
   - name: ${containerName}
-    image: gcr.io/pso-helmsman-cicd/jenkins-k8s-node:${env.CONTAINER_VERSION}
+    image: gcr.io/pso-helmsman-cicd/jenkins-k8s-node:${env.JENKINS_CONTAINER_VERSION}
     command: ['cat']
     tty: true
     volumeMounts:

README.md

@@ -71,7 +71,7 @@ gcloud init
 
 
 ### Tools
-1. [Terraform >= 0.11.7](https://www.terraform.io/downloads.html)
+1. [Terraform >= 0.12](https://www.terraform.io/downloads.html)
 2. [Google Cloud SDK version >= 204.0.0](https://cloud.google.com/sdk/docs/downloads-versioned-archives)
 3. [kubectl matching the latest GKE version](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
 4. bash or bash compatible shell

terraform/main.tf

@@ -26,8 +26,8 @@ limitations under the License.
 // Provides access to available Google Container Engine versions in a zone for a given project.
 // https://www.terraform.io/docs/providers/google/d/google_container_engine_versions.html
 data "google_container_engine_versions" "on-prem" {
-  zone    = "${var.zone}"
-  project = "${var.project}"
+  zone    = var.zone
+  project = var.project
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////
@@ -55,7 +55,7 @@ resource "google_bigquery_dataset" "gke-bigquery-dataset" {
   location                    = "US"
   default_table_expiration_ms = 3600000
 
-  labels {
+  labels = {
     env = "default"
   }
 }
@@ -68,9 +68,9 @@ resource "google_bigquery_dataset" "gke-bigquery-dataset" {
 // https://www.terraform.io/docs/providers/google/d/google_container_cluster.html
 resource "google_container_cluster" "primary" {
   name               = "stackdriver-logging"
-  zone               = "${var.zone}"
+  zone               = var.zone
   initial_node_count = 2
-  min_master_version = "${data.google_container_engine_versions.on-prem.latest_master_version}"
+  min_master_version = data.google_container_engine_versions.on-prem.latest_master_version
 
   node_config {
     oauth_scopes = [
@@ -81,6 +81,7 @@ resource "google_container_cluster" "primary" {
     ]
   }
 
+  // These local-execs are used to provision the sample service
   // These local-execs are used to provision the sample service
   provisioner "local-exec" {
     command = "gcloud container clusters get-credentials ${google_container_cluster.primary.name} --zone ${google_container_cluster.primary.zone} --project ${var.project}"
@@ -125,7 +126,7 @@ resource "google_project_iam_binding" "log-writer-storage" {
   role = "roles/storage.objectCreator"
 
   members = [
-    "${google_logging_project_sink.storage-sink.writer_identity}",
+    google_logging_project_sink.storage-sink.writer_identity,
   ]
 }
 
@@ -134,6 +135,7 @@ resource "google_project_iam_binding" "log-writer-bigquery" {
   role = "roles/bigquery.dataEditor"
 
   members = [
-    "${google_logging_project_sink.bigquery-sink.writer_identity}",
+    google_logging_project_sink.bigquery-sink.writer_identity,
   ]
 }
+

terraform/provider.tf

@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-
 // Configles the Google Cloud Provider with default settings
 provider "google" {
-  project = "${var.project}"
-  version = "~> 1.13"
+  project = var.project
+  version = "~> 2.10.0"
 }
+

terraform/variables.tf

@@ -14,18 +14,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-
 /*
 Required Variables
 These must be provided at runtime.
 */
 
 variable "zone" {
   description = "The zone in which to create the Kubernetes cluster. Must match the region"
-  type        = "string"
+  type        = string
 }
 
 variable "project" {
   description = "The name of the project in which to create the Kubernetes cluster."
-  type        = "string"
+  type        = string
 }
+

terraform/versions.tf

@@ -0,0 +1,19 @@
+/*
+Copyright 2018 Google LLC
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+terraform {
+  required_version = ">= 0.12"
+}