Merge pull request #17841 from bparees/crio

remove dependency on crio constant for socket path

Author: smarterclayton

pkg/build/builder/util_linux.go

@@ -8,7 +8,6 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/google/cadvisor/container/crio"
 	crioclient "github.com/kubernetes-incubator/cri-o/client"
 	"github.com/kubernetes-incubator/cri-o/pkg/annotations"
 	"github.com/opencontainers/runc/libcontainer/cgroups"
@@ -32,7 +31,7 @@ func getContainerNetworkConfig() (string, string, error) {
 			return s2iapi.DockerNetworkModeContainerPrefix + id, "", nil
 		}
 
-		crioClient, err := crioclient.New(crio.CrioSocket)
+		crioClient, err := crioclient.New("/var/run/crio/crio.sock")
 		if err != nil {
 			return "", "", err
 		}

pkg/build/controller/strategy/docker_test.go

@@ -5,8 +5,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/google/cadvisor/container/crio"
-
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -73,7 +71,7 @@ func TestDockerCreateBuildPod(t *testing.T) {
 	if *actual.Spec.ActiveDeadlineSeconds != 60 {
 		t.Errorf("Expected ActiveDeadlineSeconds 60, got %d", *actual.Spec.ActiveDeadlineSeconds)
 	}
-	for i, expected := range []string{buildutil.BuildWorkDirMount, dockerSocketPath, crio.CrioSocket, DockerPushSecretMountPath, DockerPullSecretMountPath} {
+	for i, expected := range []string{buildutil.BuildWorkDirMount, dockerSocketPath, "/var/run/crio/crio.sock", DockerPushSecretMountPath, DockerPullSecretMountPath} {
 		if container.VolumeMounts[i].MountPath != expected {
 			t.Fatalf("Expected %s in VolumeMount[%d], got %s", expected, i, container.VolumeMounts[i].MountPath)
 		}

pkg/build/controller/strategy/sti_test.go

@@ -5,8 +5,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/google/cadvisor/container/crio"
-
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -109,7 +107,7 @@ func testSTICreateBuildPod(t *testing.T, rootAllowed bool) {
 	if len(container.VolumeMounts) != 5 {
 		t.Fatalf("Expected 5 volumes in container, got %d", len(container.VolumeMounts))
 	}
-	for i, expected := range []string{buildutil.BuildWorkDirMount, dockerSocketPath, crio.CrioSocket, DockerPushSecretMountPath, DockerPullSecretMountPath} {
+	for i, expected := range []string{buildutil.BuildWorkDirMount, dockerSocketPath, "/var/run/crio/crio.sock", DockerPushSecretMountPath, DockerPullSecretMountPath} {
 		if container.VolumeMounts[i].MountPath != expected {
 			t.Fatalf("Expected %s in VolumeMount[%d], got %s", expected, i, container.VolumeMounts[i].MountPath)
 		}

pkg/build/controller/strategy/util.go

@@ -8,8 +8,6 @@ import (
 
 	"github.com/golang/glog"
 
-	"github.com/google/cadvisor/container/crio"
-
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kvalidation "k8s.io/apimachinery/pkg/util/validation"
@@ -99,14 +97,14 @@ func setupCrioSocket(pod *v1.Pod) {
 		Name: "crio-socket",
 		VolumeSource: v1.VolumeSource{
 			HostPath: &v1.HostPathVolumeSource{
-				Path: crio.CrioSocket,
+				Path: "/var/run/crio/crio.sock",
 			},
 		},
 	}
 
 	crioSocketVolumeMount := v1.VolumeMount{
 		Name:      "crio-socket",
-		MountPath: crio.CrioSocket,
+		MountPath: "/var/run/crio/crio.sock",
 	}
 
 	pod.Spec.Volumes = append(pod.Spec.Volumes,