Merge pull request #29 from stigok/volume-claim-storage-class-name

Add reclaim policy to storage class
sl1pm4t · Jun 26, 2018 · 9abff21 · 9abff21
2 parents 4f8483f + 8e5227b
commit 9abff21
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/kubernetes/resource_kubernetes_storage_class.go b/kubernetes/resource_kubernetes_storage_class.go
@@ -5,6 +5,7 @@ import (
 	"log"
 
 	"github.com/hashicorp/terraform/helper/schema"
+	corev1 "k8s.io/api/core/v1"
 	api "k8s.io/api/storage/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -24,6 +25,13 @@ func resourceKubernetesStorageClass() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			"metadata": metadataSchema("storage class", true),
+			"reclaim_policy": {
+				Type:        schema.TypeString,
+				Description: "Reclaim policy to be applied to provisioned persistent volumes",
+				Optional:    true,
+				Default:     "Delete",
+				ForceNew:    true,
+			},
 			"parameters": {
 				Type:        schema.TypeMap,
 				Description: "The parameters for the provisioner that should create volumes of this storage class",
@@ -49,6 +57,11 @@ func resourceKubernetesStorageClassCreate(d *schema.ResourceData, meta interface
 		Provisioner: d.Get("storage_provisioner").(string),
 	}
 
+	if v, ok := d.GetOk("reclaim_policy"); ok && v != "" {
+		storageClass.ReclaimPolicy = new(corev1.PersistentVolumeReclaimPolicy)
+		*storageClass.ReclaimPolicy = corev1.PersistentVolumeReclaimPolicy(v.(string))
+	}
+
 	if v, ok := d.GetOk("parameters"); ok {
 		storageClass.Parameters = expandStringMap(v.(map[string]interface{}))
 	}
@@ -79,6 +92,7 @@ func resourceKubernetesStorageClassRead(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
+	d.Set("reclaim_policy", storageClass.ReclaimPolicy)
 	d.Set("parameters", storageClass.Parameters)
 	d.Set("storage_provisioner", storageClass.Provisioner)
 

diff --git a/kubernetes/resource_kubernetes_storage_class_test.go b/kubernetes/resource_kubernetes_storage_class_test.go
@@ -44,6 +44,7 @@ func TestAccKubernetesStorageClass_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("kubernetes_storage_class.test", "storage_provisioner", "kubernetes.io/gce-pd"),
 					resource.TestCheckResourceAttr("kubernetes_storage_class.test", "parameters.%", "1"),
 					resource.TestCheckResourceAttr("kubernetes_storage_class.test", "parameters.type", "pd-ssd"),
+					resource.TestCheckResourceAttr("kubernetes_storage_class.test", "reclaim_policy", "Retain"),
 					testAccCheckStorageClassParameters(&conf, map[string]string{"type": "pd-ssd"}),
 				),
 			},
@@ -68,6 +69,7 @@ func TestAccKubernetesStorageClass_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("kubernetes_storage_class.test", "parameters.%", "2"),
 					resource.TestCheckResourceAttr("kubernetes_storage_class.test", "parameters.type", "pd-standard"),
 					resource.TestCheckResourceAttr("kubernetes_storage_class.test", "parameters.zones", "us-west1-a,us-west1-b"),
+					resource.TestCheckResourceAttr("kubernetes_storage_class.test", "reclaim_policy", "Delete"),
 					testAccCheckStorageClassParameters(&conf, map[string]string{"type": "pd-standard", "zones": "us-west1-a,us-west1-b"}),
 				),
 			},
@@ -86,6 +88,7 @@ func TestAccKubernetesStorageClass_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("kubernetes_storage_class.test", "metadata.0.uid"),
 					resource.TestCheckResourceAttr("kubernetes_storage_class.test", "storage_provisioner", "kubernetes.io/gce-pd"),
 					resource.TestCheckResourceAttr("kubernetes_storage_class.test", "parameters.%", "0"),
+					resource.TestCheckResourceAttr("kubernetes_storage_class.test", "reclaim_policy", "Delete"),
 					testAccCheckStorageClassParameters(&conf, map[string]string{}),
 				),
 			},
@@ -236,6 +239,7 @@ resource "kubernetes_storage_class" "test" {
 		name = "%s"
 	}
 	storage_provisioner = "kubernetes.io/gce-pd"
+	reclaim_policy = "Retain"
 	parameters {
 		type = "pd-ssd"
 	}
@@ -257,6 +261,7 @@ resource "kubernetes_storage_class" "test" {
 		name = "%s"
 	}
 	storage_provisioner = "kubernetes.io/gce-pd"
+	reclaim_policy = "Delete"
 	parameters {
 		type = "pd-standard"
 		zones = "us-west1-a,us-west1-b"
@@ -271,6 +276,7 @@ resource "kubernetes_storage_class" "test" {
 		name = "%s"
 	}
 	storage_provisioner = "kubernetes.io/gce-pd"
+	reclaim_policy = "Delete"
 }`, name)
 }