change diffPod method receiver to pointer, and return false in replaceUpdate GetPodUpdateFinishStatus when replace new pair pod is not exist

dbug-dk · dbug-dk · commit ba3463b79a25 · 2024-04-17T20:04:04.000+08:00
diff --git a/pkg/controllers/collaset/synccontrol/update.go b/pkg/controllers/collaset/synccontrol/update.go
@@ -534,7 +534,7 @@ func recreatePod(collaSet *appsv1alpha1.CollaSet, podInfo *PodUpdateInfo, podCon
 	return nil
 }
 
-func (u inPlaceIfPossibleUpdater) diffPod(currentPod, updatedPod *corev1.Pod) (inPlaceSetUpdateSupport bool, onlyMetadataChanged bool) {
+func (u *inPlaceIfPossibleUpdater) diffPod(currentPod, updatedPod *corev1.Pod) (inPlaceSetUpdateSupport bool, onlyMetadataChanged bool) {
 	if len(currentPod.Spec.Containers) != len(updatedPod.Spec.Containers) {
 		return false, false
 	}
@@ -752,7 +752,7 @@ func (u *replaceUpdatePodUpdater) UpgradePod(podInfo *PodUpdateInfo) error {
 func (u *replaceUpdatePodUpdater) GetPodUpdateFinishStatus(podUpdateInfo *PodUpdateInfo) (finished bool, msg string, err error) {
 	replaceNewPodInfo := podUpdateInfo.replacePairNewPodInfo
 	if replaceNewPodInfo == nil {
-		return isPodUpdatedServiceAvailable(podUpdateInfo)
+		return
 	}
 
 	return isPodUpdatedServiceAvailable(replaceNewPodInfo)

Original file line number	Diff line number	Diff line change
`@@ -534,7 +534,7 @@ func recreatePod(collaSet appsv1alpha1.CollaSet, podInfo PodUpdateInfo, podCon`
`534`	`534`	`return nil`
`535`	`535`	`}`
`536`	`536`
`537`		`-func (u inPlaceIfPossibleUpdater) diffPod(currentPod, updatedPod *corev1.Pod) (inPlaceSetUpdateSupport bool, onlyMetadataChanged bool) {`
	`537`	`+func (u inPlaceIfPossibleUpdater) diffPod(currentPod, updatedPod corev1.Pod) (inPlaceSetUpdateSupport bool, onlyMetadataChanged bool) {`
`538`	`538`	`if len(currentPod.Spec.Containers) != len(updatedPod.Spec.Containers) {`
`539`	`539`	`return false, false`
`540`	`540`	`}`
`@@ -752,7 +752,7 @@ func (u replaceUpdatePodUpdater) UpgradePod(podInfo PodUpdateInfo) error {`
`752`	`752`	`func (u replaceUpdatePodUpdater) GetPodUpdateFinishStatus(podUpdateInfo PodUpdateInfo) (finished bool, msg string, err error) {`
`753`	`753`	`replaceNewPodInfo := podUpdateInfo.replacePairNewPodInfo`
`754`	`754`	`if replaceNewPodInfo == nil {`
`755`		`- return isPodUpdatedServiceAvailable(podUpdateInfo)`
	`755`	`+ return`
`756`	`756`	`}`
`757`	`757`
`758`	`758`	`return isPodUpdatedServiceAvailable(replaceNewPodInfo)`