Change replicas to TypeString for statefulset and deployment (#1079)

* Change replicas to TypeString for statefulset and deployment
* Fix metadata bug in statefulset

Author: jrhouston

kubernetes/resource_kubernetes_deployment.go

@@ -68,10 +68,11 @@ func resourceKubernetesDeployment() *schema.Resource {
 							Default:     600,
 						},
 						"replicas": {
-							Type:        schema.TypeInt,
-							Description: "The number of desired replicas. Defaults to 1. More info: http://kubernetes.io/docs/user-guide/replication-controller#what-is-a-replication-controller",
-							Optional:    true,
-							Default:     1,
+							Type:         schema.TypeString,
+							Description:  "Number of desired pods. This is a string to be able to distinguish between explicit zero and not specified.",
+							Optional:     true,
+							Computed:     true,
+							ValidateFunc: validateTypeStringNullableInt,
 						},
 						"revision_history_limit": {
 							Type:        schema.TypeInt,

kubernetes/resource_kubernetes_deployment_test.go

@@ -989,7 +989,7 @@ func TestAccKubernetesDeployment_with_resource_field_selector(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccCheckKubernetesDeploymentExists("kubernetes_deployment.test", &conf),
 					resource.TestCheckResourceAttr("kubernetes_deployment.test", "spec.0.template.0.spec.0.container.0.image", imageName),
-					resource.TestCheckResourceAttr("kubernetes_deployment.test", "spec.0.template.0.spec.0.container.0.resources.0.limits.0.memory", "512Mi"),
+					resource.TestCheckResourceAttr("kubernetes_deployment.test", "spec.0.template.0.spec.0.container.0.resources.0.limits.memory", "512Mi"),
 					resource.TestCheckResourceAttr("kubernetes_deployment.test", "spec.0.template.0.spec.0.container.0.env.#", "1"),
 					resource.TestCheckResourceAttr("kubernetes_deployment.test", "spec.0.template.0.spec.0.container.0.env.0.name", "K8S_LIMITS_CPU"),
 					resource.TestCheckResourceAttr("kubernetes_deployment.test", "spec.0.template.0.spec.0.container.0.env.0.value_from.0.resource_field_ref.0.container_name", "containername"),
@@ -2528,7 +2528,7 @@ func testAccKubernetesDeploymentConfigWithResourceFieldSelector(rcName, imageNam
           image = "%s"
           name  = "containername"
           resources {
-            limits {
+            limits = {
               memory = "512Mi"
             }
           }

kubernetes/resource_kubernetes_stateful_set.go

@@ -98,7 +98,6 @@ func resourceKubernetesStatefulSetCreate(ctx context.Context, d *schema.Resource
 		if err != nil {
 			return diag.FromErr(err)
 		}
-		return diag.Diagnostics{}
 	}
 
 	return resourceKubernetesStatefulSetRead(ctx, d, meta)

kubernetes/resource_kubernetes_stateful_set_test.go

@@ -28,8 +28,8 @@ func TestAccKubernetesStatefulSet_basic(t *testing.T) {
 				Config: testAccKubernetesStatefulSetConfigBasic(name),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccCheckKubernetesStatefulSetExists("kubernetes_stateful_set.test", &conf),
-					testAccCheckKubernetesStatefulSetRollingOut("kubernetes_stateful_set.test"),
-					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "wait_for_rollout", "false"),
+					testAccCheckKubernetesStatefulSetRolledOut("kubernetes_stateful_set.test"),
+					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "wait_for_rollout", "true"),
 					resource.TestCheckResourceAttrSet("kubernetes_stateful_set.test", "metadata.0.generation"),
 					resource.TestCheckResourceAttrSet("kubernetes_stateful_set.test", "metadata.0.resource_version"),
 					resource.TestCheckResourceAttrSet("kubernetes_stateful_set.test", "metadata.0.self_link"),
@@ -51,10 +51,10 @@ func TestAccKubernetesStatefulSet_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.metadata.0.labels.%", "1"),
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.metadata.0.labels.app", "ss-test"),
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.spec.0.container.0.name", "ss-test"),
-					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.spec.0.container.0.image", "k8s.gcr.io/pause:latest"),
+					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.spec.0.container.0.image", "nginx:1.19"),
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.spec.0.container.0.port.0.container_port", "80"),
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.spec.0.container.0.port.0.name", "web"),
-					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.spec.0.container.0.volume_mount.0.name", "workdir"),
+					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.spec.0.container.0.volume_mount.0.name", "ss-test"),
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.spec.0.container.0.volume_mount.0.mount_path", "/work-dir"),
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.update_strategy.0.type", "RollingUpdate"),
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.update_strategy.0.rolling_update.#", "1"),
@@ -110,6 +110,7 @@ func TestAccKubernetesStatefulSet_Update(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
 		IDRefreshName:     "kubernetes_stateful_set.test",
+		IDRefreshIgnore:   []string{"metadata.0.resource_version"},
 		ProviderFactories: testAccProviderFactories,
 		CheckDestroy:      testAccCheckKubernetesStatefulSetDestroy,
 		Steps: []resource.TestStep{
@@ -139,15 +140,24 @@ func TestAccKubernetesStatefulSet_Update(t *testing.T) {
 				),
 			},
 			{
-				Config: testAccKubernetesStatefulSetConfigUpdateReplicas(name, 5),
+				Config: testAccKubernetesStatefulSetConfigUpdateReplicas(name, "5"),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccCheckKubernetesStatefulSetExists("kubernetes_stateful_set.test", &conf),
+					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "metadata.0.name", name),
+					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.replicas", "5"),
+				),
+			},
+			{
+				Config: testAccKubernetesStatefulSetConfigUpdateReplicas(name, ""),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccCheckKubernetesStatefulSetExists("kubernetes_stateful_set.test", &conf),
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "metadata.0.name", name),
+					// NOTE setting to empty should preserve the current replica count
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.replicas", "5"),
 				),
 			},
 			{
-				Config: testAccKubernetesStatefulSetConfigUpdateReplicas(name, 0),
+				Config: testAccKubernetesStatefulSetConfigUpdateReplicas(name, "0"),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccCheckKubernetesStatefulSetExists("kubernetes_stateful_set.test", &conf),
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "metadata.0.name", name),
@@ -213,7 +223,7 @@ func TestAccKubernetesStatefulSet_Update(t *testing.T) {
 	})
 }
 
-func TestAccKubernetesStatefulSet_waitForRollout(t *testing.T) {
+func TestAccKubernetesStatefulSet_waitForRollout_true(t *testing.T) {
 	var conf api.StatefulSet
 	name := fmt.Sprintf("tf-acc-test-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
 	resource.Test(t, resource.TestCase{
@@ -223,7 +233,7 @@ func TestAccKubernetesStatefulSet_waitForRollout(t *testing.T) {
 		CheckDestroy:      testAccCheckKubernetesStatefulSetDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccKubernetesStatefulSetConfigWaitForRollout(name),
+				Config: testAccKubernetesStatefulSetConfigWaitForRollout(name, true),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccCheckKubernetesStatefulSetExists("kubernetes_stateful_set.test", &conf),
 					testAccCheckKubernetesStatefulSetRolledOut("kubernetes_stateful_set.test"),
@@ -233,6 +243,26 @@ func TestAccKubernetesStatefulSet_waitForRollout(t *testing.T) {
 	})
 }
 
+func TestAccKubernetesStatefulSet_waitForRollout_false(t *testing.T) {
+	var conf api.StatefulSet
+	name := fmt.Sprintf("tf-acc-test-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
+	resource.Test(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t) },
+		IDRefreshName:     "kubernetes_stateful_set.test",
+		ProviderFactories: testAccProviderFactories,
+		CheckDestroy:      testAccCheckKubernetesStatefulSetDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccKubernetesStatefulSetConfigWaitForRollout(name, false),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccCheckKubernetesStatefulSetExists("kubernetes_stateful_set.test", &conf),
+					testAccCheckKubernetesStatefulSetRollingOut("kubernetes_stateful_set.test"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccKubernetesStatefulSet_regression(t *testing.T) {
 	var conf1, conf2 api.StatefulSet
 	name := fmt.Sprintf("tf-acc-test-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
@@ -272,7 +302,7 @@ func TestAccKubernetesStatefulSet_regression(t *testing.T) {
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.spec.0.container.0.image", "k8s.gcr.io/pause:latest"),
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.spec.0.container.0.port.0.container_port", "80"),
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.spec.0.container.0.port.0.name", "web"),
-					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.spec.0.container.0.volume_mount.0.name", "workdir"),
+					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.spec.0.container.0.volume_mount.0.name", "ss-test"),
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.spec.0.container.0.volume_mount.0.mount_path", "/work-dir"),
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.update_strategy.0.type", "RollingUpdate"),
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.update_strategy.0.rolling_update.#", "1"),
@@ -315,7 +345,7 @@ func TestAccKubernetesStatefulSet_regression(t *testing.T) {
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.spec.0.container.0.image", "k8s.gcr.io/pause:latest"),
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.spec.0.container.0.port.0.container_port", "80"),
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.spec.0.container.0.port.0.name", "web"),
-					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.spec.0.container.0.volume_mount.0.name", "workdir"),
+					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.spec.0.container.0.volume_mount.0.name", "ss-test"),
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.template.0.spec.0.container.0.volume_mount.0.mount_path", "/work-dir"),
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.update_strategy.0.type", "RollingUpdate"),
 					resource.TestCheckResourceAttr("kubernetes_stateful_set.test", "spec.0.update_strategy.0.rolling_update.#", "1"),
@@ -421,7 +451,7 @@ func testAccCheckKubernetesStatefulSetRollingOut(n string) resource.TestCheckFun
 			return err
 		}
 
-		if d.Status.Replicas == *d.Spec.Replicas {
+		if d.Status.ReadyReplicas == *d.Spec.Replicas {
 			return fmt.Errorf("StatefulSet has already rolled out")
 		}
 
@@ -436,7 +466,7 @@ func testAccCheckKubernetesStatefulSetRolledOut(n string) resource.TestCheckFunc
 			return err
 		}
 
-		if d.Status.Replicas != *d.Spec.Replicas {
+		if d.Status.ReadyReplicas != *d.Spec.Replicas {
 			return fmt.Errorf("StatefulSet is still rolling out")
 		}
 
@@ -483,16 +513,24 @@ func testAccKubernetesStatefulSetConfigBasic(name string) string {
 
       spec {
         container {
-          name  = "ss-test"
-          image = "k8s.gcr.io/pause:latest"
+          name = "ss-test"
+          image = "nginx:1.19"
 
           port {
-            container_port = "80"
             name           = "web"
+            container_port = 80
+          }
+
+          readiness_probe {
+            initial_delay_seconds = 5
+            http_get {
+              path = "/"
+              port = 80
+            }
           }
 
           volume_mount {
-            name       = "workdir"
+            name       = "ss-test"
             mount_path = "/work-dir"
           }
         }
@@ -575,7 +613,7 @@ func testAccKubernetesStatefulSetConfigUpdateImage(name string) string {
           }
 
           volume_mount {
-            name       = "workdir"
+            name       = "ss-test"
             mount_path = "/work-dir"
           }
         }
@@ -660,7 +698,7 @@ func testAccKubernetesStatefulSetConfigUpdatedSelectorLabels(name string) string
           }
 
           volume_mount {
-            name       = "workdir"
+            name       = "ss-test"
             mount_path = "/work-dir"
           }
         }
@@ -695,7 +733,7 @@ func testAccKubernetesStatefulSetConfigUpdatedSelectorLabels(name string) string
 `, name)
 }
 
-func testAccKubernetesStatefulSetConfigUpdateReplicas(name string, replicas int) string {
+func testAccKubernetesStatefulSetConfigUpdateReplicas(name string, replicas string) string {
 	return fmt.Sprintf(`resource "kubernetes_stateful_set" "test" {
   metadata {
     annotations = {
@@ -714,7 +752,7 @@ func testAccKubernetesStatefulSetConfigUpdateReplicas(name string, replicas int)
 
   spec {
     pod_management_policy  = "OrderedReady"
-    replicas               = %d
+    replicas               = %q
     revision_history_limit = 11
 
     selector {
@@ -743,7 +781,7 @@ func testAccKubernetesStatefulSetConfigUpdateReplicas(name string, replicas int)
           }
 
           volume_mount {
-            name       = "workdir"
+            name       = "ss-test"
             mount_path = "/work-dir"
           }
         }
@@ -831,7 +869,7 @@ func testAccKubernetesStatefulSetConfigUpdateTemplate(name string) string {
           }
 
           volume_mount {
-            name       = "workdir"
+            name       = "ss-test"
             mount_path = "/work-dir"
           }
         }
@@ -930,7 +968,7 @@ func testAccKubernetesStatefulSetConfigRollingUpdatePartition(name string) strin
           }
 
           volume_mount {
-            name       = "workdir"
+            name       = "ss-test"
             mount_path = "/work-dir"
           }
         }
@@ -1013,7 +1051,7 @@ func testAccKubernetesStatefulSetConfigUpdateStrategyOnDelete(name string) strin
           }
 
           volume_mount {
-            name       = "workdir"
+            name       = "ss-test"
             mount_path = "/work-dir"
           }
         }
@@ -1040,11 +1078,13 @@ func testAccKubernetesStatefulSetConfigUpdateStrategyOnDelete(name string) strin
       }
     }
   }
+
+  wait_for_rollout = false
 }
 `, name)
 }
 
-func testAccKubernetesStatefulSetConfigWaitForRollout(name string) string {
+func testAccKubernetesStatefulSetConfigWaitForRollout(name string, v bool) string {
 	return fmt.Sprintf(`resource "kubernetes_service" "test" {
   metadata {
     name = "ss-test"
@@ -1111,9 +1151,9 @@ resource "kubernetes_stateful_set" "test" {
     }
   }
 
-  wait_for_rollout = true
+  wait_for_rollout = %t
 }
-`, name)
+`, name, v)
 }
 
 func testAccKubernetesStatefulSet_regression(provider, name string) string {
@@ -1165,7 +1205,7 @@ func testAccKubernetesStatefulSet_regression(provider, name string) string {
           }
 
           volume_mount {
-            name       = "workdir"
+            name       = "ss-test"
             mount_path = "/work-dir"
           }
         }

kubernetes/schema_job_spec.go

@@ -1,9 +1,6 @@
 package kubernetes
 
 import (
-	"fmt"
-	"strconv"
-
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -131,17 +128,11 @@ func jobSpecFields() map[string]*schema.Schema {
 			},
 		},
 		"ttl_seconds_after_finished": {
-			Type:     schema.TypeString,
-			Optional: true,
-			ForceNew: true,
-			ValidateFunc: func(value interface{}, key string) ([]string, []error) {
-				v, err := strconv.Atoi(value.(string))
-				if err != nil {
-					return []string{}, []error{fmt.Errorf("%s is not a valid integer", key)}
-				}
-				return validateNonNegativeInteger(v, key)
-			},
-			Description: "ttlSecondsAfterFinished limits the lifetime of a Job that has finished execution (either Complete or Failed). If this field is set, ttlSecondsAfterFinished after the Job finishes, it is eligible to be automatically deleted. When the Job is being deleted, its lifecycle guarantees (e.g. finalizers) will be honored. If this field is unset, the Job won't be automatically deleted. If this field is set to zero, the Job becomes eligible to be deleted immediately after it finishes.",
+			Type:         schema.TypeString,
+			Optional:     true,
+			ForceNew:     true,
+			ValidateFunc: validateTypeStringNullableInt,
+			Description:  "ttlSecondsAfterFinished limits the lifetime of a Job that has finished execution (either Complete or Failed). If this field is set, ttlSecondsAfterFinished after the Job finishes, it is eligible to be automatically deleted. When the Job is being deleted, its lifecycle guarantees (e.g. finalizers) will be honored. If this field is unset, the Job won't be automatically deleted. If this field is set to zero, the Job becomes eligible to be deleted immediately after it finishes.",
 		},
 	}
 

kubernetes/schema_stateful_set_spec.go

@@ -19,11 +19,11 @@ func statefulSetSpecFields(isUpdatable bool) map[string]*schema.Schema {
 			}, false),
 		},
 		"replicas": {
-			Type:         schema.TypeInt,
+			Type:         schema.TypeString,
 			Optional:     true,
-			Default:      1,
+			Computed:     true,
 			Description:  "The desired number of replicas of the given Template, in the sense that they are instantiations of the same Template. Value must be a positive integer.",
-			ValidateFunc: validateNonNegativeInteger,
+			ValidateFunc: validateTypeStringNullableInt,
 		},
 		"revision_history_limit": {
 			Type:         schema.TypeInt,

kubernetes/structures_deployment.go

@@ -1,6 +1,8 @@
 package kubernetes
 
 import (
+	"strconv"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -12,7 +14,7 @@ func flattenDeploymentSpec(in appsv1.DeploymentSpec, d *schema.ResourceData) ([]
 	att["min_ready_seconds"] = in.MinReadySeconds
 
 	if in.Replicas != nil {
-		att["replicas"] = *in.Replicas
+		att["replicas"] = strconv.Itoa(int(*in.Replicas))
 	}
 
 	if in.ProgressDeadlineSeconds != nil {
@@ -75,7 +77,13 @@ func expandDeploymentSpec(deployment []interface{}) (*appsv1.DeploymentSpec, err
 	obj.MinReadySeconds = int32(in["min_ready_seconds"].(int))
 	obj.Paused = in["paused"].(bool)
 	obj.ProgressDeadlineSeconds = ptrToInt32(int32(in["progress_deadline_seconds"].(int)))
-	obj.Replicas = ptrToInt32(int32(in["replicas"].(int)))
+	if v, ok := in["replicas"].(string); ok && v != "" {
+		i, err := strconv.ParseInt(v, 10, 32)
+		if err != nil {
+			return obj, err
+		}
+		obj.Replicas = ptrToInt32(int32(i))
+	}
 	obj.RevisionHistoryLimit = ptrToInt32(int32(in["revision_history_limit"].(int)))
 
 	if v, ok := in["selector"].([]interface{}); ok && len(v) > 0 {