Merge pull request #987 from wenxinlee2015/fix/bcs-gamedeployment-gam…

…estatefulset-hook fix: predeletehookconditions preinplacehookconditions for out of range
TencentBlueKing · Sep 8, 2021 · 99540f8 · 99540f8
2 parents c46a175 + d28cb2b
commit 99540f8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 28 deletions.
diff --git a/...k8s/bcs-gamedeployment-operator/pkg/controllers/gamedeployment/game_deployment_control.go b/...k8s/bcs-gamedeployment-operator/pkg/controllers/gamedeployment/game_deployment_control.go
@@ -279,17 +279,15 @@ func (gdc *defaultGameDeploymentControl) deleteUnexpectedPreDeleteHookRuns(hrLis
 
 // truncatePreDeleteHookConditions truncate unneeded PreDeleteHookConditions
 func (gdc *defaultGameDeploymentControl) truncatePreDeleteHookConditions(pods []*v1.Pod, newStatus *gdv1alpha1.GameDeploymentStatus) {
-	for i, cond := range newStatus.PreDeleteHookConditions {
-		exist := false
+	tmpPredeleteHookConditions := []hookv1alpha1.PreDeleteHookCondition{}
+	for _, cond := range newStatus.PreDeleteHookConditions {
 		for _, pod := range pods {
 			if cond.PodName == pod.Name {
-				exist = true
+				tmpPredeleteHookConditions = append(tmpPredeleteHookConditions, cond)
 				break
 			}
 		}
-		if !exist {
-			newStatus.PreDeleteHookConditions = append(newStatus.PreDeleteHookConditions[:i], newStatus.PreDeleteHookConditions[i+1:]...)
-		}
+		newStatus.PreDeleteHookConditions = tmpPredeleteHookConditions
 	}
 }
 
@@ -335,17 +333,15 @@ func (gdc *defaultGameDeploymentControl) deleteUnexpectedPreInplaceHookRuns(hrLi
 
 // truncatePreInplaceHookConditions truncate unneeded PreInplaceHookConditions
 func (gdc *defaultGameDeploymentControl) truncatePreInplaceHookConditions(pods []*v1.Pod, newStatus *gdv1alpha1.GameDeploymentStatus) {
-	for i, cond := range newStatus.PreInplaceHookConditions {
-		exist := false
+	tmpPreInplaceHookConditions := []hookv1alpha1.PreInplaceHookCondition{}
+	for _, cond := range newStatus.PreInplaceHookConditions {
 		for _, pod := range pods {
 			if cond.PodName == pod.Name {
-				exist = true
+				tmpPreInplaceHookConditions = append(tmpPreInplaceHookConditions, cond)
 				break
 			}
 		}
-		if !exist {
-			newStatus.PreInplaceHookConditions = append(newStatus.PreInplaceHookConditions[:i], newStatus.PreInplaceHookConditions[i+1:]...)
-		}
+		newStatus.PreInplaceHookConditions = tmpPreInplaceHookConditions
 	}
 }
 

diff --git a/bcs-k8s/bcs-gamestatefulset-operator/pkg/controllers/game_stateful_set_control.go b/bcs-k8s/bcs-gamestatefulset-operator/pkg/controllers/game_stateful_set_control.go
@@ -1020,19 +1020,15 @@ func (ssc *defaultGameStatefulSetControl) truncatePreDeleteHookRuns(
 func (ssc *defaultGameStatefulSetControl) truncatePreDeleteHookConditions(
 	pods []*v1.Pod,
 	newStatus *gstsv1alpha1.GameStatefulSetStatus) {
-	for i, cond := range newStatus.PreDeleteHookConditions {
-		exist := false
+	tmpPredeleteHookConditions := []hookv1alpha1.PreDeleteHookCondition{}
+	for _, cond := range newStatus.PreDeleteHookConditions {
 		for _, pod := range pods {
 			if cond.PodName == pod.Name {
-				exist = true
+				tmpPredeleteHookConditions = append(tmpPredeleteHookConditions, cond)
 				break
 			}
 		}
-		if !exist {
-			newStatus.PreDeleteHookConditions = append(
-				newStatus.PreDeleteHookConditions[:i],
-				newStatus.PreDeleteHookConditions[i+1:]...)
-		}
+		newStatus.PreDeleteHookConditions = tmpPredeleteHookConditions
 	}
 }
 
@@ -1081,19 +1077,15 @@ func (ssc *defaultGameStatefulSetControl) truncatePreInplaceHookRuns(
 func (ssc *defaultGameStatefulSetControl) truncatePreInplaceHookConditions(
 	pods []*v1.Pod,
 	newStatus *gstsv1alpha1.GameStatefulSetStatus) {
-	for i, cond := range newStatus.PreInplaceHookConditions {
-		exist := false
+	tmpPreInplaceHookConditions := []hookv1alpha1.PreInplaceHookCondition{}
+	for _, cond := range newStatus.PreInplaceHookConditions {
 		for _, pod := range pods {
 			if cond.PodName == pod.Name {
-				exist = true
+				tmpPreInplaceHookConditions = append(tmpPreInplaceHookConditions, cond)
 				break
 			}
 		}
-		if !exist {
-			newStatus.PreInplaceHookConditions = append(
-				newStatus.PreInplaceHookConditions[:i],
-				newStatus.PreInplaceHookConditions[i+1:]...)
-		}
+		newStatus.PreInplaceHookConditions = tmpPreInplaceHookConditions
 	}
 }