From f828e7768687f8c15580eeb43071f4e5ef84cd86 Mon Sep 17 00:00:00 2001 From: Eric Forgette Date: Wed, 16 May 2018 18:34:15 -0400 Subject: [PATCH 1/6] reorg repo using git mv --- {src/nimblestorage/cmd => cmd}/dory/dory.go | 0 {src/nimblestorage/cmd => cmd}/dory/dory.json | 0 {src/nimblestorage/cmd => cmd}/dory/dory_test.go | 0 {src/nimblestorage/cmd => cmd}/dory/test/broken.json | 0 {src/nimblestorage/cmd => cmd}/dory/test/errors.json | 0 {src/nimblestorage/cmd => cmd}/dory/test/flipped.json | 0 {src/nimblestorage/cmd => cmd}/dory/test/good.json | 0 {src/nimblestorage/cmd => cmd}/doryd/Dockerfile | 0 {src/nimblestorage/cmd => cmd}/doryd/doryd.go | 0 {src/nimblestorage/pkg => common}/chain/chain.go | 0 {src/nimblestorage/pkg => common}/chain/chain_test.go | 0 {src/nimblestorage/pkg => common}/connectivity/client.go | 0 {src/nimblestorage/pkg => common}/connectivity/client_test.go | 0 {src/nimblestorage/pkg => common}/docker/dockerlt/dockerlt.go | 0 {src/nimblestorage/pkg => common}/docker/dockerlt/plugin.go | 0 {src/nimblestorage/pkg => common}/docker/dockervol/dockervol.go | 0 {src/nimblestorage/pkg => common}/jconfig/broken.json | 0 {src/nimblestorage/pkg => common}/jconfig/jconfig.go | 0 {src/nimblestorage/pkg => common}/jconfig/jconfig_test.go | 0 {src/nimblestorage/pkg => common}/jconfig/test.json | 0 {src/nimblestorage/pkg => common}/k8s/flexvol/flexvol.go | 0 {src/nimblestorage/pkg => common}/k8s/flexvol/handler.go | 0 {src/nimblestorage/pkg => common}/k8s/flexvol/handler_test.go | 0 {src/nimblestorage/pkg => common}/k8s/provisioner/claim.go | 0 {src/nimblestorage/pkg => common}/k8s/provisioner/class.go | 0 {src/nimblestorage/pkg => common}/k8s/provisioner/monitor.go | 0 {src/nimblestorage/pkg => common}/k8s/provisioner/provisioner.go | 0 .../pkg => common}/k8s/provisioner/provisioner_test.go | 0 {src/nimblestorage/pkg => common}/k8s/provisioner/volume.go | 0 {src/nimblestorage/pkg => common}/linux/bmount.go | 0 {src/nimblestorage/pkg => common}/linux/bmount_test.go | 0 {src/nimblestorage/pkg => common}/linux/selinux.go | 0 {src/nimblestorage/pkg => common}/util/cmd.go | 0 {src/nimblestorage/pkg => common}/util/cmd_test.go | 0 {src/nimblestorage/pkg => common}/util/file.go | 0 {src/nimblestorage/pkg => common}/util/logger.go | 0 {src/nimblestorage/pkg => common}/util/logger_test.go | 0 37 files changed, 0 insertions(+), 0 deletions(-) rename {src/nimblestorage/cmd => cmd}/dory/dory.go (100%) rename {src/nimblestorage/cmd => cmd}/dory/dory.json (100%) rename {src/nimblestorage/cmd => cmd}/dory/dory_test.go (100%) rename {src/nimblestorage/cmd => cmd}/dory/test/broken.json (100%) rename {src/nimblestorage/cmd => cmd}/dory/test/errors.json (100%) rename {src/nimblestorage/cmd => cmd}/dory/test/flipped.json (100%) rename {src/nimblestorage/cmd => cmd}/dory/test/good.json (100%) rename {src/nimblestorage/cmd => cmd}/doryd/Dockerfile (100%) rename {src/nimblestorage/cmd => cmd}/doryd/doryd.go (100%) rename {src/nimblestorage/pkg => common}/chain/chain.go (100%) rename {src/nimblestorage/pkg => common}/chain/chain_test.go (100%) rename {src/nimblestorage/pkg => common}/connectivity/client.go (100%) rename {src/nimblestorage/pkg => common}/connectivity/client_test.go (100%) rename {src/nimblestorage/pkg => common}/docker/dockerlt/dockerlt.go (100%) rename {src/nimblestorage/pkg => common}/docker/dockerlt/plugin.go (100%) rename {src/nimblestorage/pkg => common}/docker/dockervol/dockervol.go (100%) rename {src/nimblestorage/pkg => common}/jconfig/broken.json (100%) rename {src/nimblestorage/pkg => common}/jconfig/jconfig.go (100%) rename {src/nimblestorage/pkg => common}/jconfig/jconfig_test.go (100%) rename {src/nimblestorage/pkg => common}/jconfig/test.json (100%) rename {src/nimblestorage/pkg => common}/k8s/flexvol/flexvol.go (100%) rename {src/nimblestorage/pkg => common}/k8s/flexvol/handler.go (100%) rename {src/nimblestorage/pkg => common}/k8s/flexvol/handler_test.go (100%) rename {src/nimblestorage/pkg => common}/k8s/provisioner/claim.go (100%) rename {src/nimblestorage/pkg => common}/k8s/provisioner/class.go (100%) rename {src/nimblestorage/pkg => common}/k8s/provisioner/monitor.go (100%) rename {src/nimblestorage/pkg => common}/k8s/provisioner/provisioner.go (100%) rename {src/nimblestorage/pkg => common}/k8s/provisioner/provisioner_test.go (100%) rename {src/nimblestorage/pkg => common}/k8s/provisioner/volume.go (100%) rename {src/nimblestorage/pkg => common}/linux/bmount.go (100%) rename {src/nimblestorage/pkg => common}/linux/bmount_test.go (100%) rename {src/nimblestorage/pkg => common}/linux/selinux.go (100%) rename {src/nimblestorage/pkg => common}/util/cmd.go (100%) rename {src/nimblestorage/pkg => common}/util/cmd_test.go (100%) rename {src/nimblestorage/pkg => common}/util/file.go (100%) rename {src/nimblestorage/pkg => common}/util/logger.go (100%) rename {src/nimblestorage/pkg => common}/util/logger_test.go (100%) diff --git a/src/nimblestorage/cmd/dory/dory.go b/cmd/dory/dory.go similarity index 100% rename from src/nimblestorage/cmd/dory/dory.go rename to cmd/dory/dory.go diff --git a/src/nimblestorage/cmd/dory/dory.json b/cmd/dory/dory.json similarity index 100% rename from src/nimblestorage/cmd/dory/dory.json rename to cmd/dory/dory.json diff --git a/src/nimblestorage/cmd/dory/dory_test.go b/cmd/dory/dory_test.go similarity index 100% rename from src/nimblestorage/cmd/dory/dory_test.go rename to cmd/dory/dory_test.go diff --git a/src/nimblestorage/cmd/dory/test/broken.json b/cmd/dory/test/broken.json similarity index 100% rename from src/nimblestorage/cmd/dory/test/broken.json rename to cmd/dory/test/broken.json diff --git a/src/nimblestorage/cmd/dory/test/errors.json b/cmd/dory/test/errors.json similarity index 100% rename from src/nimblestorage/cmd/dory/test/errors.json rename to cmd/dory/test/errors.json diff --git a/src/nimblestorage/cmd/dory/test/flipped.json b/cmd/dory/test/flipped.json similarity index 100% rename from src/nimblestorage/cmd/dory/test/flipped.json rename to cmd/dory/test/flipped.json diff --git a/src/nimblestorage/cmd/dory/test/good.json b/cmd/dory/test/good.json similarity index 100% rename from src/nimblestorage/cmd/dory/test/good.json rename to cmd/dory/test/good.json diff --git a/src/nimblestorage/cmd/doryd/Dockerfile b/cmd/doryd/Dockerfile similarity index 100% rename from src/nimblestorage/cmd/doryd/Dockerfile rename to cmd/doryd/Dockerfile diff --git a/src/nimblestorage/cmd/doryd/doryd.go b/cmd/doryd/doryd.go similarity index 100% rename from src/nimblestorage/cmd/doryd/doryd.go rename to cmd/doryd/doryd.go diff --git a/src/nimblestorage/pkg/chain/chain.go b/common/chain/chain.go similarity index 100% rename from src/nimblestorage/pkg/chain/chain.go rename to common/chain/chain.go diff --git a/src/nimblestorage/pkg/chain/chain_test.go b/common/chain/chain_test.go similarity index 100% rename from src/nimblestorage/pkg/chain/chain_test.go rename to common/chain/chain_test.go diff --git a/src/nimblestorage/pkg/connectivity/client.go b/common/connectivity/client.go similarity index 100% rename from src/nimblestorage/pkg/connectivity/client.go rename to common/connectivity/client.go diff --git a/src/nimblestorage/pkg/connectivity/client_test.go b/common/connectivity/client_test.go similarity index 100% rename from src/nimblestorage/pkg/connectivity/client_test.go rename to common/connectivity/client_test.go diff --git a/src/nimblestorage/pkg/docker/dockerlt/dockerlt.go b/common/docker/dockerlt/dockerlt.go similarity index 100% rename from src/nimblestorage/pkg/docker/dockerlt/dockerlt.go rename to common/docker/dockerlt/dockerlt.go diff --git a/src/nimblestorage/pkg/docker/dockerlt/plugin.go b/common/docker/dockerlt/plugin.go similarity index 100% rename from src/nimblestorage/pkg/docker/dockerlt/plugin.go rename to common/docker/dockerlt/plugin.go diff --git a/src/nimblestorage/pkg/docker/dockervol/dockervol.go b/common/docker/dockervol/dockervol.go similarity index 100% rename from src/nimblestorage/pkg/docker/dockervol/dockervol.go rename to common/docker/dockervol/dockervol.go diff --git a/src/nimblestorage/pkg/jconfig/broken.json b/common/jconfig/broken.json similarity index 100% rename from src/nimblestorage/pkg/jconfig/broken.json rename to common/jconfig/broken.json diff --git a/src/nimblestorage/pkg/jconfig/jconfig.go b/common/jconfig/jconfig.go similarity index 100% rename from src/nimblestorage/pkg/jconfig/jconfig.go rename to common/jconfig/jconfig.go diff --git a/src/nimblestorage/pkg/jconfig/jconfig_test.go b/common/jconfig/jconfig_test.go similarity index 100% rename from src/nimblestorage/pkg/jconfig/jconfig_test.go rename to common/jconfig/jconfig_test.go diff --git a/src/nimblestorage/pkg/jconfig/test.json b/common/jconfig/test.json similarity index 100% rename from src/nimblestorage/pkg/jconfig/test.json rename to common/jconfig/test.json diff --git a/src/nimblestorage/pkg/k8s/flexvol/flexvol.go b/common/k8s/flexvol/flexvol.go similarity index 100% rename from src/nimblestorage/pkg/k8s/flexvol/flexvol.go rename to common/k8s/flexvol/flexvol.go diff --git a/src/nimblestorage/pkg/k8s/flexvol/handler.go b/common/k8s/flexvol/handler.go similarity index 100% rename from src/nimblestorage/pkg/k8s/flexvol/handler.go rename to common/k8s/flexvol/handler.go diff --git a/src/nimblestorage/pkg/k8s/flexvol/handler_test.go b/common/k8s/flexvol/handler_test.go similarity index 100% rename from src/nimblestorage/pkg/k8s/flexvol/handler_test.go rename to common/k8s/flexvol/handler_test.go diff --git a/src/nimblestorage/pkg/k8s/provisioner/claim.go b/common/k8s/provisioner/claim.go similarity index 100% rename from src/nimblestorage/pkg/k8s/provisioner/claim.go rename to common/k8s/provisioner/claim.go diff --git a/src/nimblestorage/pkg/k8s/provisioner/class.go b/common/k8s/provisioner/class.go similarity index 100% rename from src/nimblestorage/pkg/k8s/provisioner/class.go rename to common/k8s/provisioner/class.go diff --git a/src/nimblestorage/pkg/k8s/provisioner/monitor.go b/common/k8s/provisioner/monitor.go similarity index 100% rename from src/nimblestorage/pkg/k8s/provisioner/monitor.go rename to common/k8s/provisioner/monitor.go diff --git a/src/nimblestorage/pkg/k8s/provisioner/provisioner.go b/common/k8s/provisioner/provisioner.go similarity index 100% rename from src/nimblestorage/pkg/k8s/provisioner/provisioner.go rename to common/k8s/provisioner/provisioner.go diff --git a/src/nimblestorage/pkg/k8s/provisioner/provisioner_test.go b/common/k8s/provisioner/provisioner_test.go similarity index 100% rename from src/nimblestorage/pkg/k8s/provisioner/provisioner_test.go rename to common/k8s/provisioner/provisioner_test.go diff --git a/src/nimblestorage/pkg/k8s/provisioner/volume.go b/common/k8s/provisioner/volume.go similarity index 100% rename from src/nimblestorage/pkg/k8s/provisioner/volume.go rename to common/k8s/provisioner/volume.go diff --git a/src/nimblestorage/pkg/linux/bmount.go b/common/linux/bmount.go similarity index 100% rename from src/nimblestorage/pkg/linux/bmount.go rename to common/linux/bmount.go diff --git a/src/nimblestorage/pkg/linux/bmount_test.go b/common/linux/bmount_test.go similarity index 100% rename from src/nimblestorage/pkg/linux/bmount_test.go rename to common/linux/bmount_test.go diff --git a/src/nimblestorage/pkg/linux/selinux.go b/common/linux/selinux.go similarity index 100% rename from src/nimblestorage/pkg/linux/selinux.go rename to common/linux/selinux.go diff --git a/src/nimblestorage/pkg/util/cmd.go b/common/util/cmd.go similarity index 100% rename from src/nimblestorage/pkg/util/cmd.go rename to common/util/cmd.go diff --git a/src/nimblestorage/pkg/util/cmd_test.go b/common/util/cmd_test.go similarity index 100% rename from src/nimblestorage/pkg/util/cmd_test.go rename to common/util/cmd_test.go diff --git a/src/nimblestorage/pkg/util/file.go b/common/util/file.go similarity index 100% rename from src/nimblestorage/pkg/util/file.go rename to common/util/file.go diff --git a/src/nimblestorage/pkg/util/logger.go b/common/util/logger.go similarity index 100% rename from src/nimblestorage/pkg/util/logger.go rename to common/util/logger.go diff --git a/src/nimblestorage/pkg/util/logger_test.go b/common/util/logger_test.go similarity index 100% rename from src/nimblestorage/pkg/util/logger_test.go rename to common/util/logger_test.go From d023d1f798af34ee80ce054bb925b8157d3945da Mon Sep 17 00:00:00 2001 From: Eric Forgette Date: Wed, 16 May 2018 18:35:17 -0400 Subject: [PATCH 2/6] change imports to match new repo structure --- cmd/dory/dory.go | 8 ++++---- cmd/doryd/doryd.go | 4 ++-- common/chain/chain_test.go | 2 +- common/connectivity/client.go | 2 +- common/docker/dockerlt/dockerlt.go | 4 ++-- common/docker/dockervol/dockervol.go | 6 +++--- common/k8s/flexvol/flexvol.go | 6 +++--- common/k8s/flexvol/handler.go | 2 +- common/k8s/provisioner/claim.go | 2 +- common/k8s/provisioner/class.go | 2 +- common/k8s/provisioner/monitor.go | 4 ++-- common/k8s/provisioner/provisioner.go | 8 ++++---- common/k8s/provisioner/provisioner_test.go | 2 +- common/k8s/provisioner/volume.go | 2 +- common/linux/bmount.go | 2 +- common/linux/selinux.go | 2 +- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/cmd/dory/dory.go b/cmd/dory/dory.go index e597370..b2a5193 100644 --- a/cmd/dory/dory.go +++ b/cmd/dory/dory.go @@ -18,10 +18,10 @@ package main import ( "fmt" - "nimblestorage/pkg/docker/dockervol" - "nimblestorage/pkg/jconfig" - flexvol "nimblestorage/pkg/k8s/flexvol" - "nimblestorage/pkg/util" + "github.com/hpe-storage/dory/common/docker/dockervol" + "github.com/hpe-storage/dory/common/jconfig" + flexvol "github.com/hpe-storage/dory/common/k8s/flexvol" + "github.com/hpe-storage/dory/common/util" "os" "path/filepath" ) diff --git a/cmd/doryd/doryd.go b/cmd/doryd/doryd.go index cb9225b..d617c6d 100644 --- a/cmd/doryd/doryd.go +++ b/cmd/doryd/doryd.go @@ -18,11 +18,11 @@ package main import ( "fmt" + "github.com/hpe-storage/dory/common/k8s/provisioner" + "github.com/hpe-storage/dory/common/util" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "nimblestorage/pkg/k8s/provisioner" - "nimblestorage/pkg/util" "os" ) diff --git a/common/chain/chain_test.go b/common/chain/chain_test.go index d9e2879..78c49b4 100644 --- a/common/chain/chain_test.go +++ b/common/chain/chain_test.go @@ -17,7 +17,7 @@ package chain import ( "fmt" - "nimblestorage/pkg/util" + "github.com/hpe-storage/dory/common/util" "testing" ) diff --git a/common/connectivity/client.go b/common/connectivity/client.go index 9e3736c..405b574 100644 --- a/common/connectivity/client.go +++ b/common/connectivity/client.go @@ -20,10 +20,10 @@ import ( "bytes" "encoding/json" "fmt" + "github.com/hpe-storage/dory/common/util" "io" "net" "net/http" - "nimblestorage/pkg/util" "strings" "time" ) diff --git a/common/docker/dockerlt/dockerlt.go b/common/docker/dockerlt/dockerlt.go index 198a17a..c0e0691 100644 --- a/common/docker/dockerlt/dockerlt.go +++ b/common/docker/dockerlt/dockerlt.go @@ -17,8 +17,8 @@ limitations under the License. package dockerlt import ( - "nimblestorage/pkg/connectivity" - "nimblestorage/pkg/util" + "github.com/hpe-storage/dory/common/connectivity" + "github.com/hpe-storage/dory/common/util" ) const ( diff --git a/common/docker/dockervol/dockervol.go b/common/docker/dockervol/dockervol.go index 9139f66..f3e8ed9 100644 --- a/common/docker/dockervol/dockervol.go +++ b/common/docker/dockervol/dockervol.go @@ -18,9 +18,9 @@ package dockervol import ( "fmt" - "nimblestorage/pkg/connectivity" - "nimblestorage/pkg/docker/dockerlt" - "nimblestorage/pkg/util" + "github.com/hpe-storage/dory/common/connectivity" + "github.com/hpe-storage/dory/common/docker/dockerlt" + "github.com/hpe-storage/dory/common/util" "strings" "time" ) diff --git a/common/k8s/flexvol/flexvol.go b/common/k8s/flexvol/flexvol.go index 14606bc..c540332 100644 --- a/common/k8s/flexvol/flexvol.go +++ b/common/k8s/flexvol/flexvol.go @@ -19,9 +19,9 @@ package flexvol import ( "encoding/json" "fmt" - "nimblestorage/pkg/docker/dockervol" - "nimblestorage/pkg/linux" - "nimblestorage/pkg/util" + "github.com/hpe-storage/dory/common/docker/dockervol" + "github.com/hpe-storage/dory/common/linux" + "github.com/hpe-storage/dory/common/util" "os" "path/filepath" "regexp" diff --git a/common/k8s/flexvol/handler.go b/common/k8s/flexvol/handler.go index 34cf6b8..b05df7c 100644 --- a/common/k8s/flexvol/handler.go +++ b/common/k8s/flexvol/handler.go @@ -18,7 +18,7 @@ package flexvol import ( "fmt" - "nimblestorage/pkg/util" + "github.com/hpe-storage/dory/common/util" ) // Handle the conversion of flexvol commands and args to docker volume diff --git a/common/k8s/provisioner/claim.go b/common/k8s/provisioner/claim.go index 8d68f0c..0899e77 100644 --- a/common/k8s/provisioner/claim.go +++ b/common/k8s/provisioner/claim.go @@ -18,12 +18,12 @@ package provisioner import ( "fmt" + "github.com/hpe-storage/dory/common/util" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" api_v1 "k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/tools/cache" - "nimblestorage/pkg/util" "strings" ) diff --git a/common/k8s/provisioner/class.go b/common/k8s/provisioner/class.go index f95e32d..6af2f80 100644 --- a/common/k8s/provisioner/class.go +++ b/common/k8s/provisioner/class.go @@ -18,6 +18,7 @@ package provisioner import ( "fmt" + "github.com/hpe-storage/dory/common/util" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" @@ -25,7 +26,6 @@ import ( storage_v1 "k8s.io/client-go/pkg/apis/storage/v1" storage_v1beta1 "k8s.io/client-go/pkg/apis/storage/v1beta1" "k8s.io/client-go/tools/cache" - "nimblestorage/pkg/util" ) func (p *Provisioner) listAllClasses(options meta_v1.ListOptions) (runtime.Object, error) { diff --git a/common/k8s/provisioner/monitor.go b/common/k8s/provisioner/monitor.go index a6fa572..94c7e39 100644 --- a/common/k8s/provisioner/monitor.go +++ b/common/k8s/provisioner/monitor.go @@ -18,9 +18,9 @@ package provisioner import ( "fmt" + "github.com/hpe-storage/dory/common/chain" + "github.com/hpe-storage/dory/common/util" api_v1 "k8s.io/client-go/pkg/api/v1" - "nimblestorage/pkg/chain" - "nimblestorage/pkg/util" "reflect" "time" ) diff --git a/common/k8s/provisioner/provisioner.go b/common/k8s/provisioner/provisioner.go index 41fd771..1a361fb 100644 --- a/common/k8s/provisioner/provisioner.go +++ b/common/k8s/provisioner/provisioner.go @@ -18,6 +18,10 @@ package provisioner import ( "fmt" + "github.com/hpe-storage/dory/common/chain" + "github.com/hpe-storage/dory/common/docker/dockervol" + "github.com/hpe-storage/dory/common/jconfig" + "github.com/hpe-storage/dory/common/util" uuid "github.com/satori/go.uuid" resource_v1 "k8s.io/apimachinery/pkg/api/resource" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -31,10 +35,6 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "math/rand" - "nimblestorage/pkg/chain" - "nimblestorage/pkg/docker/dockervol" - "nimblestorage/pkg/jconfig" - "nimblestorage/pkg/util" "reflect" "strings" "sync" diff --git a/common/k8s/provisioner/provisioner_test.go b/common/k8s/provisioner/provisioner_test.go index ba284f8..8cb8376 100644 --- a/common/k8s/provisioner/provisioner_test.go +++ b/common/k8s/provisioner/provisioner_test.go @@ -1,13 +1,13 @@ package provisioner import ( + "github.com/hpe-storage/dory/common/docker/dockervol" resource_v1 "k8s.io/apimachinery/pkg/api/resource" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" api_v1 "k8s.io/client-go/pkg/api/v1" storage_v1 "k8s.io/client-go/pkg/apis/storage/v1" rest "k8s.io/client-go/rest" - "nimblestorage/pkg/docker/dockervol" "testing" ) diff --git a/common/k8s/provisioner/volume.go b/common/k8s/provisioner/volume.go index 4e8c9f6..255a3f3 100644 --- a/common/k8s/provisioner/volume.go +++ b/common/k8s/provisioner/volume.go @@ -18,6 +18,7 @@ package provisioner import ( "fmt" + "github.com/hpe-storage/dory/common/util" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" @@ -26,7 +27,6 @@ import ( "k8s.io/client-go/pkg/api/v1/ref" storage_v1 "k8s.io/client-go/pkg/apis/storage/v1" "k8s.io/client-go/tools/cache" - "nimblestorage/pkg/util" "strings" ) diff --git a/common/linux/bmount.go b/common/linux/bmount.go index efa86b3..311155b 100644 --- a/common/linux/bmount.go +++ b/common/linux/bmount.go @@ -17,7 +17,7 @@ limitations under the License. package linux import ( - "nimblestorage/pkg/util" + "github.com/hpe-storage/dory/common/util" "strings" ) diff --git a/common/linux/selinux.go b/common/linux/selinux.go index 796ba23..7232fa8 100644 --- a/common/linux/selinux.go +++ b/common/linux/selinux.go @@ -17,7 +17,7 @@ limitations under the License. package linux import ( - "nimblestorage/pkg/util" + "github.com/hpe-storage/dory/common/util" ) const ( From 252c799f6ce11b19cbdfea6045ebfe78f10179fa Mon Sep 17 00:00:00 2001 From: Eric Forgette Date: Wed, 16 May 2018 19:32:44 -0400 Subject: [PATCH 3/6] update build for new layout --- .gitignore | 11 +++- Makefile | 67 +++++++++----------- README.md | 21 ++++--- build/docker/doryd/Dockerfile | 2 +- docs/dory/README.md | 73 ++++++++++++++++------ docs/doryd/README.md | 12 ++-- src/nimblestorage/glide.lock => glide.lock | 0 src/nimblestorage/glide.yaml => glide.yaml | 2 +- 8 files changed, 112 insertions(+), 76 deletions(-) rename src/nimblestorage/glide.lock => glide.lock (100%) rename src/nimblestorage/glide.yaml => glide.yaml (93%) diff --git a/.gitignore b/.gitignore index 714eb0a..694ca5f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,12 @@ /bin/* /src/github.com/* -.vscode/* +.vscode -src/nimblestorage/cmd/dory/dory -src/nimblestorage/vendor/* +cmd/dory/dory +vendor/* + +dory +dory.sha256sum +doryd +doryd.sha256sum diff --git a/Makefile b/Makefile index 7fe4ed1..65c374c 100644 --- a/Makefile +++ b/Makefile @@ -15,21 +15,12 @@ VERSION = 1.1.0 # Where our code lives -PKG_PATH = src/nimblestorage/pkg/ -CMD_PATH = src/nimblestorage/cmd/ +PKG_PATH = ./common/ +CMD_PATH = ./cmd/ # This is the last 8 char of the commit id we're building from COMMIT = $(shell git rev-parse HEAD| cut -b-8) -# This adds this repo as an entry in the GOPATH. This allows us to have a local -# GOPATH that contains the go tooling so we don't have to download -# it again each time we build. -ifndef $(GOPATH) -GOPATH = ${PWD} -else -GOPATH = $(GOPATH=$$GOPATH:{PWD} && echo $$GOPATH) -endif - # The version of make for OSX doesn't allow us to export, so # we add these variables to the env in each invocation. GOENV = GOPATH=$(GOPATH) PATH=$$PATH:$(GOPATH)/bin @@ -51,7 +42,7 @@ LD_FLAGS = '-X main.Version=$(VERSION) -X main.Commit=$(COMMIT)' LINTER_FLAGS = --vendor --disable-all --enable=vet --enable=vetshadow --enable=golint --enable=ineffassign --enable=goconst --enable=deadcode --enable=dupl --enable=varcheck --enable=gocyclo --enable=misspell # list of packages -PACKAGE_LIST = $(shell export $(GOENV) && go list ./$(PKG_PATH)...) +PACKAGE_LIST = $(shell export $(GOENV) && go list ./$(PKG_PATH)...| grep -v vendor) # list of commands COMMAND_LIST = $(shell export $(GOENV) && go list ./$(CMD_PATH)...) @@ -63,11 +54,11 @@ A3 = $(shell printf "»»»") .PHONY: help help: @echo "Targets:" - @echo " gettools - Download and install go tooling required to build." + @echo " tools - Download and install go tooling required to build." @echo " vendor - Download dependancies." @echo " lint - Static analysis of source code. Note that this must pass in order to build." @echo " test - Run unit tests." - @echo " clean - Remove bin and pkg." + @echo " clean - Remove binaries." @echo " debug - Display make's view of the world." @echo " dory - Build dory (FlexVolume driver)." @echo " doryd - Build doryd (Provisioner)." @@ -84,7 +75,7 @@ debug: @echo " BUILD_ENV: $(BUILD_ENV)" @echo " GOENV: $(GOENV)" -gettools: ; $(info $(A1) gettools) +tools: ; $(info $(A1) tools) @echo "$(A2) get gometalinter" export $(GOENV) && go get -u github.com/alecthomas/gometalinter @echo "$(A2) install gometalinter" @@ -94,9 +85,9 @@ gettools: ; $(info $(A1) gettools) export $(GOENV) && go install github.com/Masterminds/glide .PHONY: vendor -vendor: gettools; $(info $(A1) vendor) +vendor: tools; $(info $(A1) vendor) @echo "$(A2) glide install" - export $(GOENV) && cd src/nimblestorage && glide install + export $(GOENV) && glide install .PHONY: lint lint: ; $(info $(A1) lint) @@ -107,39 +98,37 @@ lint: ; $(info $(A1) lint) .PHONY: clean clean: ; $(info $(A1) clean) - @echo "$(A2) remove bin" - @rm -rf bin - @echo "$(A2) remove pkg" - @rm -rf pkg - -bin: ; $(info $(A1) mkdir bin) - @mkdir bin - -pkg: ; $(info $(A1) mkdir pkg) - @mkdir pkg - + @echo "$(A2) remove dory" + @rm -f dory + @rm -f dory.sha256sum + @echo "$(A2) remove doryd" + @rm -f doryd + @rm -f doryd.sha256sum + +.PHONY: test test: ; $(info $(A1) test) @echo "$(A2) Package unit tests" - for pkg in $(PACKAGE_LIST); do echo "»»» Testing $$pkg:" && export $(GOENV) $(TEST_ENV) && go test -cover ./src/$$pkg/; done + for pkg in $(PACKAGE_LIST); do echo "»»» Testing $$pkg:" && export $(GOENV) $(TEST_ENV) && go test -cover $$pkg; done @echo "$(A2) Command unit tests" - for cmd in $(COMMAND_LIST); do echo "»»» Testing $$cmd:" && export $(GOENV) $(TEST_ENV) && go test -cover ./src/$$cmd/; done + for cmd in $(COMMAND_LIST); do echo "»»» Testing $$cmd:" && export $(GOENV) $(TEST_ENV) && go test -cover $$cmd; done -dory: bin pkg lint; $(info $(A1) dory) +dory: lint; $(info $(A1) dory) @echo "$(A2) build dory" - cd bin && export $(GOENV) $(BUILD_ENV) && go build -ldflags $(LD_FLAGS) ../$(CMD_PATH)dory/dory.go + export $(GOENV) $(BUILD_ENV) && go build -ldflags $(LD_FLAGS) $(CMD_PATH)dory/dory.go @echo "$(A2) sha256sum dory" - sha256sum bin/dory > bin/dory.sha256sum - @cat bin/dory.sha256sum + sha256sum dory > dory.sha256sum + @cat dory.sha256sum -doryd: bin pkg lint; $(info $(A1) dory) +doryd: lint; $(info $(A1) dory) @echo "$(A2) build doryd" - cd bin && export $(GOENV) $(BUILD_ENV) && go build -ldflags $(LD_FLAGS) ../$(CMD_PATH)doryd/doryd.go + export $(GOENV) $(BUILD_ENV) && go build -ldflags $(LD_FLAGS) $(CMD_PATH)doryd/doryd.go @echo "$(A2) sha256sum doryd" - sha256sum bin/doryd > bin/doryd.sha256sum - @cat bin/doryd.sha256sum + sha256sum doryd > doryd.sha256sum + @cat doryd.sha256sum +.PHONY: doryd_docker doryd_docker: doryd; $(info $(A1) doryd_docker) @echo "$(A2) rm current doryd image" -docker image rm kube-storage-controller:edge @echo "$(A2) build doryd image" - -docker build -t kube-storage-controller:edge -f src/nimblestorage/cmd/doryd/Dockerfile . \ No newline at end of file + docker build -t kube-storage-controller:edge -f ./build/docker/doryd/Dockerfile . \ No newline at end of file diff --git a/README.md b/README.md index 9952742..fd401e4 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ # Kubernetes Flexvolume Driver and StorageClass Provisioner for Docker Volume Plugins -Repository for Dory and Doryd: The FlexVolume driver and StorageClass provisioner for Kubernetes using *any* Docker Volume API compatible plugin. This is [Open Source Software](LICENSE) from [HPE DEV](https://developer.hpe.com). -# Dory +Repository for Dory and Doryd: The [FlexVolume](https://kubernetes.io/docs/concepts/storage/volumes/#out-of-tree-volume-plugins) driver and [Dynamic Volume Provisioner](https://kubernetes.io/docs/concepts/storage/dynamic-provisioning/) for Kubernetes using *any* Docker Volume API compatible plugin. This is [Open Source Software](LICENSE) from [HPE DEV](https://developer.hpe.com). + +## Dory + Dory is a driver for the [Kubernetes FlexVolume](https://github.com/kubernetes/community/blob/master/contributors/devel/flexvolume.md) Volume type. This driver translates Flexvolume requests to [Docker Volume Plugin](https://docs.docker.com/engine/extend/plugins_volume/) requests. This allows the administrator to leverage [existing legacy Docker Volume Plugins](https://docs.docker.com/engine/extend/legacy_plugins/) or [existing managed Docker Volume Plugins](https://store.docker.com/search?category=volume&q=&type=plugin) in a Kubernetes cluster. Managed plugins require Docker 1.13. Dory provides the ability to 'just in time' provision storage as well as have the orchestrator automatically attach/mount and detach/unmount Persistent Volumes. * Dory [documentation](docs/dory/README.md) @@ -9,7 +11,8 @@ Dory is a driver for the [Kubernetes FlexVolume](https://github.com/kubernetes/c * [Master](http://dl.bintray.com/hpe-storage/dory/dory-master) (latest) * [1.0](http://dl.bintray.com/hpe-storage/dory/dory-1.0) -# Doryd +## Doryd + Doryd is a implementation of the [Out-of-tree provisioner](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/storage/volume-provisioning.md) that dynamically provisions persistent storage using the [Docker Volume Plugin API](https://docs.docker.com/engine/extend/plugins_volume/). * Doryd [documentation](docs/doryd/README.md) @@ -18,20 +21,24 @@ Doryd is a implementation of the [Out-of-tree provisioner](https://github.com/ku * Container image: * [doryd](https://hub.docker.com/r/nimblestorage/doryd/) -# Plugins +## Plugins + To better help end-users navigate around the storage landcape we've composed a page to help keep track of what Docker Volume plugins are known to work well and some record keeping on issues/gotchas with the specific plugin. * [Plugins known to work](docs/plugins/README.md) -# Project +## Project + Why is the project called Dory? Because [Dory speaks whale](https://www.google.com/search?q=Dory+speaks+whale). What about the [Container Storage Interface](https://github.com/container-storage-interface/)? The CSI is certainly the future for container storage. Dory provides a stop gap while the CSI specification is ratified, orchestrators begin supporting it, and implementations begin to surface. -# Thanks +## Thanks + Thank you to [Chakravarthy Nelluri](https://github.com/chakri-nelluri) for all his work on [Flexvolume](https://github.com/kubernetes/kubernetes/commit/fa76de79e5d1670b8e6add30f0159c833534a298#diff-af00671c74d885ce20891c24516198e8) which has made this 'out of tree' work possible. Thank you to [Michael Mattsson](https://community.hpe.com/t5/user/viewprofilepage/user-id/1879662), TME extraordinaire, for his help testing and for writing a [blog post](https://community.hpe.com/t5/HPE-Nimble-Storage-Tech-Blog/Tech-Preview-Bringing-Nimble-Storage-to-Kubernetes-and-OpenShift/ba-p/6986748) about what we were up to. -# Licensing +## Licensing + Dory and Doryd is licensed under the Apache License, Version 2.0. Please see [LICENSE](LICENSE) for the full license text. diff --git a/build/docker/doryd/Dockerfile b/build/docker/doryd/Dockerfile index 4964727..7da8cfd 100644 --- a/build/docker/doryd/Dockerfile +++ b/build/docker/doryd/Dockerfile @@ -1,4 +1,4 @@ FROM alpine:latest -ADD [ "bin/doryd", "/usr/local/bin/doryd" ] +ADD [ "doryd", "/usr/local/bin/doryd" ] ENTRYPOINT [ "doryd" ] CMD [ "/etc/kubernetes/admin.conf", "dev.hpe.com" ] diff --git a/docs/dory/README.md b/docs/dory/README.md index 75924b1..ab5551f 100644 --- a/docs/dory/README.md +++ b/docs/dory/README.md @@ -1,22 +1,29 @@ # Dory + Dory is a Kubernetes [FlexVolume Plugin driver](https://kubernetes.io/docs/concepts/storage/volumes/#out-of-tree-volume-plugins) that leverages the [Docker Volume API](https://docs.docker.com/engine/extend/plugins_volume/) and allows Kubernetes to leverage Docker Volume plugins, both [legacy](https://docs.docker.com/engine/extend/legacy_plugins/#volume-plugins) and [managed](https://store.docker.com/search?category=volume&q=&type=plugin). There is also an out-of-tree dynamic provisioner for Dory, called [Doryd](../doryd/README.md). -# Design -## Overview +## Design + +### Overview + In order to provide persistent storage for a Pod, Kubernetes makes a call to Dory via the Flexvolume interface. Dory is an executable placed in a specific directory (see [Installation](#installation)). Dory then communicates with the configured Docker Volume Plugin via a unix socket. Dory then translates the response from the Docker Volume Plugin to the Flexvolume interface. It is important to note that Dory never communicates with the container engine, it communicates directly with the Docker Volume Plugin. This theoretically allows Dory to work with any container engine supported by Kubernetes. -## Create +### Create + Dory is configured by default to create a volume if one with that name doesn't exist. It does this by first using the Docker Volume Plugin 'get' function. If this doesn't return a volume (and Dory is configured to create volumes), Dory will call the Docker Volume Plugin 'create' function using the options specified in the Persistent Volume definition. This is handled during the Attach workflow in Kubernetes 1.5 and in the Mount workflow in 1.6 and higher. -## Mount +### Mount + The diagram below depicts the process communication on the right and the resulting objects on the left. When the Mount workflow is executed Dory first uses the Docker Volume Plugin 'get' function to see if the volume is available (see [Create](#create)). It then executes the Docker Volume Plugin 'mount' function to mount the filesystem. The Pod uuid is used as the Docker Volume Plugin 'mount id'. This results in the green cylinder labeled '/vol/HrPostgres' in the diagram. Dory then bind mounts the path returned by the Docker Volume Plugin to the location that Kubernetes has requested. This results in the dark blue cylinder in the diagram. If SELinux is configured on the kubelet Dory will set the proper context for this mount. ![Mount](../../assets/mount.png) -## Unmount +### Unmount + The unmount workflow unmounts the bind mount and then uses the Docker Volume Plugin 'unmount' function to unmount and detach the filesystem from the kubelet. -# Building +## Building release 1.0 + Dory is written in Go and requires golang on your machine. The current stable branch is release-1.0. The following example installs the necessary tools and builds Dory on a RHEL 7.4 system: ``` sudo subscription-manager repos --enable=rhel-7-server-optional-rpms @@ -30,14 +37,33 @@ You should end up with a `dory` executable in the `./bin` directory and be ready **Hint:** Go is available through the [EPEL](https://fedoraproject.org/wiki/EPEL) repository for .rpm based distributions and a `golang` package is part of the official Ubuntu repositories. -# Usage -## Installation +## Building latest + +Dory is written in Go and requires golang on your machine. The following example installs the necessary tools and builds Dory on a RHEL 7.4 system: +``` +sudo subscription-manager repos --enable=rhel-7-server-optional-rpms +sudo yum install -y golang make +git clone https://github.com/hpe-storage/dory.git $GOPATH/src/github.com/hpe-storage/dory +cd $GOPATH/src/github.com/hpe-storage/dory +make vendor +make dory +``` +You should end up with a `dory` executable in the `src/github.com/hpe-storage/dory` directory and be ready for [installation](#installation). + +**Hint:** Go is available through the [EPEL](https://fedoraproject.org/wiki/EPEL) repository for .rpm based distributions and a `golang` package is part of the official Ubuntu repositories. + +## Usage + +### Installation + Create a directory on each kubelet with using the following convention: `/usr/libexec/kubernetes/kubelet-plugins/volume/exec/dory~plugin` where `plugin` is replaced with the name of the Docker Volume Plugin. Then copy the dory binary to this folder naming the file to the name of the Docker Volume Plugin. For example, in order to use [HPE's Nimble Storage Docker Volume Plugin](https://www.nimblestorage.com/docker/), the following directory should be created: `/usr/libexec/kubernetes/kubelet-plugins/volume/exec/dory~nimble`. The Dory binary should be copied to `/usr/libexec/kubernetes/kubelet-plugins/volume/exec/dory~nimble/nimble`. -## Configuration +### Configuration + Dory looks for a configuration file with the same name as the executable with a `.json` extension. Following the example above, the configuration file would be `/usr/libexec/kubernetes/kubelet-plugins/volume/exec/dory~nimble/nimble.json`. -### Docker Volume Plugin Socket Path +#### Docker Volume Plugin Socket Path + The critical attribute in this file is called `"dockerVolumePluginSocketPath"`. In the case of a **version 1** [Docker Volume Plugin](https://docs.docker.com/engine/extend/legacy_plugins/), this is used to tell Dory where the socket file is located for the Docker Volume Plugin. Again, following the example above, the file would contain the following; @@ -56,7 +82,8 @@ The attribute can also be used to describe a **version 2** [Docker Volume Plugin Prior to Kubernetes 1.8 FlexVolume drivers are not dynamically discovered and require a kubelet restart. -### Logging +#### Logging + There are two attributes which control how Dory logs. The `"logFilePath"` attribute provides the full path to the log file. The `"logDebug"` indicates whether to log at a debug granularity. The following are the default values; ``` { @@ -66,7 +93,8 @@ There are two attributes which control how Dory logs. The `"logFilePath"` attrib } ``` -### Behavior +#### Behavior + There are two attributes which control Dory's behavior. The `"createVolumes"` attribute indicates whether Dory should create a volume when it can't find one. The `"stripK8sFromOptions"` attribute indicates whether the options in the Kubernetes.io namespace should be passed on to the Docker Volume Driver. The following are the default values; ``` { @@ -76,7 +104,8 @@ There are two attributes which control Dory's behavior. The `"createVolumes"` at } ``` -### Example +#### Example + The following is an example of the default values; ``` { @@ -88,7 +117,8 @@ The following is an example of the default values; } ``` -## What's in a name? +### What's in a name? + There are several names that you should be aware of when using Dory. The first is the Docker Volume name. This is used by Dory to identify the Docker Volume that should be exposed to Kubernetes. The second name to be aware of is that of the Persistent Volume. This name is used by Kubernetes to identify the Persistent Volume object (for example, in the output of `kubectl get pv`). The final name to be aware of is that of the Persistent Volume Claim. This name is used to tie the claim to a Pod or Pod template. Each of these names can be different. Some administrators follow a naming pattern in order to easily identify these relationships. For example, when using a Docker Volume named "sqldata" they might create a Persistent Volume named "sqldata-pv" and a Persistent Volume Claim named "sqldata-pvc". The Pod definition would then reference "sqldata-pvc". @@ -97,19 +127,24 @@ Giving the Docker Volume, Persistent Volume and Persistent Volume Claim all diff **Note:** In Kubernetes 1.5 and 1.6 Flexvolume didn't provide the Persistent Volume name to its driver, so the Docker Volume name must be provided an an option in the Persistent Volume definition. As of 1.7 the Persistent Volume name is passed to the driver. -## Sometimes size does matter +### Sometimes size does matter + Flexvolume currently doesn't communicate the size of the volume to its driver. If the Docker Volume Plugin you're using requires a size, you'll need to specify this in the options section of the Persistent Volumes. -### Example +#### Example + This example uses the Docker Volume Driver from [HPE Nimble Storage](https://www.nimblestorage.com/docker/) to create a Persistent Volume to back a MySQL database instance. First, the administrator creates a Persistent Volume named "sqldata-pv". In order to be able to reference this Persistent Volume explicitly in the claim, the 'volumeName.dory' label is added. The options section may contain any create options the Docker Volume Driver supports. The administrator then creates a Persistent Volume Claim which uses a matchLabels selector to find the Persistent Volume. Finally, the administrator creates a Replication Controller that references the claim by name. When the Replication Controller is created, the Persistent Volume is matched with the Persistent Volume Claim and the Docker Volume is then created and then mounted. ![Example](../../assets/example.png) -# Future +## Future + Docker Volume plugins are beginning to surface for Windows Containers. Kubernetes is getting more mature for Windows. We hope to extend Dory to Windows in the future. -# Dynamic Provisioning +## Dynamic Provisioning + Dory has been extended with a dynamic StorageClass provisioner named [Doryd](../doryd/README.md). Doryd still depends on Dory for attach/detach and mount/unmount. -# Licensing +## Licensing + Dory is licensed under the Apache License, Version 2.0. Please see [LICENSE](../../LICENSE) for the full license text. diff --git a/docs/doryd/README.md b/docs/doryd/README.md index 551f859..ee9ecb6 100644 --- a/docs/doryd/README.md +++ b/docs/doryd/README.md @@ -9,17 +9,17 @@ Doryd is written in Go and requires golang on your machine. The following exampl ``` sudo subscription-manager repos --enable=rhel-7-server-optional-rpms sudo yum install -y golang make -git clone https://github.com/hpe-storage/dory.git -make gettools +git clone https://github.com/hpe-storage/dory.git $GOPATH/src/github.com/hpe-storage/dory +cd $GOPATH/src/github.com/hpe-storage/dory make vendor make doryd ``` -You should end up with a `doryd` executable in the `./bin` directory. +You should end up with a `doryd` executable in the `$GOPATH/src/github.com/hpe-storage/dory` directory. Optionally, you may build a doryd container: ``` -docker build -t doryd:latest build/docker/doryd/Dockerfile . +make doryd_docker ``` **Hint:** Go is available through the [EPEL](https://fedoraproject.org/wiki/EPEL) repository for .rpm based distributions and a `golang` package is part of the official Ubuntu repositories. @@ -76,7 +76,7 @@ parameters: EOF ``` -An end-user may then reference the Storage Class when creating a Persistent Volume Claim: +An end-user may then reference the Storage Class when creating a Persistent Volume Claim: ``` kubectl create -f- < Date: Wed, 16 May 2018 19:34:40 -0400 Subject: [PATCH 4/6] update glide checksum --- glide.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glide.lock b/glide.lock index b89309d..d712821 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: 25ab730aae541d9bfa4ec0d9dd8ad8b77bc07919ac012d683b40cb070d740485 -updated: 2017-10-18T17:15:55.513672481-04:00 +hash: 936a7f7696bb2193c746d063454d21c49e81958d09192949c3d5c07f9894ce63 +updated: 2018-05-16T19:33:35.758696105-04:00 imports: - name: github.com/davecgh/go-spew version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d From c1bd9395a6626694aa600ce4a471a8d5801d001b Mon Sep 17 00:00:00 2001 From: Eric Forgette Date: Wed, 16 May 2018 19:39:31 -0400 Subject: [PATCH 5/6] update deps --- glide.lock | 6 +++--- glide.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/glide.lock b/glide.lock index d712821..2f48b17 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: 936a7f7696bb2193c746d063454d21c49e81958d09192949c3d5c07f9894ce63 -updated: 2018-05-16T19:33:35.758696105-04:00 +hash: 4e9dcc55f8a1aa7eefad22ed570c4f674f713d27c9a9c3f2360e108f4c41d813 +updated: 2018-05-16T19:39:00.619153765-04:00 imports: - name: github.com/davecgh/go-spew version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d @@ -64,7 +64,7 @@ imports: - name: github.com/PuerkitoBio/urlesc version: 5bd2802263f21d8788851d5305584c82a5c75d7e - name: github.com/satori/go.uuid - version: 879c5887cd475cd7864858769793b2ceb0d44feb + version: f58768cc1a7a7e77a3bd49e98cdd21419399b6a3 - name: github.com/spf13/pflag version: 9ff6c6923cfffbcd502984b8e0c80539a94968b7 - name: github.com/ugorji/go diff --git a/glide.yaml b/glide.yaml index d761402..3e3220b 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,7 +1,7 @@ package: github.com/hpe-storage/dory import: - package: github.com/satori/go.uuid - version: ~1.1.0 + version: ~1.2.0 - package: gopkg.in/natefinch/lumberjack.v2 version: ~2.1.0 - package: k8s.io/apimachinery From d16842373b3d32529ea320ab2c5fe3409d4a640a Mon Sep 17 00:00:00 2001 From: Eric Forgette Date: Wed, 16 May 2018 19:41:47 -0400 Subject: [PATCH 6/6] vendor --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 65c374c..b63fa5e 100644 --- a/Makefile +++ b/Makefile @@ -84,7 +84,6 @@ tools: ; $(info $(A1) tools) export $(GOENV) && go get -u github.com/Masterminds/glide export $(GOENV) && go install github.com/Masterminds/glide -.PHONY: vendor vendor: tools; $(info $(A1) vendor) @echo "$(A2) glide install" export $(GOENV) && glide install