fix ci bugs

Signed-off-by: jiangshixuan.jsx <jiangshixuan.jsx@alibaba-inc.com>
openkruise · Jul 18, 2023 · b1c7332 · b1c7332
1 parent 5863246
commit b1c7332
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/pkg/control/sidecarcontrol/sidecarset_control.go b/pkg/control/sidecarcontrol/sidecarset_control.go
@@ -161,7 +161,6 @@ func (c *commonControl) UpdatePodAnnotationsInUpgrade(changedContainers []string
 	}
 	by, _ = json.Marshal(mainContainerStatuses)
 	pod.Annotations[SidecarSetBeforeHotUpgradeStateKey] = string(by)
-	return
 }
 
 // only check sidecar container is consistent

diff --git a/pkg/controller/sidecarset/sidecarset_hotupgrade.go b/pkg/controller/sidecarset/sidecarset_hotupgrade.go
@@ -119,7 +119,7 @@ func getPreviousMainContainerStatus(pod *corev1.Pod) map[string]bool {
 	tmp := make(SidecarsetMainContainerStatus)
 	err := json.Unmarshal([]byte(v), &tmp)
 	if err != nil {
-		klog.Errorf("error unmarshaling pod(%s.%s)'s previous main container status, return nil", pod.Namespace, pod.Name)
+		klog.Errorf("error unmarshalling pod(%s/%s)'s previous main container status, return nil", pod.Namespace, pod.Name)
 		return nil
 	}
 	for k, v := range tmp {