Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refact(csi): use common lib-csi imports #263

Merged
merged 2 commits into from
Dec 18, 2020
Merged

refact(csi): use common lib-csi imports #263

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e07398d
refact(csi): use common lib-csi repo
shubham14bajpai Dec 18, 2020
48681d1
removed the replace from go mod
shubham14bajpai Dec 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,19 @@ require (
github.com/docker/go-units v0.4.0
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
github.com/ghodss/yaml v1.0.0
github.com/gogo/protobuf v1.3.0 // indirect
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
github.com/golang/protobuf v1.3.2
github.com/googleapis/gnostic v0.3.1 // indirect
github.com/hashicorp/golang-lru v0.5.3 // indirect
github.com/imdario/mergo v0.3.7 // indirect
github.com/jpillora/go-ogle-analytics v0.0.0-20161213085824-14b04e0594ef
github.com/json-iterator/go v1.1.8 // indirect
github.com/kubernetes-csi/csi-lib-utils v0.6.1
github.com/onsi/ginkgo v1.10.3
github.com/onsi/gomega v1.7.1
github.com/openebs/lib-csi v0.0.0
github.com/pkg/errors v0.8.1
github.com/spf13/cobra v0.0.5
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.5.1
golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 // indirect
golang.org/x/net v0.0.0-20191004110552-13f9640d40b9
golang.org/x/sys v0.0.0-20190902133755-9109b7679e13
google.golang.org/appengine v1.6.2 // indirect
google.golang.org/grpc v1.23.1
k8s.io/api v0.15.12
k8s.io/apimachinery v0.15.12
Expand All @@ -36,11 +30,11 @@ require (
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a // indirect
k8s.io/kubernetes v1.15.12
k8s.io/utils v0.0.0-20191114184206-e782cd3c129f // indirect
sigs.k8s.io/controller-runtime v0.2.0
)

replace (
github.com/openebs/lib-csi => github.com/shubham14bajpai/lib-csi v0.0.0-20201218111054-ecb5bfada741
shubham14bajpai marked this conversation as resolved.
Show resolved Hide resolved
k8s.io/api => k8s.io/api v0.15.12
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.15.12
k8s.io/apimachinery => k8s.io/apimachinery v0.15.12
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,8 @@ github.com/russross/blackfriday v0.0.0-20151117072312-300106c228d5/go.mod h1:JO/
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
github.com/shubham14bajpai/lib-csi v0.0.0-20201218111054-ecb5bfada741 h1:kl3RQXHQkNiicvIcuA6fMj30poByPIsb4VvyirPbExs=
github.com/shubham14bajpai/lib-csi v0.0.0-20201218111054-ecb5bfada741/go.mod h1:RqhCQqpcbFcAeNg54v9IOqLbY0/7S00WUa24ozC7cjI=
github.com/shurcooL/sanitized_anchor_name v0.0.0-20151028001915-10ef21a441db/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
github.com/sigma/go-inotify v0.0.0-20181102212354-c87b6cf5033d/go.mod h1:stlh9OsqBQSdwxTxX73mu41BBtRbIpZLQ7flcAoxAfo=
github.com/sirupsen/logrus v1.2.0 h1:juTguoYk5qI21pwyTXY3B3Y5cOTH3ZUyZCg1v/mihuo=
Expand Down
2 changes: 1 addition & 1 deletion pkg/builder/bkpbuilder/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package bkpbuilder

import (
"github.com/openebs/lib-csi/pkg/common/errors"
apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1"
"github.com/openebs/zfs-localpv/pkg/common/errors"
)

// Builder is the builder object for ZFSBackup
Expand Down
2 changes: 1 addition & 1 deletion pkg/builder/bkpbuilder/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package bkpbuilder
import (
"encoding/json"

client "github.com/openebs/lib-csi/pkg/common/kubernetes/client"
apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1"
client "github.com/openebs/zfs-localpv/pkg/common/kubernetes/client"
clientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset"
"github.com/pkg/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/builder/restorebuilder/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package restorebuilder

import (
"github.com/openebs/lib-csi/pkg/common/errors"
apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1"
"github.com/openebs/zfs-localpv/pkg/common/errors"
)

// Builder is the builder object for ZFSRestore
Expand Down
2 changes: 1 addition & 1 deletion pkg/builder/restorebuilder/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package restorebuilder
import (
"encoding/json"

client "github.com/openebs/lib-csi/pkg/common/kubernetes/client"
apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1"
client "github.com/openebs/zfs-localpv/pkg/common/kubernetes/client"
clientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset"
"github.com/pkg/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/builder/snapbuilder/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package snapbuilder

import (
"github.com/openebs/lib-csi/pkg/common/errors"
apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1"
"github.com/openebs/zfs-localpv/pkg/common/errors"
)

// Builder is the builder object for ZFSSnapshot
Expand Down
2 changes: 1 addition & 1 deletion pkg/builder/snapbuilder/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package snapbuilder
import (
"encoding/json"

client "github.com/openebs/lib-csi/pkg/common/kubernetes/client"
apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1"
client "github.com/openebs/zfs-localpv/pkg/common/kubernetes/client"
clientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset"
"github.com/pkg/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/builder/volbuilder/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package volbuilder

import (
"github.com/openebs/lib-csi/pkg/common/errors"
apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1"
"github.com/openebs/zfs-localpv/pkg/common/errors"
)

// Builder is the builder object for ZFSVolume
Expand Down
2 changes: 1 addition & 1 deletion pkg/builder/volbuilder/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package volbuilder
import (
"encoding/json"

client "github.com/openebs/lib-csi/pkg/common/kubernetes/client"
apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1"
client "github.com/openebs/zfs-localpv/pkg/common/kubernetes/client"
clientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset"
"github.com/pkg/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
38 changes: 0 additions & 38 deletions pkg/client/k8s/v1alpha1/clientset_test.go
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions pkg/client/k8s/v1alpha1/config_test.go
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions pkg/client/k8s/v1alpha1/configmap_test.go
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions pkg/client/k8s/v1alpha1/dynamic_test.go
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions pkg/client/k8s/v1alpha1/resource_test.go
View file
Open in desktop

This file was deleted.

Loading