adf249e283
If PodSandboxStatusRequest.Verbose is true now we are returning the cri-o version in a JSON object for debug purposes. In the future extra information (to be defined) should be added to the response In order to avoid problems when we execute the tests in parallel the fixtures for new test sandbox and container are creating their own random IDs and returning them in case you need to refer to them. Finally, "make testunit" is being run as root to solve a problem with a `chown` that couldn't be performed otherwise. This commit closes #1144 Signed-off-by: Álex González <agonzalezro@gmail.com>
81 lines
2.2 KiB
Go
81 lines
2.2 KiB
Go
package server
|
|
|
|
import (
|
|
"encoding/json"
|
|
"time"
|
|
|
|
"github.com/kubernetes-incubator/cri-o/oci"
|
|
"github.com/kubernetes-incubator/cri-o/version"
|
|
"github.com/sirupsen/logrus"
|
|
"golang.org/x/net/context"
|
|
pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
|
|
)
|
|
|
|
// PodSandboxStatus returns the Status of the PodSandbox.
|
|
func (s *Server) PodSandboxStatus(ctx context.Context, req *pb.PodSandboxStatusRequest) (resp *pb.PodSandboxStatusResponse, err error) {
|
|
const operation = "pod_sandbox_status"
|
|
defer func() {
|
|
recordOperation(operation, time.Now())
|
|
recordError(operation, err)
|
|
}()
|
|
|
|
logrus.Debugf("PodSandboxStatusRequest %+v", req)
|
|
sb, err := s.getPodSandboxFromRequest(req.PodSandboxId)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
podInfraContainer := sb.InfraContainer()
|
|
cState := s.Runtime().ContainerStatus(podInfraContainer)
|
|
|
|
rStatus := pb.PodSandboxState_SANDBOX_NOTREADY
|
|
if cState.Status == oci.ContainerStateRunning {
|
|
rStatus = pb.PodSandboxState_SANDBOX_READY
|
|
}
|
|
|
|
linux := &pb.LinuxPodSandboxStatus{
|
|
Namespaces: &pb.Namespace{
|
|
Options: &pb.NamespaceOption{
|
|
Network: sb.NamespaceOptions().GetNetwork(),
|
|
Ipc: sb.NamespaceOptions().GetIpc(),
|
|
Pid: sb.NamespaceOptions().GetPid(),
|
|
},
|
|
},
|
|
}
|
|
|
|
sandboxID := sb.ID()
|
|
resp = &pb.PodSandboxStatusResponse{
|
|
Status: &pb.PodSandboxStatus{
|
|
Id: sandboxID,
|
|
CreatedAt: podInfraContainer.CreatedAt().UnixNano(),
|
|
Network: &pb.PodSandboxNetworkStatus{Ip: sb.IP()},
|
|
State: rStatus,
|
|
Labels: sb.Labels(),
|
|
Annotations: sb.Annotations(),
|
|
Metadata: sb.Metadata(),
|
|
Linux: linux,
|
|
},
|
|
}
|
|
|
|
if req.Verbose {
|
|
resp = amendVerboseInfo(resp)
|
|
}
|
|
|
|
logrus.Debugf("PodSandboxStatusResponse: %+v", resp)
|
|
return resp, nil
|
|
}
|
|
|
|
// VersionPayload is a helper struct to create the JSON payload to show the version
|
|
type VersionPayload struct {
|
|
Version string `json:"version"`
|
|
}
|
|
|
|
func amendVerboseInfo(resp *pb.PodSandboxStatusResponse) *pb.PodSandboxStatusResponse {
|
|
resp.Info = make(map[string]string)
|
|
bs, err := json.Marshal(VersionPayload{Version: version.Version})
|
|
if err != nil {
|
|
return resp // Just ignore the error and don't marshal the info
|
|
}
|
|
resp.Info["version"] = string(bs)
|
|
return resp
|
|
}
|