github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 10:20:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #90209 from ZP-AlwaysWin/dev

Browse Source 
Repair description
This commit is contained in:
Kubernetes Prow Robot 2020-04-23 03:57:59 -07:00 committed by GitHub
commit 3e2ae631b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/dockershim/docker_checkpoint.go
View File

@ -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"`

2
pkg/kubelet/kuberuntime/kuberuntime_manager.go
View File

@ -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)

6
staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.pb.go
View File

@ -886,11 +886,11 @@ func (m *LinuxPodSandboxConfig) GetSysctls() map[string]string {
// PodSandbox in its user interface for better user experience. For example,
// the runtime can construct a unique PodSandboxName based on the metadata.
type PodSandboxMetadata struct {
// 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 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
// 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.
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid,omitempty"`
// 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 `protobuf:"bytes,3,opt,name=namespace,proto3" json:"namespace,omitempty"`
// Attempt number of creating the sandbox. Default: 0.
Attempt uint32 `protobuf:"varint,4,opt,name=attempt,proto3" json:"attempt,omitempty"`

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

@ -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;