test

Signed-off-by: pingjiang <xiangpingjiang1998@gmail.com>

pkg/control/sidecarcontrol/util.go

@@ -326,17 +326,13 @@ func UpdatePodSidecarSetHashState(pod *corev1.Pod, sidecarSet *appsv1alpha1.Side
 			}
 		}
 	}
-	sidecarList := sets.NewString()
-	for _, sidecar := range sidecarSet.Spec.Containers {
-		sidecarList.Insert(sidecar.Name)
-	}
 
 	sidecarSetHash[sidecarSet.Name] = SidecarSetUpgradeSpec{
 		UpdateTimestamp:              metav1.Now(),
-		SidecarSetHash:               GetSidecarSetRevision(sidecarSet),
-		SidecarSetName:               sidecarSet.Name,
-		SidecarList:                  sidecarList.List(),
-		SidecarSetControllerRevision: sidecarSet.Status.LatestRevision,
+		SidecarSetHash:               sidecarSetHash[sidecarSet.Name].SidecarSetHash,
+		SidecarSetName:               sidecarSetHash[sidecarSet.Name].SidecarSetName,
+		SidecarList:                  sidecarSetHash[sidecarSet.Name].SidecarList,
+		SidecarSetControllerRevision: sidecarSetHash[sidecarSet.Name].SidecarSetControllerRevision,
 		State:                        "Normal",
 	}
 	newHash, _ := json.Marshal(sidecarSetHash)

pkg/controller/sidecarset/sidecarset_processor.go

@@ -77,15 +77,6 @@ func (p *Processor) UpdateSidecarSet(sidecarSet *appsv1alpha1.SidecarSet) (recon
 		return reconcile.Result{}, err
 	}
 
-	// check if pod finish sidecar container upgrade
-	for _, pod := range pods {
-		if sidecarcontrol.IsPodFinishSiderCarContainersUpdate(pod, sidecarSet) && sidecarcontrol.GetPodSidecarSetHashState(pod, sidecarSet) != "Normal" {
-			klog.V(3).Infof("#################################")
-			sidecarcontrol.UpdatePodSidecarSetHashState(pod, sidecarSet)
-			p.Client.Update(context.TODO(), pod)
-		}
-	}
-
 	// register new revision if this sidecarSet is the latest;
 	// return the latest revision that corresponds to this sidecarSet.
 	latestRevision, collisionCount, err := p.registerLatestRevision(sidecarSet, pods)
@@ -112,6 +103,15 @@ func (p *Processor) UpdateSidecarSet(sidecarSet *appsv1alpha1.SidecarSet) (recon
 		return reconcile.Result{RequeueAfter: time.Second}, nil
 	}
 
+	// check if pod finish sidecar container upgrade
+	for _, pod := range pods {
+		if sidecarcontrol.IsPodFinishSiderCarContainersUpdate(pod, sidecarSet) && sidecarcontrol.GetPodSidecarSetHashState(pod, sidecarSet) != "Normal" {
+			klog.V(3).Infof("#################################")
+			sidecarcontrol.UpdatePodSidecarSetHashState(pod, sidecarSet)
+			p.Client.Update(context.TODO(), pod)
+		}
+	}
+
 	// 3. If sidecar container hot upgrade complete, then set the other one(empty sidecar container) image to HotUpgradeEmptyImage
 	if isSidecarSetHasHotUpgradeContainer(sidecarSet) {
 		var podsInHotUpgrading []*corev1.Pod