Merge pull request #90209 from ZP-AlwaysWin/dev

Repair description

pkg/kubelet/dockershim/docker_checkpoint.go

@@ -61,9 +61,9 @@ type CheckpointData struct {
 type PodSandboxCheckpoint struct {
 	// Version of the pod sandbox checkpoint schema.
 	Version string `json:"version"`
-	// Pod name of the sandbox. Same as the pod name in the PodSpec.
+	// Pod name of the sandbox. Same as the pod name in the Pod ObjectMeta.
 	Name string `json:"name"`
-	// Pod namespace of the sandbox. Same as the pod namespace in the PodSpec.
+	// Pod namespace of the sandbox. Same as the pod namespace in the Pod ObjectMeta.
 	Namespace string `json:"namespace"`
 	// Data to checkpoint for pod sandbox.
 	Data *CheckpointData `json:"data,omitempty"`

pkg/kubelet/kuberuntime/kuberuntime_manager.go

@@ -718,7 +718,7 @@ func (m *kubeGenericRuntimeManager) SyncPod(pod *v1.Pod, podStatus *kubecontaine
 		var msg string
 		var err error
 
-		klog.V(4).Infof("Creating sandbox for pod %q", format.Pod(pod))
+		klog.V(4).Infof("Creating PodSandbox for pod %q", format.Pod(pod))
 		createSandboxResult := kubecontainer.NewSyncResult(kubecontainer.CreatePodSandbox, format.Pod(pod))
 		result.AddSyncResult(createSandboxResult)
 		podSandboxID, msg, err = m.createPodSandbox(pod, podContainerChanges.Attempt)

staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.proto

@@ -306,11 +306,11 @@ message LinuxPodSandboxConfig {
 // PodSandbox in its user interface for better user experience. For example,
 // the runtime can construct a unique PodSandboxName based on the metadata.
 message PodSandboxMetadata {
-    // Pod name of the sandbox. Same as the pod name in the PodSpec.
+    // Pod name of the sandbox. Same as the pod name in the Pod ObjectMeta.
     string name = 1;
-    // Pod UID of the sandbox. Same as the pod UID in the PodSpec.
+    // Pod UID of the sandbox. Same as the pod UID in the Pod ObjectMeta.
     string uid = 2;
-    // Pod namespace of the sandbox. Same as the pod namespace in the PodSpec.
+    // Pod namespace of the sandbox. Same as the pod namespace in the Pod ObjectMeta.
     string namespace = 3;
     // Attempt number of creating the sandbox. Default: 0.
     uint32 attempt = 4;