Add extra info to verbose requests to PodSandboxStatus
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>
This commit is contained in:
parent
01b118116d
commit
adf249e283
5 changed files with 149 additions and 9 deletions
|
@ -1,9 +1,11 @@
|
|||
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"
|
||||
|
@ -55,6 +57,25 @@ func (s *Server) PodSandboxStatus(ctx context.Context, req *pb.PodSandboxStatusR
|
|||
},
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue