controller: consider StatefulSet's start ordinal (#4967)

zhangzujian · zhangzujian · commit a6123dd74210 · 2025-02-06T04:47:19.000Z
Signed-off-by: zhangzujian &lt;zhangzujian.7@gmail.com&gt;
diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -1281,7 +1281,11 @@ func isStatefulSetPodToDel(c kubernetes.Interface, pod *v1.Pod, statefulSetName
 		return false
 	}
 	// down scaled
-	if index >= int64(*sts.Spec.Replicas) {
+	var startOrdinal int64
+	if sts.Spec.Ordinals != nil {
+		startOrdinal = int64(sts.Spec.Ordinals.Start)
+	}
+	if index >= startOrdinal+int64(*sts.Spec.Replicas) {
 		klog.Infof("statefulset %s is down scaled", statefulSetName)
 		return true
 	}

Original file line number	Diff line number	Diff line change
`@@ -1281,7 +1281,11 @@ func isStatefulSetPodToDel(c kubernetes.Interface, pod *v1.Pod, statefulSetName`
`1281`	`1281`	`return false`
`1282`	`1282`	`}`
`1283`	`1283`	`// down scaled`
`1284`		`- if index >= int64(*sts.Spec.Replicas) {`
	`1284`	`+ var startOrdinal int64`
	`1285`	`+ if sts.Spec.Ordinals != nil {`
	`1286`	`+ startOrdinal = int64(sts.Spec.Ordinals.Start)`
	`1287`	`+ }`
	`1288`	`+ if index >= startOrdinal+int64(*sts.Spec.Replicas) {`
`1285`	`1289`	`klog.Infof("statefulset %s is down scaled", statefulSetName)`
`1286`	`1290`	`return true`
`1287`	`1291`	`}`