From 8a002b937af5b7867882b4a400269e277bf9eff4 Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Fri, 2 Jun 2017 14:15:26 +0100 Subject: [PATCH 1/3] provider/kubernetes: Ignore k8s internal labels Fixes #13716 --- builtin/providers/kubernetes/structures.go | 10 +++++----- builtin/providers/kubernetes/structures_test.go | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/builtin/providers/kubernetes/structures.go b/builtin/providers/kubernetes/structures.go index 360edc12e..2359f96e5 100644 --- a/builtin/providers/kubernetes/structures.go +++ b/builtin/providers/kubernetes/structures.go @@ -77,11 +77,11 @@ func expandStringSlice(s []interface{}) []string { func flattenMetadata(meta metav1.ObjectMeta) []map[string]interface{} { m := make(map[string]interface{}) - m["annotations"] = filterAnnotations(meta.Annotations) + m["annotations"] = removeInternalKeys(meta.Annotations) if meta.GenerateName != "" { m["generate_name"] = meta.GenerateName } - m["labels"] = meta.Labels + m["labels"] = removeInternalKeys(meta.Labels) m["name"] = meta.Name m["resource_version"] = meta.ResourceVersion m["self_link"] = meta.SelfLink @@ -95,16 +95,16 @@ func flattenMetadata(meta metav1.ObjectMeta) []map[string]interface{} { return []map[string]interface{}{m} } -func filterAnnotations(m map[string]string) map[string]string { +func removeInternalKeys(m map[string]string) map[string]string { for k, _ := range m { - if isInternalAnnotationKey(k) { + if isInternalKey(k) { delete(m, k) } } return m } -func isInternalAnnotationKey(annotationKey string) bool { +func isInternalKey(annotationKey string) bool { u, err := url.Parse("//" + annotationKey) if err == nil && strings.HasSuffix(u.Hostname(), "kubernetes.io") { return true diff --git a/builtin/providers/kubernetes/structures_test.go b/builtin/providers/kubernetes/structures_test.go index 2a0b9003e..a423c3f9a 100644 --- a/builtin/providers/kubernetes/structures_test.go +++ b/builtin/providers/kubernetes/structures_test.go @@ -5,7 +5,7 @@ import ( "testing" ) -func TestIsInternalAnnotationKey(t *testing.T) { +func TestIsInternalKey(t *testing.T) { testCases := []struct { Key string Expected bool @@ -20,7 +20,7 @@ func TestIsInternalAnnotationKey(t *testing.T) { } for i, tc := range testCases { t.Run(fmt.Sprintf("%d", i), func(t *testing.T) { - isInternal := isInternalAnnotationKey(tc.Key) + isInternal := isInternalKey(tc.Key) if tc.Expected && isInternal != tc.Expected { t.Fatalf("Expected %q to be internal", tc.Key) } From d0d3f377951014a1d270f805305123775d3c5abe Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Fri, 2 Jun 2017 14:16:53 +0100 Subject: [PATCH 2/3] provider/kubernetes: Fix failing tests after upgrading to 1.6 --- builtin/providers/kubernetes/provider_test.go | 6 + ...kubernetes_persistent_volume_claim_test.go | 409 ++++++++++-------- ...ource_kubernetes_persistent_volume_test.go | 107 +++-- .../providers/kubernetes/test-infra/main.tf | 4 + 4 files changed, 318 insertions(+), 208 deletions(-) diff --git a/builtin/providers/kubernetes/provider_test.go b/builtin/providers/kubernetes/provider_test.go index fbea586a9..d985927da 100644 --- a/builtin/providers/kubernetes/provider_test.go +++ b/builtin/providers/kubernetes/provider_test.go @@ -5,6 +5,7 @@ import ( "strings" "testing" + "github.com/hashicorp/terraform/builtin/providers/google" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/terraform" ) @@ -16,6 +17,7 @@ func init() { testAccProvider = Provider().(*schema.Provider) testAccProviders = map[string]terraform.ResourceProvider{ "kubernetes": testAccProvider, + "google": google.Provider(), } } @@ -50,4 +52,8 @@ func testAccPreCheck(t *testing.T) { "KUBE_CLUSTER_CA_CERT_DATA", }, ", ")) } + + if os.Getenv("GOOGLE_PROJECT") == "" || os.Getenv("GOOGLE_REGION") == "" || os.Getenv("GOOGLE_ZONE") == "" { + t.Fatal("GOOGLE_PROJECT, GOOGLE_REGION and GOOGLE_ZONE must be set for acceptance tests") + } } diff --git a/builtin/providers/kubernetes/resource_kubernetes_persistent_volume_claim_test.go b/builtin/providers/kubernetes/resource_kubernetes_persistent_volume_claim_test.go index 529b0e4ee..05893ef66 100644 --- a/builtin/providers/kubernetes/resource_kubernetes_persistent_volume_claim_test.go +++ b/builtin/providers/kubernetes/resource_kubernetes_persistent_volume_claim_test.go @@ -2,6 +2,7 @@ package kubernetes import ( "fmt" + "os" "testing" "github.com/hashicorp/terraform/helper/acctest" @@ -28,7 +29,10 @@ func TestAccKubernetesPersistentVolumeClaim_basic(t *testing.T) { testAccCheckKubernetesPersistentVolumeClaimExists("kubernetes_persistent_volume_claim.test", &conf), resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.annotations.%", "1"), resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.annotations.TestAnnotationOne", "one"), - testAccCheckMetaAnnotations(&conf.ObjectMeta, map[string]string{"TestAnnotationOne": "one"}), + testAccCheckMetaAnnotations(&conf.ObjectMeta, map[string]string{ + "TestAnnotationOne": "one", + "volume.beta.kubernetes.io/storage-provisioner": "kubernetes.io/gce-pd", + }), resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.labels.%", "3"), resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.labels.TestLabelOne", "one"), resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.labels.TestLabelThree", "three"), @@ -53,7 +57,11 @@ func TestAccKubernetesPersistentVolumeClaim_basic(t *testing.T) { resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.annotations.%", "2"), resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.annotations.TestAnnotationOne", "one"), resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.annotations.TestAnnotationTwo", "two"), - testAccCheckMetaAnnotations(&conf.ObjectMeta, map[string]string{"TestAnnotationOne": "one", "TestAnnotationTwo": "two"}), + testAccCheckMetaAnnotations(&conf.ObjectMeta, map[string]string{ + "TestAnnotationOne": "one", + "TestAnnotationTwo": "two", + "volume.beta.kubernetes.io/storage-provisioner": "kubernetes.io/gce-pd", + }), resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.labels.%", "3"), resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.labels.TestLabelOne", "one"), resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.labels.TestLabelTwo", "two"), @@ -79,6 +87,8 @@ func TestAccKubernetesPersistentVolumeClaim_importBasic(t *testing.T) { resourceName := "kubernetes_persistent_volume_claim.test" volumeName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(10)) claimName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(10)) + diskName := fmt.Sprintf("tf-acc-test-disk-%s", acctest.RandString(10)) + zone := os.Getenv("GOOGLE_ZONE") resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -86,7 +96,7 @@ func TestAccKubernetesPersistentVolumeClaim_importBasic(t *testing.T) { CheckDestroy: testAccCheckKubernetesPersistentVolumeClaimDestroy, Steps: []resource.TestStep{ { - Config: testAccKubernetesPersistentVolumeClaimConfig_import(volumeName, claimName), + Config: testAccKubernetesPersistentVolumeClaimConfig_import(volumeName, claimName, diskName, zone), }, { ResourceName: resourceName, @@ -104,6 +114,8 @@ func TestAccKubernetesPersistentVolumeClaim_volumeMatch(t *testing.T) { claimName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(10)) volumeName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(10)) volumeNameModified := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(10)) + diskName := fmt.Sprintf("tf-acc-test-disk-%s", acctest.RandString(10)) + zone := os.Getenv("GOOGLE_ZONE") resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -112,7 +124,7 @@ func TestAccKubernetesPersistentVolumeClaim_volumeMatch(t *testing.T) { CheckDestroy: testAccCheckKubernetesPersistentVolumeClaimDestroy, Steps: []resource.TestStep{ { - Config: testAccKubernetesPersistentVolumeClaimConfig_volumeMatch(volumeName, claimName), + Config: testAccKubernetesPersistentVolumeClaimConfig_volumeMatch(volumeName, claimName, diskName, zone), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckKubernetesPersistentVolumeClaimExists("kubernetes_persistent_volume_claim.test", &pvcConf), resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.annotations.%", "0"), @@ -135,7 +147,7 @@ func TestAccKubernetesPersistentVolumeClaim_volumeMatch(t *testing.T) { ), }, { - Config: testAccKubernetesPersistentVolumeClaimConfig_volumeMatch_modified(volumeNameModified, claimName), + Config: testAccKubernetesPersistentVolumeClaimConfig_volumeMatch_modified(volumeNameModified, claimName, diskName, zone), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckKubernetesPersistentVolumeClaimExists("kubernetes_persistent_volume_claim.test", &pvcConf), resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.annotations.%", "0"), @@ -161,86 +173,89 @@ func TestAccKubernetesPersistentVolumeClaim_volumeMatch(t *testing.T) { }) } -func TestAccKubernetesPersistentVolumeClaim_labelsMatch(t *testing.T) { - var conf api.PersistentVolumeClaim - claimName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(10)) - volumeName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(10)) +// Label matching isn't supported on GCE +// TODO: Re-enable when we build test env for K8S that supports it - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "kubernetes_persistent_volume_claim.test", - Providers: testAccProviders, - CheckDestroy: testAccCheckKubernetesPersistentVolumeClaimDestroy, - Steps: []resource.TestStep{ - { - Config: testAccKubernetesPersistentVolumeClaimConfig_labelsMatch(volumeName, claimName), - Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckKubernetesPersistentVolumeClaimExists("kubernetes_persistent_volume_claim.test", &conf), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.annotations.%", "0"), - testAccCheckMetaAnnotations(&conf.ObjectMeta, map[string]string{"pv.kubernetes.io/bind-completed": "yes", "pv.kubernetes.io/bound-by-controller": "yes"}), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.labels.%", "0"), - testAccCheckMetaLabels(&conf.ObjectMeta, map[string]string{}), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.name", claimName), - resource.TestCheckResourceAttrSet("kubernetes_persistent_volume_claim.test", "metadata.0.generation"), - resource.TestCheckResourceAttrSet("kubernetes_persistent_volume_claim.test", "metadata.0.resource_version"), - resource.TestCheckResourceAttrSet("kubernetes_persistent_volume_claim.test", "metadata.0.self_link"), - resource.TestCheckResourceAttrSet("kubernetes_persistent_volume_claim.test", "metadata.0.uid"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.access_modes.#", "1"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.access_modes.1254135962", "ReadWriteMany"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.resources.#", "1"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.resources.0.requests.%", "1"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.resources.0.requests.storage", "5Gi"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.#", "1"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.0.match_labels.%", "1"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.0.match_labels.TfAccTestEnvironment", "blablah"), - ), - }, - }, - }) -} +// func TestAccKubernetesPersistentVolumeClaim_labelsMatch(t *testing.T) { +// var conf api.PersistentVolumeClaim +// claimName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(10)) +// volumeName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(10)) -func TestAccKubernetesPersistentVolumeClaim_labelsMatchExpression(t *testing.T) { - var conf api.PersistentVolumeClaim - claimName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(10)) - volumeName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(10)) +// resource.Test(t, resource.TestCase{ +// PreCheck: func() { testAccPreCheck(t) }, +// IDRefreshName: "kubernetes_persistent_volume_claim.test", +// Providers: testAccProviders, +// CheckDestroy: testAccCheckKubernetesPersistentVolumeClaimDestroy, +// Steps: []resource.TestStep{ +// { +// Config: testAccKubernetesPersistentVolumeClaimConfig_labelsMatch(volumeName, claimName), +// Check: resource.ComposeAggregateTestCheckFunc( +// testAccCheckKubernetesPersistentVolumeClaimExists("kubernetes_persistent_volume_claim.test", &conf), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.annotations.%", "0"), +// testAccCheckMetaAnnotations(&conf.ObjectMeta, map[string]string{"pv.kubernetes.io/bind-completed": "yes", "pv.kubernetes.io/bound-by-controller": "yes"}), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.labels.%", "0"), +// testAccCheckMetaLabels(&conf.ObjectMeta, map[string]string{}), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.name", claimName), +// resource.TestCheckResourceAttrSet("kubernetes_persistent_volume_claim.test", "metadata.0.generation"), +// resource.TestCheckResourceAttrSet("kubernetes_persistent_volume_claim.test", "metadata.0.resource_version"), +// resource.TestCheckResourceAttrSet("kubernetes_persistent_volume_claim.test", "metadata.0.self_link"), +// resource.TestCheckResourceAttrSet("kubernetes_persistent_volume_claim.test", "metadata.0.uid"), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.access_modes.#", "1"), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.access_modes.1254135962", "ReadWriteMany"), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.resources.#", "1"), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.resources.0.requests.%", "1"), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.resources.0.requests.storage", "5Gi"), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.#", "1"), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.0.match_labels.%", "1"), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.0.match_labels.TfAccTestEnvironment", "blablah"), +// ), +// }, +// }, +// }) +// } - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - IDRefreshName: "kubernetes_persistent_volume_claim.test", - Providers: testAccProviders, - CheckDestroy: testAccCheckKubernetesPersistentVolumeClaimDestroy, - Steps: []resource.TestStep{ - { - Config: testAccKubernetesPersistentVolumeClaimConfig_labelsMatchExpression(volumeName, claimName), - Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckKubernetesPersistentVolumeClaimExists("kubernetes_persistent_volume_claim.test", &conf), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.annotations.%", "0"), - testAccCheckMetaAnnotations(&conf.ObjectMeta, map[string]string{"pv.kubernetes.io/bind-completed": "yes", "pv.kubernetes.io/bound-by-controller": "yes"}), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.labels.%", "0"), - testAccCheckMetaLabels(&conf.ObjectMeta, map[string]string{}), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.name", claimName), - resource.TestCheckResourceAttrSet("kubernetes_persistent_volume_claim.test", "metadata.0.generation"), - resource.TestCheckResourceAttrSet("kubernetes_persistent_volume_claim.test", "metadata.0.resource_version"), - resource.TestCheckResourceAttrSet("kubernetes_persistent_volume_claim.test", "metadata.0.self_link"), - resource.TestCheckResourceAttrSet("kubernetes_persistent_volume_claim.test", "metadata.0.uid"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.access_modes.#", "1"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.access_modes.1254135962", "ReadWriteMany"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.resources.#", "1"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.resources.0.requests.%", "1"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.resources.0.requests.storage", "5Gi"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.#", "1"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.0.match_expressions.#", "1"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.0.match_expressions.0.key", "TfAccTestEnvironment"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.0.match_expressions.0.operator", "In"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.0.match_expressions.0.values.#", "3"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.0.match_expressions.0.values.1187371253", "three"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.0.match_expressions.0.values.2053932785", "one"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.0.match_expressions.0.values.298486374", "two"), - ), - }, - }, - }) -} +// func TestAccKubernetesPersistentVolumeClaim_labelsMatchExpression(t *testing.T) { +// var conf api.PersistentVolumeClaim +// claimName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(10)) +// volumeName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(10)) + +// resource.Test(t, resource.TestCase{ +// PreCheck: func() { testAccPreCheck(t) }, +// IDRefreshName: "kubernetes_persistent_volume_claim.test", +// Providers: testAccProviders, +// CheckDestroy: testAccCheckKubernetesPersistentVolumeClaimDestroy, +// Steps: []resource.TestStep{ +// { +// Config: testAccKubernetesPersistentVolumeClaimConfig_labelsMatchExpression(volumeName, claimName), +// Check: resource.ComposeAggregateTestCheckFunc( +// testAccCheckKubernetesPersistentVolumeClaimExists("kubernetes_persistent_volume_claim.test", &conf), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.annotations.%", "0"), +// testAccCheckMetaAnnotations(&conf.ObjectMeta, map[string]string{"pv.kubernetes.io/bind-completed": "yes", "pv.kubernetes.io/bound-by-controller": "yes"}), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.labels.%", "0"), +// testAccCheckMetaLabels(&conf.ObjectMeta, map[string]string{}), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.name", claimName), +// resource.TestCheckResourceAttrSet("kubernetes_persistent_volume_claim.test", "metadata.0.generation"), +// resource.TestCheckResourceAttrSet("kubernetes_persistent_volume_claim.test", "metadata.0.resource_version"), +// resource.TestCheckResourceAttrSet("kubernetes_persistent_volume_claim.test", "metadata.0.self_link"), +// resource.TestCheckResourceAttrSet("kubernetes_persistent_volume_claim.test", "metadata.0.uid"), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.access_modes.#", "1"), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.access_modes.1254135962", "ReadWriteMany"), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.resources.#", "1"), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.resources.0.requests.%", "1"), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.resources.0.requests.storage", "5Gi"), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.#", "1"), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.0.match_expressions.#", "1"), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.0.match_expressions.0.key", "TfAccTestEnvironment"), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.0.match_expressions.0.operator", "In"), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.0.match_expressions.0.values.#", "3"), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.0.match_expressions.0.values.1187371253", "three"), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.0.match_expressions.0.values.2053932785", "one"), +// resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.selector.0.match_expressions.0.values.298486374", "two"), +// ), +// }, +// }, +// }) +// } func TestAccKubernetesPersistentVolumeClaim_volumeUpdate(t *testing.T) { var pvcConf api.PersistentVolumeClaim @@ -248,6 +263,8 @@ func TestAccKubernetesPersistentVolumeClaim_volumeUpdate(t *testing.T) { claimName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(10)) volumeName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(10)) + diskName := fmt.Sprintf("tf-acc-test-disk-%s", acctest.RandString(10)) + zone := os.Getenv("GOOGLE_ZONE") resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -256,7 +273,7 @@ func TestAccKubernetesPersistentVolumeClaim_volumeUpdate(t *testing.T) { CheckDestroy: testAccCheckKubernetesPersistentVolumeClaimDestroy, Steps: []resource.TestStep{ { - Config: testAccKubernetesPersistentVolumeClaimConfig_volumeUpdate(volumeName, claimName, "5Gi"), + Config: testAccKubernetesPersistentVolumeClaimConfig_volumeUpdate(volumeName, claimName, "5Gi", diskName, zone), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckKubernetesPersistentVolumeClaimExists("kubernetes_persistent_volume_claim.test", &pvcConf), resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.annotations.%", "0"), @@ -280,7 +297,7 @@ func TestAccKubernetesPersistentVolumeClaim_volumeUpdate(t *testing.T) { ), }, { - Config: testAccKubernetesPersistentVolumeClaimConfig_volumeUpdate(volumeName, claimName, "10Gi"), + Config: testAccKubernetesPersistentVolumeClaimConfig_volumeUpdate(volumeName, claimName, "10Gi", diskName, zone), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckKubernetesPersistentVolumeClaimExists("kubernetes_persistent_volume_claim.test", &pvcConf), resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.annotations.%", "0"), @@ -435,7 +452,7 @@ resource "kubernetes_persistent_volume_claim" "test" { `, name) } -func testAccKubernetesPersistentVolumeClaimConfig_import(volumeName, claimName string) string { +func testAccKubernetesPersistentVolumeClaimConfig_import(volumeName, claimName, diskName, zone string) string { return fmt.Sprintf(` resource "kubernetes_persistent_volume" "test" { metadata { @@ -448,12 +465,20 @@ resource "kubernetes_persistent_volume" "test" { access_modes = ["ReadWriteMany"] persistent_volume_source { gce_persistent_disk { - pd_name = "test123" + pd_name = "${google_compute_disk.test.name}" } } } } +resource "google_compute_disk" "test" { + name = "%s" + type = "pd-ssd" + zone = "%s" + image = "debian-8-jessie-v20170523" + size = 10 +} + resource "kubernetes_persistent_volume_claim" "test" { metadata { name = "%s" @@ -468,10 +493,10 @@ resource "kubernetes_persistent_volume_claim" "test" { volume_name = "${kubernetes_persistent_volume.test.metadata.0.name}" } } -`, volumeName, claimName) +`, volumeName, diskName, zone, claimName) } -func testAccKubernetesPersistentVolumeClaimConfig_volumeMatch(volumeName, claimName string) string { +func testAccKubernetesPersistentVolumeClaimConfig_volumeMatch(volumeName, claimName, diskName, zone string) string { return fmt.Sprintf(` resource "kubernetes_persistent_volume" "test" { metadata { @@ -484,12 +509,20 @@ resource "kubernetes_persistent_volume" "test" { access_modes = ["ReadWriteMany"] persistent_volume_source { gce_persistent_disk { - pd_name = "test123" + pd_name = "${google_compute_disk.test.name}" } } } } +resource "google_compute_disk" "test" { + name = "%s" + type = "pd-ssd" + zone = "%s" + image = "debian-8-jessie-v20170523" + size = 10 +} + resource "kubernetes_persistent_volume_claim" "test" { metadata { name = "%s" @@ -504,10 +537,10 @@ resource "kubernetes_persistent_volume_claim" "test" { volume_name = "${kubernetes_persistent_volume.test.metadata.0.name}" } } -`, volumeName, claimName) +`, volumeName, diskName, zone, claimName) } -func testAccKubernetesPersistentVolumeClaimConfig_volumeMatch_modified(volumeName, claimName string) string { +func testAccKubernetesPersistentVolumeClaimConfig_volumeMatch_modified(volumeName, claimName, diskName, zone string) string { return fmt.Sprintf(` resource "kubernetes_persistent_volume" "test2" { metadata { @@ -520,12 +553,20 @@ resource "kubernetes_persistent_volume" "test2" { access_modes = ["ReadWriteMany"] persistent_volume_source { gce_persistent_disk { - pd_name = "test123" + pd_name = "${google_compute_disk.test.name}" } } } } +resource "google_compute_disk" "test" { + name = "%s" + type = "pd-ssd" + zone = "%s" + image = "debian-8-jessie-v20170523" + size = 10 +} + resource "kubernetes_persistent_volume_claim" "test" { metadata { name = "%s" @@ -540,98 +581,98 @@ resource "kubernetes_persistent_volume_claim" "test" { volume_name = "${kubernetes_persistent_volume.test2.metadata.0.name}" } } -`, volumeName, claimName) +`, volumeName, diskName, zone, claimName) } -func testAccKubernetesPersistentVolumeClaimConfig_labelsMatch(volumeName, claimName string) string { - return fmt.Sprintf(` -resource "kubernetes_persistent_volume" "test" { - metadata { - labels { - TfAccTestEnvironment = "blablah" - } - name = "%s" - } - spec { - capacity { - storage = "10Gi" - } - access_modes = ["ReadWriteMany"] - persistent_volume_source { - gce_persistent_disk { - pd_name = "test123" - } - } - } -} +// func testAccKubernetesPersistentVolumeClaimConfig_labelsMatch(volumeName, claimName string) string { +// return fmt.Sprintf(` +// resource "kubernetes_persistent_volume" "test" { +// metadata { +// labels { +// TfAccTestEnvironment = "blablah" +// } +// name = "%s" +// } +// spec { +// capacity { +// storage = "10Gi" +// } +// access_modes = ["ReadWriteMany"] +// persistent_volume_source { +// gce_persistent_disk { +// pd_name = "test123" +// } +// } +// } +// } -resource "kubernetes_persistent_volume_claim" "test" { - metadata { - name = "%s" - } - spec { - access_modes = ["ReadWriteMany"] - resources { - requests { - storage = "5Gi" - } - } - selector { - match_labels { - TfAccTestEnvironment = "blablah" - } - } - } -} -`, volumeName, claimName) -} +// resource "kubernetes_persistent_volume_claim" "test" { +// metadata { +// name = "%s" +// } +// spec { +// access_modes = ["ReadWriteMany"] +// resources { +// requests { +// storage = "5Gi" +// } +// } +// selector { +// match_labels { +// TfAccTestEnvironment = "blablah" +// } +// } +// } +// } +// `, volumeName, claimName) +// } -func testAccKubernetesPersistentVolumeClaimConfig_labelsMatchExpression(volumeName, claimName string) string { - return fmt.Sprintf(` -resource "kubernetes_persistent_volume" "test" { - metadata { - labels { - TfAccTestEnvironment = "two" - } - name = "%s" - } - spec { - capacity { - storage = "10Gi" - } - access_modes = ["ReadWriteMany"] - persistent_volume_source { - gce_persistent_disk { - pd_name = "test123" - } - } - } -} +// func testAccKubernetesPersistentVolumeClaimConfig_labelsMatchExpression(volumeName, claimName string) string { +// return fmt.Sprintf(` +// resource "kubernetes_persistent_volume" "test" { +// metadata { +// labels { +// TfAccTestEnvironment = "two" +// } +// name = "%s" +// } +// spec { +// capacity { +// storage = "10Gi" +// } +// access_modes = ["ReadWriteMany"] +// persistent_volume_source { +// gce_persistent_disk { +// pd_name = "test123" +// } +// } +// } +// } -resource "kubernetes_persistent_volume_claim" "test" { - metadata { - name = "%s" - } - spec { - access_modes = ["ReadWriteMany"] - resources { - requests { - storage = "5Gi" - } - } - selector { - match_expressions { - key = "TfAccTestEnvironment" - operator = "In" - values = ["one", "three", "two"] - } - } - } -} -`, volumeName, claimName) -} +// resource "kubernetes_persistent_volume_claim" "test" { +// metadata { +// name = "%s" +// } +// spec { +// access_modes = ["ReadWriteMany"] +// resources { +// requests { +// storage = "5Gi" +// } +// } +// selector { +// match_expressions { +// key = "TfAccTestEnvironment" +// operator = "In" +// values = ["one", "three", "two"] +// } +// } +// } +// } +// `, volumeName, claimName) +// } -func testAccKubernetesPersistentVolumeClaimConfig_volumeUpdate(volumeName, claimName, storage string) string { +func testAccKubernetesPersistentVolumeClaimConfig_volumeUpdate(volumeName, claimName, storage, diskName, zone string) string { return fmt.Sprintf(` resource "kubernetes_persistent_volume" "test" { metadata { @@ -644,12 +685,20 @@ resource "kubernetes_persistent_volume" "test" { access_modes = ["ReadWriteMany"] persistent_volume_source { gce_persistent_disk { - pd_name = "test123" + pd_name = "${google_compute_disk.test.name}" } } } } +resource "google_compute_disk" "test" { + name = "%s" + type = "pd-ssd" + zone = "%s" + image = "debian-8-jessie-v20170523" + size = 10 +} + resource "kubernetes_persistent_volume_claim" "test" { metadata { name = "%s" @@ -664,5 +713,5 @@ resource "kubernetes_persistent_volume_claim" "test" { volume_name = "${kubernetes_persistent_volume.test.metadata.0.name}" } } -`, volumeName, storage, claimName) +`, volumeName, storage, diskName, zone, claimName) } diff --git a/builtin/providers/kubernetes/resource_kubernetes_persistent_volume_test.go b/builtin/providers/kubernetes/resource_kubernetes_persistent_volume_test.go index 21f52bdbb..ec5e0237d 100644 --- a/builtin/providers/kubernetes/resource_kubernetes_persistent_volume_test.go +++ b/builtin/providers/kubernetes/resource_kubernetes_persistent_volume_test.go @@ -2,6 +2,7 @@ package kubernetes import ( "fmt" + "os" "testing" "github.com/hashicorp/terraform/helper/acctest" @@ -16,6 +17,10 @@ func TestAccKubernetesPersistentVolume_basic(t *testing.T) { var conf api.PersistentVolume randString := acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum) name := fmt.Sprintf("tf-acc-test-%s", randString) + diskName := fmt.Sprintf("tf-acc-test-disk-%s", randString) + + region := os.Getenv("GOOGLE_REGION") + zone := os.Getenv("GOOGLE_ZONE") resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -24,7 +29,7 @@ func TestAccKubernetesPersistentVolume_basic(t *testing.T) { CheckDestroy: testAccCheckKubernetesPersistentVolumeDestroy, Steps: []resource.TestStep{ { - Config: testAccKubernetesPersistentVolumeConfig_basic(name), + Config: testAccKubernetesPersistentVolumeConfig_basic(name, diskName, zone), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckKubernetesPersistentVolumeExists("kubernetes_persistent_volume.test", &conf), resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "metadata.0.annotations.%", "2"), @@ -35,7 +40,13 @@ func TestAccKubernetesPersistentVolume_basic(t *testing.T) { resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "metadata.0.labels.TestLabelOne", "one"), resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "metadata.0.labels.TestLabelTwo", "two"), resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "metadata.0.labels.TestLabelThree", "three"), - testAccCheckMetaLabels(&conf.ObjectMeta, map[string]string{"TestLabelOne": "one", "TestLabelTwo": "two", "TestLabelThree": "three"}), + testAccCheckMetaLabels(&conf.ObjectMeta, map[string]string{ + "TestLabelOne": "one", + "TestLabelTwo": "two", + "TestLabelThree": "three", + "failure-domain.beta.kubernetes.io/region": region, + "failure-domain.beta.kubernetes.io/zone": zone, + }), resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "metadata.0.name", name), resource.TestCheckResourceAttrSet("kubernetes_persistent_volume.test", "metadata.0.generation"), resource.TestCheckResourceAttrSet("kubernetes_persistent_volume.test", "metadata.0.resource_version"), @@ -46,11 +57,11 @@ func TestAccKubernetesPersistentVolume_basic(t *testing.T) { resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.access_modes.#", "1"), resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.access_modes.1254135962", "ReadWriteMany"), resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.persistent_volume_source.0.gce_persistent_disk.#", "1"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.persistent_volume_source.0.gce_persistent_disk.0.pd_name", "test123"), + resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.persistent_volume_source.0.gce_persistent_disk.0.pd_name", diskName), ), }, { - Config: testAccKubernetesPersistentVolumeConfig_modified(name), + Config: testAccKubernetesPersistentVolumeConfig_modified(name, diskName, zone), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckKubernetesPersistentVolumeExists("kubernetes_persistent_volume.test", &conf), resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "metadata.0.annotations.%", "2"), @@ -61,7 +72,13 @@ func TestAccKubernetesPersistentVolume_basic(t *testing.T) { resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "metadata.0.labels.TestLabelOne", "one"), resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "metadata.0.labels.TestLabelTwo", "two"), resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "metadata.0.labels.TestLabelThree", "three"), - testAccCheckMetaLabels(&conf.ObjectMeta, map[string]string{"TestLabelOne": "one", "TestLabelTwo": "two", "TestLabelThree": "three"}), + testAccCheckMetaLabels(&conf.ObjectMeta, map[string]string{ + "TestLabelOne": "one", + "TestLabelTwo": "two", + "TestLabelThree": "three", + "failure-domain.beta.kubernetes.io/region": region, + "failure-domain.beta.kubernetes.io/zone": zone, + }), resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "metadata.0.name", name), resource.TestCheckResourceAttrSet("kubernetes_persistent_volume.test", "metadata.0.generation"), resource.TestCheckResourceAttrSet("kubernetes_persistent_volume.test", "metadata.0.resource_version"), @@ -74,7 +91,7 @@ func TestAccKubernetesPersistentVolume_basic(t *testing.T) { resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.access_modes.1254135962", "ReadWriteMany"), resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.persistent_volume_source.0.gce_persistent_disk.#", "1"), resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.persistent_volume_source.0.gce_persistent_disk.0.fs_type", "ntfs"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.persistent_volume_source.0.gce_persistent_disk.0.pd_name", "test123"), + resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.persistent_volume_source.0.gce_persistent_disk.0.pd_name", diskName), resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.persistent_volume_source.0.gce_persistent_disk.0.read_only", "true"), ), }, @@ -86,6 +103,9 @@ func TestAccKubernetesPersistentVolume_importBasic(t *testing.T) { resourceName := "kubernetes_persistent_volume.test" randString := acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum) name := fmt.Sprintf("tf-acc-test-import-%s", randString) + diskName := fmt.Sprintf("tf-acc-test-disk-%s", randString) + + zone := os.Getenv("GOOGLE_ZONE") resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -93,7 +113,7 @@ func TestAccKubernetesPersistentVolume_importBasic(t *testing.T) { CheckDestroy: testAccCheckKubernetesPersistentVolumeDestroy, Steps: []resource.TestStep{ { - Config: testAccKubernetesPersistentVolumeConfig_basic(name), + Config: testAccKubernetesPersistentVolumeConfig_basic(name, diskName, zone), }, { ResourceName: resourceName, @@ -108,6 +128,10 @@ func TestAccKubernetesPersistentVolume_volumeSource(t *testing.T) { var conf api.PersistentVolume randString := acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum) name := fmt.Sprintf("tf-acc-test-%s", randString) + diskName := fmt.Sprintf("tf-acc-test-disk-%s", randString) + + region := os.Getenv("GOOGLE_REGION") + zone := os.Getenv("GOOGLE_ZONE") resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -116,13 +140,16 @@ func TestAccKubernetesPersistentVolume_volumeSource(t *testing.T) { CheckDestroy: testAccCheckKubernetesPersistentVolumeDestroy, Steps: []resource.TestStep{ { - Config: testAccKubernetesPersistentVolumeConfig_volumeSource(name), + Config: testAccKubernetesPersistentVolumeConfig_volumeSource(name, diskName, zone), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckKubernetesPersistentVolumeExists("kubernetes_persistent_volume.test", &conf), resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "metadata.0.annotations.%", "0"), testAccCheckMetaAnnotations(&conf.ObjectMeta, map[string]string{}), resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "metadata.0.labels.%", "0"), - testAccCheckMetaLabels(&conf.ObjectMeta, map[string]string{}), + testAccCheckMetaLabels(&conf.ObjectMeta, map[string]string{ + "failure-domain.beta.kubernetes.io/region": region, + "failure-domain.beta.kubernetes.io/zone": zone, + }), resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "metadata.0.name", name), resource.TestCheckResourceAttrSet("kubernetes_persistent_volume.test", "metadata.0.generation"), resource.TestCheckResourceAttrSet("kubernetes_persistent_volume.test", "metadata.0.resource_version"), @@ -132,11 +159,8 @@ func TestAccKubernetesPersistentVolume_volumeSource(t *testing.T) { resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.capacity.storage", "123Gi"), resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.access_modes.#", "1"), resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.access_modes.1254135962", "ReadWriteMany"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.persistent_volume_source.0.aws_elastic_block_store.#", "1"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.persistent_volume_source.0.aws_elastic_block_store.0.volume_id", "vol-12345678"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.persistent_volume_source.0.aws_elastic_block_store.0.fs_type", "ntfs"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.persistent_volume_source.0.aws_elastic_block_store.0.partition", "1"), - resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.persistent_volume_source.0.aws_elastic_block_store.0.read_only", "true"), + resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.persistent_volume_source.0.gce_persistent_disk.#", "1"), + resource.TestCheckResourceAttrSet("kubernetes_persistent_volume.test", "spec.0.persistent_volume_source.0.gce_persistent_disk.0.pd_name"), ), }, { @@ -146,7 +170,10 @@ func TestAccKubernetesPersistentVolume_volumeSource(t *testing.T) { resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "metadata.0.annotations.%", "0"), testAccCheckMetaAnnotations(&conf.ObjectMeta, map[string]string{}), resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "metadata.0.labels.%", "0"), - testAccCheckMetaLabels(&conf.ObjectMeta, map[string]string{}), + testAccCheckMetaLabels(&conf.ObjectMeta, map[string]string{ + "failure-domain.beta.kubernetes.io/region": region, + "failure-domain.beta.kubernetes.io/zone": zone, + }), resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "metadata.0.name", name), resource.TestCheckResourceAttrSet("kubernetes_persistent_volume.test", "metadata.0.generation"), resource.TestCheckResourceAttrSet("kubernetes_persistent_volume.test", "metadata.0.resource_version"), @@ -242,7 +269,7 @@ func testAccCheckKubernetesPersistentVolumeExists(n string, obj *api.PersistentV } } -func testAccKubernetesPersistentVolumeConfig_basic(name string) string { +func testAccKubernetesPersistentVolumeConfig_basic(name, diskName, zone string) string { return fmt.Sprintf(` resource "kubernetes_persistent_volume" "test" { metadata { @@ -264,14 +291,23 @@ resource "kubernetes_persistent_volume" "test" { access_modes = ["ReadWriteMany"] persistent_volume_source { gce_persistent_disk { - pd_name = "test123" + pd_name = "${google_compute_disk.test.name}" } } } -}`, name) } -func testAccKubernetesPersistentVolumeConfig_modified(name string) string { +resource "google_compute_disk" "test" { + name = "%s" + type = "pd-ssd" + zone = "%s" + image = "debian-8-jessie-v20170523" + size = 10 +} +`, name, diskName, zone) +} + +func testAccKubernetesPersistentVolumeConfig_modified(name, diskName, zone string) string { return fmt.Sprintf(` resource "kubernetes_persistent_volume" "test" { metadata { @@ -294,15 +330,24 @@ resource "kubernetes_persistent_volume" "test" { persistent_volume_source { gce_persistent_disk { fs_type = "ntfs" - pd_name = "test123" + pd_name = "${google_compute_disk.test.name}" read_only = true } } } -}`, name) } -func testAccKubernetesPersistentVolumeConfig_volumeSource(name string) string { +resource "google_compute_disk" "test" { + name = "%s" + type = "pd-ssd" + zone = "%s" + image = "debian-8-jessie-v20170523" + size = 10 +} +`, name, diskName, zone) +} + +func testAccKubernetesPersistentVolumeConfig_volumeSource(name, diskName, zone string) string { return fmt.Sprintf(` resource "kubernetes_persistent_volume" "test" { metadata { @@ -314,15 +359,21 @@ resource "kubernetes_persistent_volume" "test" { } access_modes = ["ReadWriteMany"] persistent_volume_source { - aws_elastic_block_store { - volume_id = "vol-12345678" - fs_type = "ntfs" - partition = 1 - read_only = true + gce_persistent_disk { + pd_name = "${google_compute_disk.test.name}" } } } -}`, name) +} + +resource "google_compute_disk" "test" { + name = "%s" + type = "pd-ssd" + zone = "%s" + image = "debian-8-jessie-v20170523" + size = 12 +} +`, name, diskName, zone) } func testAccKubernetesPersistentVolumeConfig_volumeSource_modified(name string) string { diff --git a/builtin/providers/kubernetes/test-infra/main.tf b/builtin/providers/kubernetes/test-infra/main.tf index d09e4c2ca..bbc62492b 100644 --- a/builtin/providers/kubernetes/test-infra/main.tf +++ b/builtin/providers/kubernetes/test-infra/main.tf @@ -38,6 +38,10 @@ resource "google_container_cluster" "primary" { } } +output "zone" { + value = "${data.google_compute_zones.available.names[0]}" +} + output "endpoint" { value = "${google_container_cluster.primary.endpoint}" } From 7552331f50ec8849bd55f02ef5cf31ce65ec4f8a Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Fri, 2 Jun 2017 14:17:30 +0100 Subject: [PATCH 3/3] provider/kubernetes: Mark HPA's target_cpu_utilization_percentage as computed --- .../kubernetes/resource_kubernetes_horizontal_pod_autoscaler.go | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/providers/kubernetes/resource_kubernetes_horizontal_pod_autoscaler.go b/builtin/providers/kubernetes/resource_kubernetes_horizontal_pod_autoscaler.go index 6952433e0..f734c43c9 100644 --- a/builtin/providers/kubernetes/resource_kubernetes_horizontal_pod_autoscaler.go +++ b/builtin/providers/kubernetes/resource_kubernetes_horizontal_pod_autoscaler.go @@ -72,6 +72,7 @@ func resourceKubernetesHorizontalPodAutoscaler() *schema.Resource { Type: schema.TypeInt, Description: "Target average CPU utilization (represented as a percentage of requested CPU) over all the pods. If not specified the default autoscaling policy will be used.", Optional: true, + Computed: true, }, }, },