Fix wait_for_rollout in kubernetes_daemon_set_v1 (#2789)

jaylonmcshan19-x · sbocinec · web-flow · commit 1c4b7c87b941 · 2025-10-14T10:28:17.000-06:00
Co-authored-by: Stano Bocinec &lt;stano@redpanda.com&gt;
diff --git a/.changelog/2789.txt b/.changelog/2789.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+`resource/kubernetes_daemon_set_v1`: fix an issue with the provider not waiting for rollout with `wait_for_rollout = true`.
+```
diff --git a/kubernetes/resource_kubernetes_daemon_set_v1.go b/kubernetes/resource_kubernetes_daemon_set_v1.go
@@ -172,7 +172,7 @@ func resourceKubernetesDaemonSetV1Create(ctx context.Context, d *schema.Resource
 
 	if d.Get("wait_for_rollout").(bool) {
 		err = retry.RetryContext(ctx, d.Timeout(schema.TimeoutCreate),
-			waitForDaemonSetReplicasFunc(ctx, conn, metadata.Namespace, metadata.Name))
+			waitForDaemonSetPodsFunc(ctx, conn, metadata.Namespace, metadata.Name))
 		if err != nil {
 			return diag.FromErr(err)
 		}
@@ -223,7 +223,7 @@ func resourceKubernetesDaemonSetV1Update(ctx context.Context, d *schema.Resource
 
 	if d.Get("wait_for_rollout").(bool) {
 		err = retry.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate),
-			waitForDaemonSetReplicasFunc(ctx, conn, namespace, name))
+			waitForDaemonSetPodsFunc(ctx, conn, namespace, name))
 		if err != nil {
 			return diag.FromErr(err)
 		}
@@ -333,22 +333,26 @@ func resourceKubernetesDaemonSetV1Exists(ctx context.Context, d *schema.Resource
 	return true, err
 }
 
-func waitForDaemonSetReplicasFunc(ctx context.Context, conn *kubernetes.Clientset, ns, name string) retry.RetryFunc {
+func waitForDaemonSetPodsFunc(ctx context.Context, conn *kubernetes.Clientset, ns, name string) retry.RetryFunc {
 	return func() *retry.RetryError {
 		daemonSet, err := conn.AppsV1().DaemonSets(ns).Get(ctx, name, metav1.GetOptions{})
 		if err != nil {
 			return retry.NonRetryableError(err)
 		}
 
-		desiredReplicas := daemonSet.Status.DesiredNumberScheduled
-		log.Printf("[DEBUG] Current number of labelled replicas of %q: %d (of %d)\n",
-			daemonSet.GetName(), daemonSet.Status.CurrentNumberScheduled, desiredReplicas)
+		desiredPods := daemonSet.Status.DesiredNumberScheduled
 
-		if daemonSet.Status.CurrentNumberScheduled == desiredReplicas {
-			return nil
+		if daemonSet.Generation > daemonSet.Status.ObservedGeneration {
+			return retry.RetryableError(fmt.Errorf("waiting for rollout to start."))
 		}
 
-		return retry.RetryableError(fmt.Errorf("Waiting for %d replicas of %q to be scheduled (%d)",
-			desiredReplicas, daemonSet.GetName(), daemonSet.Status.CurrentNumberScheduled))
+		if daemonSet.Generation == daemonSet.Status.ObservedGeneration {
+			if daemonSet.Status.NumberReady == desiredPods {
+				return nil
+			}
+			return retry.RetryableError(fmt.Errorf("waiting for rollout to finish: %d pods desired; %d pods ready",
+				desiredPods, daemonSet.Status.NumberReady))
+		}
+		return retry.NonRetryableError(fmt.Errorf("observed generation %d is not expected to be greater than generation %d", daemonSet.Status.ObservedGeneration, daemonSet.Generation))
 	}
 }
diff --git a/kubernetes/resource_kubernetes_daemon_set_v1_test.go b/kubernetes/resource_kubernetes_daemon_set_v1_test.go
@@ -890,8 +890,9 @@ func testAccKubernetesDaemonSetV1ConfigWithTemplateMetadata(depName, imageName s
 
       spec {
         container {
-          image = "%s"
-          name  = "containername"
+          image   = "%s"
+          name    = "containername"
+          command = ["sleep", "infinity"]
         }
         termination_grace_period_seconds = 1
       }
@@ -977,8 +978,9 @@ func testAccKubernetesDaemonSetV1WithInitContainer(depName, imageName string) st
         }
 
         container {
-          image = "%s"
-          name  = "containername"
+          image   = "%s"
+          name    = "containername"
+          command = ["sleep", "infinity"]
         }
         termination_grace_period_seconds = 1
       }
@@ -1010,8 +1012,9 @@ func testAccKubernetesDaemonSetV1WithNoTopLevelLabels(depName, imageName string)
 
       spec {
         container {
-          image = "%s"
-          name  = "containername"
+          image   = "%s"
+          name    = "containername"
+          command = ["sleep", "infinity"]
         }
         termination_grace_period_seconds = 1
       }
@@ -1064,8 +1067,9 @@ func testAccKubernetesDaemonSetV1ConfigWithTolerations(rcName, imageName string,
         }
 
         container {
-          image = "%s"
-          name  = "containername"
+          image   = "%s"
+          name    = "containername"
+          command = ["sleep", "infinity"]
         }
         termination_grace_period_seconds = 1
       }
@@ -1119,6 +1123,7 @@ func testAccKubernetesDaemonSetV1ConfigWithContainerSecurityContextSeccompProfil
       }
     }
   }
+  wait_for_rollout = false
 }
 `, deploymentName, seccompProfileType, imageName, seccompProfileType)
 }
@@ -1169,6 +1174,7 @@ func testAccKubernetesDaemonSetV1ConfigWithContainerSecurityContextSeccompProfil
       }
     }
   }
+  wait_for_rollout = false
 }
 `, deploymentName, imageName)
 }
@@ -1199,20 +1205,19 @@ func testAccKubernetesDaemonSetV1ConfigWithResourceRequirements(deploymentName,
 
       spec {
         container {
-          image = "%s"
-          name  = "containername"
+          image   = "%s"
+          name    = "containername"
+          command = ["sleep", "infinity"]
 
           resources {
             limits = {
-              cpu          = "0.5"
-              memory       = "512Mi"
-              "nvidia/gpu" = "1"
+              cpu    = "0.5"
+              memory = "512Mi"
             }
 
             requests = {
-              cpu          = "250m"
-              memory       = "50Mi"
-              "nvidia/gpu" = "1"
+              cpu    = "250m"
+              memory = "50Mi"
             }
           }
         }
@@ -1250,8 +1255,9 @@ func testAccKubernetesDaemonSetV1ConfigWithEmptyResourceRequirements(deploymentN
 
       spec {
         container {
-          image = "%s"
-          name  = "containername"
+          image   = "%s"
+          name    = "containername"
+          command = ["sleep", "infinity"]
 
           resources {
             limits   = {}
@@ -1292,8 +1298,9 @@ func testAccKubernetesDaemonSetV1ConfigWithResourceRequirementsLimitsOnly(deploy
 
       spec {
         container {
-          image = "%s"
-          name  = "containername"
+          image   = "%s"
+          name    = "containername"
+          command = ["sleep", "infinity"]
 
           resources {
             limits = {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:bug
	`2`	+`resource/kubernetes_daemon_set_v1`: fix an issue with the provider not waiting for rollout with `wait_for_rollout = true`.
	`3`	+```
Original file line number	Diff line number	Diff line change
`@@ -890,8 +890,9 @@ func testAccKubernetesDaemonSetV1ConfigWithTemplateMetadata(depName, imageName s`
`890`	`890`
`891`	`891`	`spec {`
`892`	`892`	`container {`
`893`		`- image = "%s"`
`894`		`- name = "containername"`
	`893`	`+ image = "%s"`
	`894`	`+ name = "containername"`
	`895`	`+ command = ["sleep", "infinity"]`
`895`	`896`	`}`
`896`	`897`	`termination_grace_period_seconds = 1`
`897`	`898`	`}`
`@@ -977,8 +978,9 @@ func testAccKubernetesDaemonSetV1WithInitContainer(depName, imageName string) st`
`977`	`978`	`}`
`978`	`979`
`979`	`980`	`container {`
`980`		`- image = "%s"`
`981`		`- name = "containername"`
	`981`	`+ image = "%s"`
	`982`	`+ name = "containername"`
	`983`	`+ command = ["sleep", "infinity"]`
`982`	`984`	`}`
`983`	`985`	`termination_grace_period_seconds = 1`
`984`	`986`	`}`
`@@ -1010,8 +1012,9 @@ func testAccKubernetesDaemonSetV1WithNoTopLevelLabels(depName, imageName string)`
`1010`	`1012`
`1011`	`1013`	`spec {`
`1012`	`1014`	`container {`
`1013`		`- image = "%s"`
`1014`		`- name = "containername"`
	`1015`	`+ image = "%s"`
	`1016`	`+ name = "containername"`
	`1017`	`+ command = ["sleep", "infinity"]`
`1015`	`1018`	`}`
`1016`	`1019`	`termination_grace_period_seconds = 1`
`1017`	`1020`	`}`
`@@ -1064,8 +1067,9 @@ func testAccKubernetesDaemonSetV1ConfigWithTolerations(rcName, imageName string,`
`1064`	`1067`	`}`
`1065`	`1068`
`1066`	`1069`	`container {`
`1067`		`- image = "%s"`
`1068`		`- name = "containername"`
	`1070`	`+ image = "%s"`
	`1071`	`+ name = "containername"`
	`1072`	`+ command = ["sleep", "infinity"]`
`1069`	`1073`	`}`
`1070`	`1074`	`termination_grace_period_seconds = 1`
`1071`	`1075`	`}`
`@@ -1119,6 +1123,7 @@ func testAccKubernetesDaemonSetV1ConfigWithContainerSecurityContextSeccompProfil`
`1119`	`1123`	`}`
`1120`	`1124`	`}`
`1121`	`1125`	`}`
	`1126`	`+ wait_for_rollout = false`
`1122`	`1127`	`}`
`1123`	`1128`	`, deploymentName, seccompProfileType, imageName, seccompProfileType)
`1124`	`1129`	`}`
`@@ -1169,6 +1174,7 @@ func testAccKubernetesDaemonSetV1ConfigWithContainerSecurityContextSeccompProfil`
`1169`	`1174`	`}`
`1170`	`1175`	`}`
`1171`	`1176`	`}`
	`1177`	`+ wait_for_rollout = false`
`1172`	`1178`	`}`
`1173`	`1179`	`, deploymentName, imageName)
`1174`	`1180`	`}`
`@@ -1199,20 +1205,19 @@ func testAccKubernetesDaemonSetV1ConfigWithResourceRequirements(deploymentName,`
`1199`	`1205`
`1200`	`1206`	`spec {`
`1201`	`1207`	`container {`
`1202`		`- image = "%s"`
`1203`		`- name = "containername"`
	`1208`	`+ image = "%s"`
	`1209`	`+ name = "containername"`
	`1210`	`+ command = ["sleep", "infinity"]`
`1204`	`1211`
`1205`	`1212`	`resources {`
`1206`	`1213`	`limits = {`
`1207`		`- cpu = "0.5"`
`1208`		`- memory = "512Mi"`
`1209`		`- "nvidia/gpu" = "1"`
	`1214`	`+ cpu = "0.5"`
	`1215`	`+ memory = "512Mi"`
`1210`	`1216`	`}`
`1211`	`1217`
`1212`	`1218`	`requests = {`
`1213`		`- cpu = "250m"`
`1214`		`- memory = "50Mi"`
`1215`		`- "nvidia/gpu" = "1"`
	`1219`	`+ cpu = "250m"`
	`1220`	`+ memory = "50Mi"`
`1216`	`1221`	`}`
`1217`	`1222`	`}`
`1218`	`1223`	`}`
`@@ -1250,8 +1255,9 @@ func testAccKubernetesDaemonSetV1ConfigWithEmptyResourceRequirements(deploymentN`
`1250`	`1255`
`1251`	`1256`	`spec {`
`1252`	`1257`	`container {`
`1253`		`- image = "%s"`
`1254`		`- name = "containername"`
	`1258`	`+ image = "%s"`
	`1259`	`+ name = "containername"`
	`1260`	`+ command = ["sleep", "infinity"]`
`1255`	`1261`
`1256`	`1262`	`resources {`
`1257`	`1263`	`limits = {}`
`@@ -1292,8 +1298,9 @@ func testAccKubernetesDaemonSetV1ConfigWithResourceRequirementsLimitsOnly(deploy`
`1292`	`1298`
`1293`	`1299`	`spec {`
`1294`	`1300`	`container {`
`1295`		`- image = "%s"`
`1296`		`- name = "containername"`
	`1301`	`+ image = "%s"`
	`1302`	`+ name = "containername"`
	`1303`	`+ command = ["sleep", "infinity"]`
`1297`	`1304`
`1298`	`1305`	`resources {`
`1299`	`1306`	`limits = {`