test

Signed-off-by: pingjiang <xiangpingjiang1998@gmail.com>
openkruise · Aug 20, 2023 · 07b34d5 · 07b34d5
1 parent 4e35a1d
commit 07b34d5
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 0 deletions.
diff --git a/pkg/control/sidecarcontrol/util.go b/pkg/control/sidecarcontrol/util.go
@@ -81,6 +81,7 @@ type SidecarSetUpgradeSpec struct {
 	SidecarSetName               string      `json:"sidecarSetName"`
 	SidecarList                  []string    `json:"sidecarList"`                  // sidecarSet container list
 	SidecarSetControllerRevision string      `json:"controllerRevision,omitempty"` // sidecarSet controllerRevision name
+	State                        string      `json:"state"`                        // enum: Normal, Updating
 }
 
 // PodMatchSidecarSet determines if pod match Selector of sidecar.
@@ -253,11 +254,75 @@ func UpdatePodSidecarSetHash(pod *corev1.Pod, sidecarSet *appsv1alpha1.SidecarSe
 		SidecarSetName:               sidecarSet.Name,
 		SidecarList:                  sidecarList.List(),
 		SidecarSetControllerRevision: sidecarSet.Status.LatestRevision,
+		State:                        "Updating",
 	}
 	newHash, _ := json.Marshal(sidecarSetHash)
 	pod.Annotations[hashKey] = string(newHash)
 }
 
+func UpdatePodSidecarSetHashState(pod *corev1.Pod, sidecarSet *appsv1alpha1.SidecarSet) {
+	hashKey := SidecarSetHashAnnotation
+	sidecarSetHash := make(map[string]SidecarSetUpgradeSpec)
+	if err := json.Unmarshal([]byte(pod.Annotations[hashKey]), &sidecarSetHash); err != nil {
+		klog.Errorf("unmarshal pod(%s/%s) annotations[%s] failed: %s", pod.Namespace, pod.Name, hashKey, err.Error())
+
+		// to be compatible with older sidecarSet hash struct, map[string]string
+		olderSidecarSetHash := make(map[string]string)
+		if err = json.Unmarshal([]byte(pod.Annotations[hashKey]), &olderSidecarSetHash); err == nil {
+			for k, v := range olderSidecarSetHash {
+				sidecarSetHash[k] = SidecarSetUpgradeSpec{
+					SidecarSetHash:  v,
+					UpdateTimestamp: metav1.Now(),
+					SidecarSetName:  sidecarSet.Name,
+				}
+			}
+		}
+	}
+
+	sidecarList := sets.NewString()
+	for _, sidecar := range sidecarSet.Spec.Containers {
+		sidecarList.Insert(sidecar.Name)
+	}
+
+	sidecarSetHash[sidecarSet.Name] = SidecarSetUpgradeSpec{
+		UpdateTimestamp:              metav1.Now(),
+		SidecarSetHash:               sidecarSetHash[sidecarSet.Name].SidecarSetHash,
+		SidecarSetName:               sidecarSet.Name,
+		SidecarList:                  sidecarList.List(),
+		SidecarSetControllerRevision: sidecarSetHash[sidecarSet.Name].SidecarSetControllerRevision,
+		State:                        "Normal",
+	}
+	newHash, _ := json.Marshal(sidecarSetHash)
+	pod.Annotations[hashKey] = string(newHash)
+}
+
+func IsSiderCarContainersReady(pod *corev1.Pod, containers sets.String) bool {
+	for _, cs := range pod.Status.ContainerStatuses {
+		// only check containers set
+		if !containers.Has(cs.Name) {
+			continue
+		}
+		if !cs.Ready {
+			return false
+		}
+	}
+	return true
+}
+
+func IsPodFinishSiderCarContainersUpdate(pod *corev1.Pod, sidecarSet *appsv1alpha1.SidecarSet) bool {
+	sidecars := GetSidecarContainersInPod(sidecarSet)
+	if _, ok := pod.Annotations[SidecarsetInplaceUpdateStateKey]; ok {
+		if IsSidecarContainerUpdateCompleted(pod, sets.NewString(sidecarSet.Name), sidecars) && IsSiderCarContainersReady(pod, sidecars) {
+			return true
+		}
+	} else {
+		if IsSiderCarContainersReady(pod, sidecars) {
+			return true
+		}
+	}
+	return false
+}
+
 func GetSidecarContainersInPod(sidecarSet *appsv1alpha1.SidecarSet) sets.String {
 	names := sets.NewString()
 	for _, sidecarContainer := range sidecarSet.Spec.Containers {

diff --git a/pkg/webhook/pod/mutating/sidecarset.go b/pkg/webhook/pod/mutating/sidecarset.go
@@ -450,6 +450,18 @@ func buildSidecars(isUpdated bool, pod *corev1.Pod, oldPod *corev1.Pod, matchedS
 			sidecarSetHash[sidecarSet.Name] = setUpgrade1
 			sidecarSetHashWithoutImage[sidecarSet.Name] = setUpgrade2
 		}
+		var state string = "Updating"
+		if sidecarcontrol.IsPodFinishSiderCarContainersUpdate(pod, sidecarSet) {
+			state = "Normal"
+		}
+		sidecarSetHash[sidecarSet.Name] = sidecarcontrol.SidecarSetUpgradeSpec{
+			UpdateTimestamp:              metav1.Now(),
+			SidecarSetHash:               sidecarSetHash[sidecarSet.Name].SidecarSetHash,
+			SidecarSetName:               sidecarSet.Name,
+			SidecarList:                  sidecarList.List(),
+			SidecarSetControllerRevision: sidecarSetHash[sidecarSet.Name].SidecarSetControllerRevision,
+			State:                        state,
+		}
 	}
 
 	// store sidecarset hash in pod annotations