Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resource/kubernetes_persistent_volume: Add support for storage_class_name #111

Merged
merged 3 commits into from
Feb 26, 2018
Merged

resource/kubernetes_persistent_volume: Add support for storage_class_name #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
874004a
Support `storage_class_name` in `kubernetes_persistent_volume`
sergei-ivanov Feb 5, 2018
8b14ff4
tests: Fix PVC acceptance tests
radeksimko Feb 26, 2018
a31f113
Add PV acc test with new field
radeksimko Feb 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions kubernetes/resource_kubernetes_persistent_volume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ func resourceKubernetesPersistentVolume() *schema.Resource {
MaxItems: 1,
Elem: persistentVolumeSourceSchema(),
},
"storage_class_name": {
Type: schema.TypeString,
Description: "A description of the persistent volume's class. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes/#class",
Optional: true,
},
},
},
},
Expand Down
8 changes: 8 additions & 0 deletions kubernetes/resource_kubernetes_persistent_volume_claim_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,7 @@ resource "kubernetes_persistent_volume" "test" {
storage = "10Gi"
}
access_modes = ["ReadWriteOnce"]
storage_class_name = "standard"
persistent_volume_source {
gce_persistent_disk {
pd_name = "${google_compute_disk.test.name}"
Expand All @@ -616,6 +617,7 @@ resource "kubernetes_persistent_volume_claim" "test" {
}
spec {
access_modes = ["ReadWriteOnce"]
storage_class_name = "standard"
resources {
requests {
storage = "5Gi"
Expand All @@ -638,6 +640,7 @@ resource "kubernetes_persistent_volume" "test" {
storage = "10Gi"
}
access_modes = ["ReadWriteOnce"]
storage_class_name = "standard"
persistent_volume_source {
gce_persistent_disk {
pd_name = "${google_compute_disk.test.name}"
Expand All @@ -660,6 +663,7 @@ resource "kubernetes_persistent_volume_claim" "test" {
}
spec {
access_modes = ["ReadWriteOnce"]
storage_class_name = "standard"
resources {
requests {
storage = "5Gi"
Expand All @@ -682,6 +686,7 @@ resource "kubernetes_persistent_volume" "test2" {
storage = "10Gi"
}
access_modes = ["ReadWriteOnce"]
storage_class_name = "standard"
persistent_volume_source {
gce_persistent_disk {
pd_name = "${google_compute_disk.test.name}"
Expand All @@ -704,6 +709,7 @@ resource "kubernetes_persistent_volume_claim" "test" {
}
spec {
access_modes = ["ReadWriteOnce"]
storage_class_name = "standard"
resources {
requests {
storage = "5Gi"
Expand Down Expand Up @@ -814,6 +820,7 @@ resource "kubernetes_persistent_volume" "test" {
storage = "%s"
}
access_modes = ["ReadWriteOnce"]
storage_class_name = "standard"
persistent_volume_source {
gce_persistent_disk {
pd_name = "${google_compute_disk.test.name}"
Expand All @@ -836,6 +843,7 @@ resource "kubernetes_persistent_volume_claim" "test" {
}
spec {
access_modes = ["ReadWriteOnce"]
storage_class_name = "standard"
resources {
requests {
storage = "5Gi"
Expand Down
110 changes: 110 additions & 0 deletions kubernetes/resource_kubernetes_persistent_volume_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,66 @@ func TestAccKubernetesPersistentVolume_cephFsSecretRef(t *testing.T) {
})
}

func TestAccKubernetesPersistentVolume_storageClass(t *testing.T) {
var conf api.PersistentVolume
randString := acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)

name := fmt.Sprintf("tf-acc-test-%s", randString)
storageClassName := fmt.Sprintf("tf-acc-test-sc-%s", randString)
secondStorageClassName := fmt.Sprintf("tf-acc-test-sc2-%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) },
IDRefreshName: "kubernetes_persistent_volume.test",
Providers: testAccProviders,
CheckDestroy: testAccCheckKubernetesPersistentVolumeDestroy,
Steps: []resource.TestStep{
{
Config: testAccKubernetesPersistentVolumeConfig_storageClass(name, diskName, storageClassName, secondStorageClassName, zone, "test"),
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{}),
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"),
resource.TestCheckResourceAttrSet("kubernetes_persistent_volume.test", "metadata.0.self_link"),
resource.TestCheckResourceAttrSet("kubernetes_persistent_volume.test", "metadata.0.uid"),
resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.capacity.%", "1"),
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.storage_class_name", storageClassName),
),
},
{
Config: testAccKubernetesPersistentVolumeConfig_storageClass(name, diskName, storageClassName, secondStorageClassName, zone, "test2"),
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{}),
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"),
resource.TestCheckResourceAttrSet("kubernetes_persistent_volume.test", "metadata.0.self_link"),
resource.TestCheckResourceAttrSet("kubernetes_persistent_volume.test", "metadata.0.uid"),
resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.capacity.%", "1"),
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.storage_class_name", secondStorageClassName),
),
},
},
})
}

func testAccCheckKubernetesPersistentVolumeDestroy(s *terraform.State) error {
conn := testAccProvider.Meta().(*kubernetes.Clientset)

Expand Down Expand Up @@ -418,3 +478,53 @@ resource "kubernetes_persistent_volume" "test" {
}
}`, name)
}

func testAccKubernetesPersistentVolumeConfig_storageClass(name, diskName, storageClassName, storageClassName2, zone, refName string) string {
return fmt.Sprintf(`
resource "kubernetes_persistent_volume" "test" {
metadata {
name = "%s"
}
spec {
capacity {
storage = "123Gi"
}
access_modes = ["ReadWriteMany"]
persistent_volume_source {
gce_persistent_disk {
pd_name = "${google_compute_disk.test.name}"
}
}
storage_class_name = "${kubernetes_storage_class.%s.metadata.0.name}"
}
}

resource "google_compute_disk" "test" {
name = "%s"
type = "pd-ssd"
zone = "%s"
image = "debian-8-jessie-v20170523"
size = 12
}

resource "kubernetes_storage_class" "test" {
metadata {
name = "%s"
}
storage_provisioner = "kubernetes.io/gce-pd"
parameters {
type = "pd-ssd"
}
}

resource "kubernetes_storage_class" "test2" {
metadata {
name = "%s"
}
storage_provisioner = "kubernetes.io/gce-pd"
parameters {
type = "pd-standard"
}
}
`, name, refName, diskName, zone, storageClassName, storageClassName2)
}
22 changes: 21 additions & 1 deletion kubernetes/structure_persistent_volume_spec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,9 @@ func flattenPersistentVolumeSpec(in v1.PersistentVolumeSpec) []interface{} {
if in.PersistentVolumeReclaimPolicy != "" {
att["persistent_volume_reclaim_policy"] = in.PersistentVolumeReclaimPolicy
}
if in.StorageClassName != "" {
att["storage_class_name"] = in.StorageClassName
}
return []interface{}{att}
}

Expand Down Expand Up @@ -653,6 +656,9 @@ func expandPersistentVolumeSpec(l []interface{}) (v1.PersistentVolumeSpec, error
if v, ok := in["persistent_volume_reclaim_policy"].(string); ok {
obj.PersistentVolumeReclaimPolicy = v1.PersistentVolumeReclaimPolicy(v)
}
if v, ok := in["storage_class_name"].(string); ok {
obj.StorageClassName = v
}
return obj, nil
}

Expand Down Expand Up @@ -766,13 +772,27 @@ func patchPersistentVolumeSpec(pathPrefix, prefix string, d *schema.ResourceData
Value: expandPersistentVolumeAccessModes(v.List()),
})
}
if d.HasChange(prefix + "access_modes") {
if d.HasChange(prefix + "persistent_volume_reclaim_policy") {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😱 good catch!

v := d.Get(prefix + "persistent_volume_reclaim_policy").(string)
ops = append(ops, &ReplaceOperation{
Path: pathPrefix + "/persistentVolumeReclaimPolicy",
Value: v1.PersistentVolumeReclaimPolicy(v),
})
}
if d.HasChange(prefix + "storage_class_name") {
o, n := d.GetChange(prefix + "storage_class_name")
if v, ok := o.(string); ok && len(v) > 0 {
ops = append(ops, &ReplaceOperation{
Path: pathPrefix + "/storageClassName",
Value: n.(string),
})
} else {
ops = append(ops, &AddOperation{
Path: pathPrefix + "/storageClassName",
Value: n.(string),
})
}
}

return ops, nil
}
Expand Down
1 change: 1 addition & 0 deletions website/docs/r/persistent_volume.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ The following arguments are supported:
* `capacity` - (Required) A description of the persistent volume's resources and capacity. More info: http://kubernetes.io/docs/user-guide/persistent-volumes#capacity
* `persistent_volume_reclaim_policy` - (Optional) What happens to a persistent volume when released from its claim. Valid options are Retain (default) and Recycle. Recycling must be supported by the volume plugin underlying this persistent volume. More info: http://kubernetes.io/docs/user-guide/persistent-volumes#recycling-policy
* `persistent_volume_source` - (Required) The specification of a persistent volume.
* `storage_class_name` - (Optional) The name of the persistent volume's storage class. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes/#class

### `persistent_volume_source`

Expand Down