From 4606f2a61a86cfbfad2b2f8d20c7ecb3cf53516a Mon Sep 17 00:00:00 2001 From: Mrunal Patel Date: Mon, 26 Sep 2016 16:55:12 -0700 Subject: [PATCH] Fix the build for ocid to cri-o rename Signed-off-by: Mrunal Patel --- .gitignore | 2 +- Dockerfile | 4 ++-- Makefile | 10 +++++----- cmd/server/main.go | 2 +- hack/.vendor-helpers.sh | 2 +- oci/oci.go | 2 +- server/container.go | 4 ++-- server/image.go | 2 +- server/sandbox.go | 4 ++-- server/server.go | 4 ++-- server/utils.go | 2 +- test/helpers.bash | 6 +++--- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 794b2f63..ca1ab806 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ /ocic conmon/conmon conmon/conmon.o -vendor/src/github.com/kubernetes-incubator/ocid +vendor/src/github.com/kubernetes-incubator/cri-o diff --git a/Dockerfile b/Dockerfile index dd0bf27b..a27ea2e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,6 +46,6 @@ RUN set -x \ && cp runc /usr/local/bin/runc \ && rm -rf "$GOPATH" -WORKDIR /go/src/github.com/kubernetes-incubator/ocid +WORKDIR /go/src/github.com/kubernetes-incubator/cri-o -ADD . /go/src/github.com/kubernetes-incubator/ocid +ADD . /go/src/github.com/kubernetes-incubator/cri-o diff --git a/Makefile b/Makefile index e8395be7..4aa52226 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ EPOCH_TEST_COMMIT ?= 7fc874e05e74faa81e7c423b6514fc5c474c6b34 -PROJECT := github.com/kubernetes-incubator/ocid +PROJECT := github.com/kubernetes-incubator/cri-o GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null) GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g") OCID_IMAGE := ocid_dev$(if $(GIT_BRANCH_CLEAN),:$(GIT_BRANCH_CLEAN)) -OCID_LINK := ${CURDIR}/vendor/src/github.com/kubernetes-incubator/ocid +OCID_LINK := ${CURDIR}/vendor/src/github.com/kubernetes-incubator/cri-o OCID_LINK_DIR := ${CURDIR}/vendor/src/github.com/kubernetes-incubator OCID_INSTANCE := ocid_dev SYSTEM_GOPATH := ${GOPATH} @@ -46,9 +46,9 @@ ocidimage: dbuild: ocidimage docker run --name=${OCID_INSTANCE} --privileged ${OCID_IMAGE} make binaries - docker cp ${OCID_INSTANCE}:/go/src/github.com/kubernetes-incubator/ocid/ocid . - docker cp ${OCID_INSTANCE}:/go/src/github.com/kubernetes-incubator/ocid/ocic . - docker cp ${OCID_INSTANCE}:/go/src/github.com/kubernetes-incubator/ocid/conmon/conmon ./conmon/conmon + docker cp ${OCID_INSTANCE}:/go/src/github.com/kubernetes-incubator/cri-o/ocid . + docker cp ${OCID_INSTANCE}:/go/src/github.com/kubernetes-incubator/cri-o/ocic . + docker cp ${OCID_INSTANCE}:/go/src/github.com/kubernetes-incubator/cri-o/conmon/conmon ./conmon/conmon docker rm ${OCID_INSTANCE} integration: ocidimage diff --git a/cmd/server/main.go b/cmd/server/main.go index be9a9ea2..1c4f23e9 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -7,7 +7,7 @@ import ( "path/filepath" "github.com/Sirupsen/logrus" - "github.com/kubernetes-incubator/ocid/server" + "github.com/kubernetes-incubator/cri-o/server" "github.com/urfave/cli" "google.golang.org/grpc" "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" diff --git a/hack/.vendor-helpers.sh b/hack/.vendor-helpers.sh index 9bc012dc..44ca62d2 100644 --- a/hack/.vendor-helpers.sh +++ b/hack/.vendor-helpers.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -PROJECT=github.com/kubernetes-incubator/ocid +PROJECT=github.com/kubernetes-incubator/cri-o # Downloads dependencies into vendor/ directory mkdir -p vendor diff --git a/oci/oci.go b/oci/oci.go index 27400843..2b65ca30 100644 --- a/oci/oci.go +++ b/oci/oci.go @@ -15,7 +15,7 @@ import ( "time" "github.com/Sirupsen/logrus" - "github.com/kubernetes-incubator/ocid/utils" + "github.com/kubernetes-incubator/cri-o/utils" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/server/container.go b/server/container.go index 0a39a2fa..13996e87 100644 --- a/server/container.go +++ b/server/container.go @@ -7,8 +7,8 @@ import ( "path/filepath" "github.com/Sirupsen/logrus" - "github.com/kubernetes-incubator/ocid/oci" - "github.com/kubernetes-incubator/ocid/utils" + "github.com/kubernetes-incubator/cri-o/oci" + "github.com/kubernetes-incubator/cri-o/utils" "github.com/opencontainers/runtime-tools/generate" "golang.org/x/net/context" pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" diff --git a/server/image.go b/server/image.go index 014c35d7..c95060a8 100644 --- a/server/image.go +++ b/server/image.go @@ -9,8 +9,8 @@ import ( "github.com/containers/image/directory" "github.com/containers/image/image" "github.com/containers/image/transports" - pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" "golang.org/x/net/context" + pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" ) // ListImages lists existing images. diff --git a/server/sandbox.go b/server/sandbox.go index 42dbdb46..aee7b570 100644 --- a/server/sandbox.go +++ b/server/sandbox.go @@ -8,8 +8,8 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/stringid" - "github.com/kubernetes-incubator/ocid/oci" - "github.com/kubernetes-incubator/ocid/utils" + "github.com/kubernetes-incubator/cri-o/oci" + "github.com/kubernetes-incubator/cri-o/utils" "github.com/opencontainers/runtime-tools/generate" "golang.org/x/net/context" pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" diff --git a/server/server.go b/server/server.go index 5991646a..f4c1a0c4 100644 --- a/server/server.go +++ b/server/server.go @@ -11,8 +11,8 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/registrar" "github.com/docker/docker/pkg/truncindex" - "github.com/kubernetes-incubator/ocid/oci" - "github.com/kubernetes-incubator/ocid/utils" + "github.com/kubernetes-incubator/cri-o/oci" + "github.com/kubernetes-incubator/cri-o/utils" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/rajatchopra/ocicni" ) diff --git a/server/utils.go b/server/utils.go index e7413fcf..a19a6f7e 100644 --- a/server/utils.go +++ b/server/utils.go @@ -9,7 +9,7 @@ import ( "runtime" "strings" - "github.com/kubernetes-incubator/ocid/utils" + "github.com/kubernetes-incubator/cri-o/utils" ) const ( diff --git a/test/helpers.bash b/test/helpers.bash index 565c1da9..b4f44d28 100644 --- a/test/helpers.bash +++ b/test/helpers.bash @@ -10,11 +10,11 @@ TESTDATA="${INTEGRATION_ROOT}/../testdata" OCID_ROOT=${OCID_ROOT:-$(cd "$INTEGRATION_ROOT/../.."; pwd -P)} # Path of the ocid binary. -OCID_BINARY=${OCID_BINARY:-${OCID_ROOT}/ocid/ocid} +OCID_BINARY=${OCID_BINARY:-${OCID_ROOT}/cri-o/ocid} # Path of the ocic binary. -OCIC_BINARY=${OCIC_BINARY:-${OCID_ROOT}/ocid/ocic} +OCIC_BINARY=${OCIC_BINARY:-${OCID_ROOT}/cri-o/ocic} # Path of the conmon binary. -CONMON_BINARY=${CONMON_BINARY:-${OCID_ROOT}/ocid/conmon/conmon} +CONMON_BINARY=${CONMON_BINARY:-${OCID_ROOT}/cri-o/conmon/conmon} # Path of the runc binary. RUNC_PATH=$(command -v runc || true) RUNC_BINARY=${RUNC_PATH:-/usr/local/sbin/runc}