From e035ac6c178a66f01c781024ca4927c8f047287d Mon Sep 17 00:00:00 2001 From: David Zhu Date: Mon, 25 Jun 2018 14:32:14 -0700 Subject: [PATCH] Changed github.com/kubernetes-sigs to sigs.k8s.io --- Dockerfile | 4 ++-- Makefile | 2 +- cmd/main.go | 6 +++--- deploy/kubernetes/delete-driver.sh | 2 +- deploy/kubernetes/deploy-driver.sh | 2 +- pkg/gce-cloud-provider/fake-gce.go | 2 +- pkg/gce-cloud-provider/gce-compute.go | 2 +- pkg/gce-csi-driver/controller.go | 4 ++-- pkg/gce-csi-driver/controller_test.go | 4 ++-- pkg/gce-csi-driver/gce-driver.go | 4 ++-- pkg/gce-csi-driver/node.go | 4 ++-- test/e2e/gce_pd_e2e_test.go | 6 +++--- test/remote/remote/e2e.go | 6 +++--- test/remote/run_remote/run_remote.go | 2 +- test/run-tests.sh | 2 +- test/sanity/sanity_test.go | 6 +++--- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1f020acbf..22497421e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,11 +13,11 @@ # limitations under the License. FROM golang:1.10.1-alpine3.7 as builder -WORKDIR /go/src/github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver +WORKDIR /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver ADD . . RUN CGO_ENABLED=0 go build -a -ldflags '-extldflags "-static"' -o bin/gce-pd-csi-driver ./cmd/ FROM alpine:3.7 -COPY --from=builder /go/src/github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/bin/gce-pd-csi-driver /gce-pd-csi-driver +COPY --from=builder /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/bin/gce-pd-csi-driver /gce-pd-csi-driver ENTRYPOINT ["/gce-pd-csi-driver"] \ No newline at end of file diff --git a/Makefile b/Makefile index 396f45aba..87e258ac8 100644 --- a/Makefile +++ b/Makefile @@ -36,4 +36,4 @@ prod-push-container: prod-build-container gcloud docker -- push $(PRODIMAGE):$(PRODVERSION) test-sanity: gce-pd-driver - go test -timeout 30s github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pkg/test -run ^TestSanity$ \ No newline at end of file + go test -timeout 30s sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/test -run ^TestSanity$ \ No newline at end of file diff --git a/cmd/main.go b/cmd/main.go index 859590a66..5f959cf89 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -20,9 +20,9 @@ import ( "github.com/golang/glog" - gce "github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider" - driver "github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pkg/gce-csi-driver" - mountmanager "github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager" + gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider" + driver "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-csi-driver" + mountmanager "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager" ) func init() { diff --git a/deploy/kubernetes/delete-driver.sh b/deploy/kubernetes/delete-driver.sh index ce5ddeb13..3a2028449 100755 --- a/deploy/kubernetes/delete-driver.sh +++ b/deploy/kubernetes/delete-driver.sh @@ -3,7 +3,7 @@ set -o nounset set -o errexit -readonly PKGDIR="${GOPATH}/src/github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver" +readonly PKGDIR="${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver" readonly KUBEDEPLOY="${PKGDIR}/deploy/kubernetes" kubectl delete -f "${KUBEDEPLOY}/node.yaml" --ignore-not-found diff --git a/deploy/kubernetes/deploy-driver.sh b/deploy/kubernetes/deploy-driver.sh index 10ff7880b..e928f04fa 100755 --- a/deploy/kubernetes/deploy-driver.sh +++ b/deploy/kubernetes/deploy-driver.sh @@ -3,7 +3,7 @@ set -o nounset set -o errexit -readonly PKGDIR="${GOPATH}/src/github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver" +readonly PKGDIR="${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver" readonly KUBEDEPLOY="${PKGDIR}/deploy/kubernetes" if ! kubectl get secret cloud-sa; diff --git a/pkg/gce-cloud-provider/fake-gce.go b/pkg/gce-cloud-provider/fake-gce.go index 5c8d23799..00c00471c 100644 --- a/pkg/gce-cloud-provider/fake-gce.go +++ b/pkg/gce-cloud-provider/fake-gce.go @@ -19,11 +19,11 @@ import ( "strings" "github.com/golang/glog" - "github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pkg/utils" "golang.org/x/net/context" compute "google.golang.org/api/compute/v1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/utils" ) type FakeCloudProvider struct { diff --git a/pkg/gce-cloud-provider/gce-compute.go b/pkg/gce-cloud-provider/gce-compute.go index 48fb2e4b0..19b442139 100644 --- a/pkg/gce-cloud-provider/gce-compute.go +++ b/pkg/gce-cloud-provider/gce-compute.go @@ -20,12 +20,12 @@ import ( "time" "github.com/golang/glog" - "github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pkg/utils" "golang.org/x/net/context" compute "google.golang.org/api/compute/v1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "k8s.io/apimachinery/pkg/util/wait" + "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/utils" ) type GCECompute interface { diff --git a/pkg/gce-csi-driver/controller.go b/pkg/gce-csi-driver/controller.go index fa9b1ddf2..372e406f3 100644 --- a/pkg/gce-csi-driver/controller.go +++ b/pkg/gce-csi-driver/controller.go @@ -20,12 +20,12 @@ import ( csi "github.com/container-storage-interface/spec/lib/go/csi/v0" "github.com/golang/glog" - gce "github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider" - utils "github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pkg/utils" "golang.org/x/net/context" compute "google.golang.org/api/compute/v1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider" + utils "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/utils" ) // TODO: Add noisy glog.V(5).Infof() EVERYWHERE diff --git a/pkg/gce-csi-driver/controller_test.go b/pkg/gce-csi-driver/controller_test.go index f0f05dc34..8e423c7ea 100644 --- a/pkg/gce-csi-driver/controller_test.go +++ b/pkg/gce-csi-driver/controller_test.go @@ -22,8 +22,8 @@ import ( "google.golang.org/grpc/status" csi "github.com/container-storage-interface/spec/lib/go/csi/v0" - gce "github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider" - utils "github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pkg/utils" + gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider" + utils "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/utils" ) const ( diff --git a/pkg/gce-csi-driver/gce-driver.go b/pkg/gce-csi-driver/gce-driver.go index fbe241789..8fbdf4b52 100644 --- a/pkg/gce-csi-driver/gce-driver.go +++ b/pkg/gce-csi-driver/gce-driver.go @@ -19,10 +19,10 @@ import ( csi "github.com/container-storage-interface/spec/lib/go/csi/v0" "github.com/golang/glog" - gce "github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider" - mountmanager "github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider" + mountmanager "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager" ) type GCEDriver struct { diff --git a/pkg/gce-csi-driver/node.go b/pkg/gce-csi-driver/node.go index bf2cbf390..5783d2980 100644 --- a/pkg/gce-csi-driver/node.go +++ b/pkg/gce-csi-driver/node.go @@ -21,11 +21,11 @@ import ( csi "github.com/container-storage-interface/spec/lib/go/csi/v0" "github.com/golang/glog" - mountmanager "github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager" - utils "github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pkg/utils" "golang.org/x/net/context" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + mountmanager "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager" + utils "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/utils" ) type GCENodeServer struct { diff --git a/test/e2e/gce_pd_e2e_test.go b/test/e2e/gce_pd_e2e_test.go index 902097ee0..507bff473 100644 --- a/test/e2e/gce_pd_e2e_test.go +++ b/test/e2e/gce_pd_e2e_test.go @@ -24,15 +24,15 @@ import ( "testing" "time" - "github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "k8s.io/apimachinery/pkg/util/uuid" + "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager" csipb "github.com/container-storage-interface/spec/lib/go/csi/v0" - gce "github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider" - driver "github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pkg/gce-csi-driver" + gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider" + driver "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-csi-driver" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/remote/remote/e2e.go b/test/remote/remote/e2e.go index 005df99b0..1479beef1 100644 --- a/test/remote/remote/e2e.go +++ b/test/remote/remote/e2e.go @@ -48,16 +48,16 @@ func (n *E2ERemote) SetupTestPackage(tardir string) error { err := cmd.Run() if err != nil { - return err + return fmt.Errorf("Failed to ginkgo build test: %v", err) } cmd = exec.Command("cp", "test/e2e/e2e.test", "bin") err = cmd.Run() if err != nil { - return err + return fmt.Errorf("Failed to copy: %v", err) } - buildOutputDir := filepath.Join(gopath, "src/github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/bin") + buildOutputDir := filepath.Join(gopath, "src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/bin") // Copy binaries requiredBins := []string{"e2e.test"} diff --git a/test/remote/run_remote/run_remote.go b/test/remote/run_remote/run_remote.go index b6a474920..2da9782a3 100644 --- a/test/remote/run_remote/run_remote.go +++ b/test/remote/run_remote/run_remote.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/test/remote/remote" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/wait" + "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/test/remote/remote" "github.com/golang/glog" "golang.org/x/oauth2/google" diff --git a/test/run-tests.sh b/test/run-tests.sh index c9968b0b7..5610171f5 100755 --- a/test/run-tests.sh +++ b/test/run-tests.sh @@ -3,7 +3,7 @@ set -e set -x -readonly PKGDIR=github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver +readonly PKGDIR=sigs.k8s.io/gcp-compute-persistent-disk-csi-driver echo "Testing CSI-Sanity" go test -timeout 30s "${PKGDIR}/test/sanity/" -run ^TestSanity$ diff --git a/test/sanity/sanity_test.go b/test/sanity/sanity_test.go index cbbe569b5..e53a424d7 100644 --- a/test/sanity/sanity_test.go +++ b/test/sanity/sanity_test.go @@ -17,12 +17,12 @@ package sanitytest import ( "testing" - "github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager" + "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager" sanity "github.com/kubernetes-csi/csi-test/pkg/sanity" - gce "github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider" - driver "github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pkg/gce-csi-driver" compute "google.golang.org/api/compute/v1" + gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider" + driver "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-csi-driver" ) func TestSanity(t *testing.T) {