Merge pull request #1870 from runcom/badges-and-revert

Badges and revert

.travis.yml

@@ -41,19 +41,19 @@ jobs:
         - make lint
       go: "1.11.x"
     - script:
-        - sudo "PATH=$PATH" make testunit
+        - make testunit
         - make
       go: "1.10.x"
     - script:
-        - sudo "PATH=$PATH" make testunit
+        - make testunit
         - make
       go: "1.11.x"
     - script:
         - make local-cross
       go: "1.11.x"
       env: CROSS_PLATFORM=true
     - script:
-        - sudo "PATH=$PATH" make testunit
+        - make testunit
         - make
       go: tip
     - script:

README.md

@@ -1,8 +1,10 @@
 ![CRI-O logo](https://cdn.rawgit.com/kubernetes-sigs/cri-o/master/logo/crio-logo.svg)
 # CRI-O - OCI-based implementation of Kubernetes Container Runtime Interface
 
+[![GoDoc](https://godoc.org/github.com/kubernetes-sigs/cri-o?status.svg)](https://godoc.org/github.com/kubernetes-sigs/cri-o)
 [![Build Status](https://img.shields.io/travis/kubernetes-sigs/cri-o.svg?maxAge=2592000&style=flat-square)](https://travis-ci.org/kubernetes-sigs/cri-o)
 [![Go Report Card](https://goreportcard.com/badge/github.com/kubernetes-sigs/cri-o?style=flat-square)](https://goreportcard.com/report/github.com/kubernetes-sigs/cri-o)
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/2298/badge)](https://bestpractices.coreinfrastructure.org/projects/2298)
 
 ### Status: Stable
 

server/config_test.go

@@ -10,6 +10,12 @@ import (
 
 const fixturePath = "fixtures/crio.conf"
 
+func must(t *testing.T, err error) {
+	if err != nil {
+		t.Error(err)
+	}
+}
+
 func assertAllFieldsEquality(t *testing.T, c Config) {
 	testCases := []struct {
 		fieldValue, expected interface{}

server/sandbox_status.go

@@ -4,7 +4,6 @@ import (
 	"time"
 
 	"github.com/kubernetes-sigs/cri-o/oci"
-	"github.com/kubernetes-sigs/cri-o/version"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
 	pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
@@ -56,12 +55,6 @@ func (s *Server) PodSandboxStatus(ctx context.Context, req *pb.PodSandboxStatusR
 		},
 	}
 
-	if req.Verbose {
-		resp.Info = map[string]string{
-			"version": version.Version,
-		}
-	}
-
 	logrus.Debugf("PodSandboxStatusResponse: %+v", resp)
 	return resp, nil
 }

server/utils_test.go

@@ -15,12 +15,6 @@ const (
 	dnsPath        = "fixtures/resolv.conf"
 )
 
-func must(t *testing.T, err error) {
-	if err != nil {
-		t.Error(err)
-	}
-}
-
 func TestParseDNSOptions(t *testing.T) {
 	testCases := []struct {
 		Servers, Searches, Options []string