controller: consider StatefulSet's ordinals

Signed-off-by: zhangzujian <[email protected]>

Author: zhangzujian

dist/images/Dockerfile

@@ -22,7 +22,7 @@ RUN ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-monitor && \
     setcap CAP_NET_RAW,CAP_NET_BIND_SERVICE+eip /kube-ovn/kube-ovn-controller && \
     setcap CAP_NET_ADMIN,CAP_NET_RAW,CAP_NET_BIND_SERVICE,CAP_SYS_ADMIN+eip /kube-ovn/kube-ovn-daemon
 
-FROM kubeovn/kube-ovn-base:$BASE_TAG
+FROM kubeovn/kube-ovn-base:$BASE_TAG-amd64
 
 COPY --chmod=0644 logrotate/* /etc/logrotate.d/
 COPY grace_stop_ovn_controller /usr/share/ovn/scripts/grace_stop_ovn_controller

pkg/controller/pod.go

@@ -1267,7 +1267,11 @@ func isStatefulSetPodToDel(c kubernetes.Interface, pod *v1.Pod, statefulSetName
 		return false
 	}
 	// down scaled
-	if index >= int64(*sts.Spec.Replicas) {
+	var ordinalsStart int64
+	if sts.Spec.Ordinals != nil {
+		ordinalsStart = int64(sts.Spec.Ordinals.Start)
+	}
+	if index >= ordinalsStart+int64(*sts.Spec.Replicas) {
 		klog.Infof("statefulset %s is down scaled", statefulSetName)
 		return true
 	}