remove comment and handle the error of Unmarshal

Signed-off-by: Liu Zhenwei <zwliu@thoughtworks.com> Signed-off-by: liuzhenwei <dui_zhang@163.com>
openkruise · Mar 12, 2024 · b4bd74c · b4bd74c
1 parent 121eb28
commit b4bd74c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/apis/apps/pub/inplace_update.go b/apis/apps/pub/inplace_update.go
@@ -114,7 +114,7 @@ type InPlaceUpdateContainerRestartCount struct {
 	// RestartCount is the container restart count
 	RestartCount int `json:"restartCount,omitempty"`
 	// Timestamp is the time for this update
-	Timestamp metav1.Time `json:"timestamp"`
+	Timestamp metav1.Time `json:"timestamp,omitempty"`
 }
 
 func GetInPlaceUpdateState(obj metav1.Object) (string, bool) {

diff --git a/pkg/util/inplaceupdate/inplace_update.go b/pkg/util/inplaceupdate/inplace_update.go
@@ -90,7 +90,6 @@ type UpdateSpec struct {
 	OldTemplate *v1.PodTemplateSpec `json:"oldTemplate,omitempty"`
 	NewTemplate *v1.PodTemplateSpec `json:"newTemplate,omitempty"`
 }
-
 type realControl struct {
 	podAdapter      podadapter.Adapter
 	revisionAdapter revisionadapter.Interface
@@ -429,14 +428,15 @@ func recordPodAndContainersRestartCount(pod *v1.Pod, spec *UpdateSpec, revision
 	}
 	var currentPodRestartCount int64
 	containersRestartCount := make(map[string]appspub.InPlaceUpdateContainerRestartCount)
-	//revision := pod.GetLabels()["controller-revision-hash"]
 
 	if v, ok := pod.Annotations[appspub.InPlaceUpdatePodRestartKey]; ok {
 		currentPodRestartCount, _ = strconv.ParseInt(v, 10, 64)
 	}
 
 	if v, ok := pod.Annotations[appspub.InPlaceUpdateContainersRestartKey]; ok {
-		_ = json.Unmarshal([]byte(v), &containersRestartCount)
+		if err := json.Unmarshal([]byte(v), &containersRestartCount); err != nil {
+			return
+		}
 	}
 	calculateRestartCountFunc := func(cname string) {
 		containerRestartCount, ok := containersRestartCount[cname]