Skip to content

Commit ae57b1b

Browse files
authored
Fix timeouts for StatefulSet, Deployment, and DaemonSet (#1902)
* Fix timeouts for StatefulSet, Deployment, and DaemonSet
1 parent 2f50988 commit ae57b1b

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

.changelog/1902.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
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.
3+
```

kubernetes/resource_kubernetes_daemonset.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ func resourceKubernetesDaemonSetCreate(ctx context.Context, d *schema.ResourceDa
159159
}
160160

161161
if d.Get("wait_for_rollout").(bool) {
162-
err = resource.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate),
162+
err = resource.RetryContext(ctx, d.Timeout(schema.TimeoutCreate),
163163
waitForDaemonSetReplicasFunc(ctx, conn, metadata.Namespace, metadata.Name))
164164
if err != nil {
165165
return diag.FromErr(err)

kubernetes/resource_kubernetes_deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ func resourceKubernetesDeploymentUpdate(ctx context.Context, d *schema.ResourceD
302302

303303
if d.Get("wait_for_rollout").(bool) {
304304
log.Printf("[INFO] Waiting for deployment %s/%s to rollout", out.ObjectMeta.Namespace, out.ObjectMeta.Name)
305-
err := resource.RetryContext(ctx, d.Timeout(schema.TimeoutCreate),
305+
err := resource.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate),
306306
waitForDeploymentReplicasFunc(ctx, conn, out.GetNamespace(), out.GetName()))
307307
if err != nil {
308308
return diag.FromErr(err)

kubernetes/resource_kubernetes_stateful_set.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ func resourceKubernetesStatefulSetUpdate(ctx context.Context, d *schema.Resource
215215

216216
if d.Get("wait_for_rollout").(bool) {
217217
log.Printf("[INFO] Waiting for StatefulSet %s to rollout", d.Id())
218-
err = resource.RetryContext(ctx, d.Timeout(schema.TimeoutCreate),
218+
err = resource.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate),
219219
retryUntilStatefulSetRolloutComplete(ctx, conn, namespace, name))
220220
if err != nil {
221221
return diag.FromErr(err)

0 commit comments

Comments
 (0)