Merge pull request #2357 from TimeIncOSS/gke

Add support for GKE (Google Container Engine)

builtin/providers/google/config.go

@@ -15,6 +15,7 @@ import (
 	"golang.org/x/oauth2/jwt"
 	computeBeta "google.golang.org/api/compute/v0.beta"
 	"google.golang.org/api/compute/v1"
+	"google.golang.org/api/container/v1"
 	"google.golang.org/api/dns/v1"
 	"google.golang.org/api/storage/v1"
 )
@@ -28,6 +29,7 @@ type Config struct {
 
 	clientCompute     *compute.Service
 	clientComputeBeta *computeBeta.Service
+	clientContainer   *container.Service
 	clientDns         *dns.Service
 	clientStorage     *storage.Service
 }
@@ -58,6 +60,7 @@ func (c *Config) loadAndValidate() error {
 
 		clientScopes := []string{
 			"https://www.googleapis.com/auth/compute",
+			"https://www.googleapis.com/auth/cloud-platform",
 			"https://www.googleapis.com/auth/ndev.clouddns.readwrite",
 			"https://www.googleapis.com/auth/devstorage.full_control",
 		}
@@ -119,6 +122,13 @@ func (c *Config) loadAndValidate() error {
 	}
 	c.clientComputeBeta.UserAgent = userAgent
 
+	log.Printf("[INFO] Instantiating GKE client...")
+	c.clientContainer, err = container.New(client)
+	if err != nil {
+		return err
+	}
+	c.clientContainer.UserAgent = userAgent
+
 	log.Printf("[INFO] Instantiating Google Cloud DNS client...")
 	c.clientDns, err = dns.New(client)
 	if err != nil {

builtin/providers/google/provider.go

@@ -39,6 +39,7 @@ func Provider() terraform.ResourceProvider {
 			"google_compute_network":           resourceComputeNetwork(),
 			"google_compute_route":             resourceComputeRoute(),
 			"google_compute_target_pool":       resourceComputeTargetPool(),
+			"google_container_cluster":         resourceContainerCluster(),
 			"google_dns_managed_zone":          resourceDnsManagedZone(),
 			"google_dns_record_set":            resourceDnsRecordSet(),
 			"google_storage_bucket":            resourceStorageBucket(),