fix gofmt problem in existing code
Signed-off-by: Crazykev <crazykev@zju.edu.cn>
This commit is contained in:
parent
3fa48e54ff
commit
eb3990ead9
3 changed files with 10 additions and 10 deletions
|
@ -25,11 +25,11 @@ func (s *Server) Status(ctx context.Context, req *pb.StatusRequest) (*pb.StatusR
|
||||||
resp := &pb.StatusResponse{
|
resp := &pb.StatusResponse{
|
||||||
Status: &pb.RuntimeStatus{
|
Status: &pb.RuntimeStatus{
|
||||||
Conditions: []*pb.RuntimeCondition{
|
Conditions: []*pb.RuntimeCondition{
|
||||||
&pb.RuntimeCondition{
|
{
|
||||||
Type: &runtimeReadyConditionString,
|
Type: &runtimeReadyConditionString,
|
||||||
Status: &runtimeReady,
|
Status: &runtimeReady,
|
||||||
},
|
},
|
||||||
&pb.RuntimeCondition{
|
{
|
||||||
Type: &networkReadyConditionString,
|
Type: &networkReadyConditionString,
|
||||||
Status: &networkReady,
|
Status: &networkReady,
|
||||||
},
|
},
|
||||||
|
|
|
@ -9,12 +9,12 @@ import (
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/Sirupsen/logrus"
|
"github.com/Sirupsen/logrus"
|
||||||
|
"github.com/containernetworking/cni/pkg/ns"
|
||||||
"github.com/docker/docker/pkg/stringid"
|
"github.com/docker/docker/pkg/stringid"
|
||||||
"github.com/kubernetes-incubator/cri-o/oci"
|
"github.com/kubernetes-incubator/cri-o/oci"
|
||||||
"github.com/containernetworking/cni/pkg/ns"
|
"golang.org/x/sys/unix"
|
||||||
"k8s.io/kubernetes/pkg/fields"
|
"k8s.io/kubernetes/pkg/fields"
|
||||||
pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
|
pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
|
||||||
"golang.org/x/sys/unix"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type sandboxNetNs struct {
|
type sandboxNetNs struct {
|
||||||
|
|
|
@ -273,7 +273,7 @@ func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
|
||||||
if netnsErr := sb.netNsRemove(); netnsErr != nil {
|
if netnsErr := sb.netNsRemove(); netnsErr != nil {
|
||||||
logrus.Warnf("Failed to remove networking namespace: %v", netnsErr)
|
logrus.Warnf("Failed to remove networking namespace: %v", netnsErr)
|
||||||
}
|
}
|
||||||
} ()
|
}()
|
||||||
|
|
||||||
// Pass the created namespace path to the runtime
|
// Pass the created namespace path to the runtime
|
||||||
err = g.AddOrReplaceLinuxNamespace("network", sb.netNsPath())
|
err = g.AddOrReplaceLinuxNamespace("network", sb.netNsPath())
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue