feature: complete the details of StartPodSandbox

[starnop]

Signed-off-by: Starnop [email protected]

Ⅰ. Describe what this PR did

Provide an interface to start a sandbox pod which was stopped by accident and setup the network with network plugin.

Note: Only if the CNI-plugin supports returning the same IP with the same parameters of containdID ,pod name,pod namespace, we will make sure it reacquire the original network configuration of sandbox, like IP address.

Ⅱ. Does this pull request fix one issue?

None.

Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗？)

None.

Ⅳ. Describe how to verify it

use cri-tools

# cat pod-config.json 
{
    "metadata": {
        "name": "nginx-sandbox",
        "namespace": "default",
        "attempt": 1,
        "uid": "hdishd83djaidwnduwk28bcsb"
    },
    "linux": {
    }
}

# cat container-config.json 
{
  "metadata": {
      "name": "busybox"
  },
  "image":{
      "image": "busybox"
  },
  "command": [
      "top"
  ],
  "linux": {
  }
}

# crictl runp pod-config.json 
DEBU[0000] RunPodSandboxRequest: &RunPodSandboxRequest{Config:&PodSandboxConfig{Metadata:&PodSandboxMetadata{Name:nginx-sandbox,Uid:hdishd83djaidwnduwk28bcsb,Namespace:default,Attempt:1,},Hostname:,LogDirectory:,DnsConfig:nil,PortMappings:[],Labels:map[string]string{},Annotations:map[string]string{},Linux:&LinuxPodSandboxConfig{CgroupParent:,SecurityContext:nil,Sysctls:map[string]string{},},},} 
DEBU[0000] RunPodSandboxResponse: &RunPodSandboxResponse{PodSandboxId:7fa3bf8c5cb8e97f1b09369bf182afb6b6f1ebdf74d072a95960942a3f2b9fb6,} 
7fa3bf8c5cb8e97f1b09369bf182afb6b6f1ebdf74d072a95960942a3f2b9fb6

# crictl create 7fa3bf8c5cb8e97f1b09369bf182afb6b6f1ebdf74d072a95960942a3f2b9fb6 container-config.json pod-config.json 
DEBU[0000] CreateContainerRequest: &CreateContainerRequest{PodSandboxId:7fa3bf8c5cb8e97f1b09369bf182afb6b6f1ebdf74d072a95960942a3f2b9fb6,Config:&ContainerConfig{Metadata:&ContainerMetadata{Name:busybox,Attempt:0,},Image:&ImageSpec{Image:busybox,},Command:[top],Args:[],WorkingDir:,Envs:[],Mounts:[],Devices:[],Labels:map[string]string{},Annotations:map[string]string{},LogPath:,Stdin:false,StdinOnce:false,Tty:false,Linux:&LinuxContainerConfig{Resources:nil,SecurityContext:nil,},Windows:nil,NetPriority:0,QuotaId:,},SandboxConfig:&PodSandboxConfig{Metadata:&PodSandboxMetadata{Name:nginx-sandbox,Uid:hdishd83djaidwnduwk28bcsb,Namespace:default,Attempt:1,},Hostname:,LogDirectory:,DnsConfig:nil,PortMappings:[],Labels:map[string]string{},Annotations:map[string]string{},Linux:&LinuxPodSandboxConfig{CgroupParent:,SecurityContext:nil,Sysctls:map[string]string{},},},} 
DEBU[0000] CreateContainerResponse: &CreateContainerResponse{ContainerId:a0bf0780844bb939c14cf43c2f34e42c99eb021fd35645dd1a1aeb6bbbce535f,} 
a0bf0780844bb939c14cf43c2f34e42c99eb021fd35645dd1a1aeb6bbbce535f

# crictl inspectp 7fa3bf8c5cb8e97f1b09369bf182afb6b6f1ebdf74d072a95960942a3f2b9fb6
DEBU[0000] PodSandboxStatusRequest: &PodSandboxStatusRequest{PodSandboxId:7fa3bf8c5cb8e97f1b09369bf182afb6b6f1ebdf74d072a95960942a3f2b9fb6,Verbose:true,} 
DEBU[0000] PodSandboxStatusResponse: &PodSandboxStatusResponse{Status:&PodSandboxStatus{Id:7fa3bf8c5cb8e97f1b09369bf182afb6b6f1ebdf74d072a95960942a3f2b9fb6,Metadata:&PodSandboxMetadata{Name:nginx-sandbox,Uid:hdishd83djaidwnduwk28bcsb,Namespace:default,Attempt:1,},State:SANDBOX_READY,CreatedAt:1536916075102934587,Network:&PodSandboxNetworkStatus{Ip:10.244.1.108,},Linux:&LinuxPodSandboxStatus{Namespaces:&Namespace{Options:&NamespaceOption{Network:POD,Pid:POD,Ipc:POD,},},},Labels:map[string]string{},Annotations:map[string]string{},},Info:map[string]string{},} 
{
  "status": {
    "id": "7fa3bf8c5cb8e97f1b09369bf182afb6b6f1ebdf74d072a95960942a3f2b9fb6",
    "metadata": {
      "attempt": 1,
      "name": "nginx-sandbox",
      "namespace": "default",
      "uid": "hdishd83djaidwnduwk28bcsb"
    },
    "state": "SANDBOX_READY",
    "createdAt": "2018-09-14T09:07:55.102934587Z",
    "network": {
      "ip": "10.244.1.108"
    },
    "linux": {
      "namespaces": {
        "options": {
          "ipc": "POD",
          "network": "POD",
          "pid": "POD"
        }
      }
    },
    "labels": {},
    "annotations": {}
  }
}

# crictl stopp 7fa3bf8c5cb8e97f1b09369bf182afb6b6f1ebdf74d072a95960942a3f2b9fb6
DEBU[0000] StopPodSandboxRequest: &StopPodSandboxRequest{PodSandboxId:7fa3bf8c5cb8e97f1b09369bf182afb6b6f1ebdf74d072a95960942a3f2b9fb6,} 
DEBU[0000] StopPodSandboxResponse: &StopPodSandboxResponse{} 
Stopped sandbox 7fa3bf8c5cb8e97f1b09369bf182afb6b6f1ebdf74d072a95960942a3f2b9fb6

# crictl startp 7fa3bf8c5cb8e97f1b09369bf182afb6b6f1ebdf74d072a95960942a3f2b9fb6
DEBU[0000] StartPodSandboxRequest: &StartPodSandboxRequest{PodSandboxId:7fa3bf8c5cb8e97f1b09369bf182afb6b6f1ebdf74d072a95960942a3f2b9fb6,} 
DEBU[0000] StartPodSandboxResponse: &StartPodSandboxResponse{} 
7fa3bf8c5cb8e97f1b09369bf182afb6b6f1ebdf74d072a95960942a3f2b9fb6

# crictl inspectp 7fa3bf8c5cb8e97f1b09369bf182afb6b6f1ebdf74d072a95960942a3f2b9fb6
DEBU[0000] PodSandboxStatusRequest: &PodSandboxStatusRequest{PodSandboxId:7fa3bf8c5cb8e97f1b09369bf182afb6b6f1ebdf74d072a95960942a3f2b9fb6,Verbose:true,} 
DEBU[0000] PodSandboxStatusResponse: &PodSandboxStatusResponse{Status:&PodSandboxStatus{Id:7fa3bf8c5cb8e97f1b09369bf182afb6b6f1ebdf74d072a95960942a3f2b9fb6,Metadata:&PodSandboxMetadata{Name:nginx-sandbox,Uid:hdishd83djaidwnduwk28bcsb,Namespace:default,Attempt:1,},State:SANDBOX_READY,CreatedAt:1536916075102934587,Network:&PodSandboxNetworkStatus{Ip:10.244.1.109,},Linux:&LinuxPodSandboxStatus{Namespaces:&Namespace{Options:&NamespaceOption{Network:POD,Pid:POD,Ipc:POD,},},},Labels:map[string]string{},Annotations:map[string]string{},},Info:map[string]string{},} 
{
  "status": {
    "id": "7fa3bf8c5cb8e97f1b09369bf182afb6b6f1ebdf74d072a95960942a3f2b9fb6",
    "metadata": {
      "attempt": 1,
      "name": "nginx-sandbox",
      "namespace": "default",
      "uid": "hdishd83djaidwnduwk28bcsb"
    },
    "state": "SANDBOX_READY",
    "createdAt": "2018-09-14T09:07:55.102934587Z",
    "network": {
      "ip": "10.244.1.108"
    },
    "linux": {
      "namespaces": {
        "options": {
          "ipc": "POD",
          "network": "POD",
          "pid": "POD"
        }
      }
    },
    "labels": {},
    "annotations": {}
  }
}

Ⅴ. Special notes for reviews

Related Pull Request: #2237

[allencloud]

How about

if hostNet {
    return netnsPath, nil
}

Use return fast to reduce ident and make code more clear.

[starnop]

exactly, and has been updated. ^_^

[starnop]

@rudyfly @YaoZengzeng PTAL. Thanks. ^_^

[rudyfly]

s/setupNeterr/setupNetErr

[starnop]

Has been updated.

[YaoZengzeng]

If setupNetErr is not nil, the defer function will never being invoked.

[YaoZengzeng]

Podsandbox -> PodSandbox

[YaoZengzeng]

Setup -> setup

[YaoZengzeng]

LGTM

[rudyfly]

LGTM, and waiting for the ci passed.