Skip to content

Commit

Permalink
Update import statements and (most) instances of nfs-provisioner->ext…
Browse files Browse the repository at this point in the history
…ernal-storage
  • Loading branch information
wongma7 committed Feb 21, 2017
1 parent 06fb010 commit 2517d1f
Show file tree
Hide file tree
Showing 13 changed files with 19 additions and 303 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ External provisioners work just like in-tree dynamic PV provisioners. A `Storage
### How to use the library
```go
import (
"github.com/kubernetes-incubator/nfs-provisioner/lib/controller"
"github.com/kubernetes-incubator/external-storage/lib/controller"
)
```
You need to implement the `Provisioner` interface then pass your implementation to a `ProvisionController` and run the controller. The controller takes care of deciding when to call your implementation's `Provision` or `Delete`. The interface and controller are defined in the above package.
Expand Down
4 changes: 2 additions & 2 deletions lib/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"time"

"github.com/golang/glog"
"github.com/kubernetes-incubator/nfs-provisioner/lib/leaderelection"
rl "github.com/kubernetes-incubator/nfs-provisioner/lib/leaderelection/resourcelock"
"github.com/kubernetes-incubator/external-storage/lib/leaderelection"
rl "github.com/kubernetes-incubator/external-storage/lib/leaderelection/resourcelock"
"k8s.io/client-go/kubernetes"
core_v1 "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/pkg/api"
Expand Down
4 changes: 2 additions & 2 deletions lib/controller/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"testing"
"time"

"github.com/kubernetes-incubator/nfs-provisioner/lib/leaderelection"
rl "github.com/kubernetes-incubator/nfs-provisioner/lib/leaderelection/resourcelock"
"github.com/kubernetes-incubator/external-storage/lib/leaderelection"
rl "github.com/kubernetes-incubator/external-storage/lib/leaderelection/resourcelock"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/fake"
fakev1core "k8s.io/client-go/kubernetes/typed/core/v1/fake"
Expand Down
284 changes: 0 additions & 284 deletions lib/glide.lock

This file was deleted.

2 changes: 1 addition & 1 deletion lib/glide.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package: github.com/kubernetes-incubator/nfs-provisioner/lib
package: github.com/kubernetes-incubator/external-storage/lib
import:
- package: github.com/golang/glog
- package: k8s.io/client-go
Expand Down
2 changes: 1 addition & 1 deletion lib/leaderelection/leaderelection.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"reflect"
"time"

rl "github.com/kubernetes-incubator/nfs-provisioner/lib/leaderelection/resourcelock"
rl "github.com/kubernetes-incubator/external-storage/lib/leaderelection/resourcelock"
"k8s.io/client-go/pkg/api/errors"
"k8s.io/client-go/pkg/api/unversioned"
"k8s.io/client-go/pkg/util/runtime"
Expand Down
8 changes: 4 additions & 4 deletions nfs/cmd/nfs-provisioner/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"time"

"github.com/golang/glog"
"github.com/kubernetes-incubator/nfs-provisioner/lib/controller"
"github.com/kubernetes-incubator/nfs-provisioner/lib/leaderelection"
"github.com/kubernetes-incubator/nfs-provisioner/nfs/pkg/server"
vol "github.com/kubernetes-incubator/nfs-provisioner/nfs/pkg/volume"
"github.com/kubernetes-incubator/external-storage/lib/controller"
"github.com/kubernetes-incubator/external-storage/lib/leaderelection"
"github.com/kubernetes-incubator/external-storage/nfs/pkg/server"
vol "github.com/kubernetes-incubator/external-storage/nfs/pkg/volume"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/pkg/util/validation"
"k8s.io/client-go/pkg/util/validation/field"
Expand Down
2 changes: 1 addition & 1 deletion nfs/pkg/volume/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"path"
"strconv"

"github.com/kubernetes-incubator/nfs-provisioner/lib/controller"
"github.com/kubernetes-incubator/external-storage/lib/controller"
"k8s.io/client-go/pkg/api/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion nfs/pkg/volume/provision.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"syscall"

"github.com/golang/glog"
"github.com/kubernetes-incubator/nfs-provisioner/lib/controller"
"github.com/kubernetes-incubator/external-storage/lib/controller"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/pkg/api/resource"
"k8s.io/client-go/pkg/api/v1"
Expand Down
2 changes: 1 addition & 1 deletion nfs/pkg/volume/provision_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"syscall"
"testing"

"github.com/kubernetes-incubator/nfs-provisioner/lib/controller"
"github.com/kubernetes-incubator/external-storage/lib/controller"
"k8s.io/client-go/kubernetes/fake"
"k8s.io/client-go/pkg/api/resource"
"k8s.io/client-go/pkg/api/unversioned"
Expand Down
2 changes: 1 addition & 1 deletion nfs/test/e2e/e2e_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package e2e

import (
"github.com/kubernetes-incubator/nfs-provisioner/nfs/test/e2e/framework"
"github.com/kubernetes-incubator/external-storage/nfs/test/e2e/framework"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
Loading

0 comments on commit 2517d1f

Please sign in to comment.