Fix timeouts for StatefulSet, Deployment, and DaemonSet (#1902)

* Fix timeouts for StatefulSet, Deployment, and DaemonSet
hashicorp · Nov 18, 2022 · ae57b1b · ae57b1b
1 parent 2f50988
commit ae57b1b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.changelog/1902.txt b/.changelog/1902.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+Fix an issue with timeouts for `StatefulSet`, `Deployment`, and `DaemonSet` resources when in some cases changes of `Update` or `Create` timeout doesn't affect related actions.
+```
diff --git a/kubernetes/resource_kubernetes_daemonset.go b/kubernetes/resource_kubernetes_daemonset.go
@@ -159,7 +159,7 @@ func resourceKubernetesDaemonSetCreate(ctx context.Context, d *schema.ResourceDa
 	}
 
 	if d.Get("wait_for_rollout").(bool) {
-		err = resource.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate),
+		err = resource.RetryContext(ctx, d.Timeout(schema.TimeoutCreate),
 			waitForDaemonSetReplicasFunc(ctx, conn, metadata.Namespace, metadata.Name))
 		if err != nil {
 			return diag.FromErr(err)

diff --git a/kubernetes/resource_kubernetes_deployment.go b/kubernetes/resource_kubernetes_deployment.go
@@ -302,7 +302,7 @@ func resourceKubernetesDeploymentUpdate(ctx context.Context, d *schema.ResourceD
 
 	if d.Get("wait_for_rollout").(bool) {
 		log.Printf("[INFO] Waiting for deployment %s/%s to rollout", out.ObjectMeta.Namespace, out.ObjectMeta.Name)
-		err := resource.RetryContext(ctx, d.Timeout(schema.TimeoutCreate),
+		err := resource.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate),
 			waitForDeploymentReplicasFunc(ctx, conn, out.GetNamespace(), out.GetName()))
 		if err != nil {
 			return diag.FromErr(err)

diff --git a/kubernetes/resource_kubernetes_stateful_set.go b/kubernetes/resource_kubernetes_stateful_set.go
@@ -215,7 +215,7 @@ func resourceKubernetesStatefulSetUpdate(ctx context.Context, d *schema.Resource
 
 	if d.Get("wait_for_rollout").(bool) {
 		log.Printf("[INFO] Waiting for StatefulSet %s to rollout", d.Id())
-		err = resource.RetryContext(ctx, d.Timeout(schema.TimeoutCreate),
+		err = resource.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate),
 			retryUntilStatefulSetRolloutComplete(ctx, conn, namespace, name))
 		if err != nil {
 			return diag.FromErr(err)