diff --git a/Makefile b/Makefile index 67031185..e44c5937 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ SRC_PKG := github.com/openebs/zfs-localpv/pkg # code generation for custom resources .PHONY: kubegen kubegen: kubegendelete deepcopy-install clientset-install lister-install informer-install - @GEN_SRC=openebs.io/core/v1alpha1 make deepcopy clientset lister informer + @GEN_SRC=openebs.io/zfs/v1alpha1 make deepcopy clientset lister informer # deletes generated code by codegen .PHONY: kubegendelete diff --git a/ci/ci-test.sh b/ci/ci-test.sh index 1809bb5e..63361f92 100755 --- a/ci/ci-test.sh +++ b/ci/ci-test.sh @@ -81,7 +81,7 @@ echo "get sc details" kubectl get sc --all-namespaces -oyaml echo "get zfs volume details" -kubectl get zfsvolumes.openebs.io -n openebs -oyaml +kubectl get zfsvolumes.zfs.openebs.io -n openebs -oyaml exit 1 fi diff --git a/deploy/zfs-operator.yaml b/deploy/zfs-operator.yaml index 60381e7a..8ed6b680 100644 --- a/deploy/zfs-operator.yaml +++ b/deploy/zfs-operator.yaml @@ -10,9 +10,9 @@ metadata: apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: - name: zfsvolumes.openebs.io + name: zfsvolumes.zfs.openebs.io spec: - group: openebs.io + group: zfs.openebs.io version: v1alpha1 scope: Namespaced names: @@ -57,9 +57,9 @@ spec: apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: - name: zfssnapshots.openebs.io + name: zfssnapshots.zfs.openebs.io spec: - group: openebs.io + group: zfs.openebs.io version: v1alpha1 scope: Namespaced names: diff --git a/pkg/apis/openebs.io/core/v1alpha1/doc.go b/pkg/apis/openebs.io/zfs/v1alpha1/doc.go similarity index 100% rename from pkg/apis/openebs.io/core/v1alpha1/doc.go rename to pkg/apis/openebs.io/zfs/v1alpha1/doc.go diff --git a/pkg/apis/openebs.io/core/v1alpha1/register.go b/pkg/apis/openebs.io/zfs/v1alpha1/register.go similarity index 98% rename from pkg/apis/openebs.io/core/v1alpha1/register.go rename to pkg/apis/openebs.io/zfs/v1alpha1/register.go index fa2fc9db..99bf3637 100644 --- a/pkg/apis/openebs.io/core/v1alpha1/register.go +++ b/pkg/apis/openebs.io/zfs/v1alpha1/register.go @@ -28,7 +28,7 @@ import ( // NOTE: // This variable name should not be changed var SchemeGroupVersion = schema.GroupVersion{ - Group: "openebs.io", + Group: "zfs.openebs.io", Version: "v1alpha1", } diff --git a/pkg/apis/openebs.io/core/v1alpha1/zfssnapshot.go b/pkg/apis/openebs.io/zfs/v1alpha1/zfssnapshot.go similarity index 100% rename from pkg/apis/openebs.io/core/v1alpha1/zfssnapshot.go rename to pkg/apis/openebs.io/zfs/v1alpha1/zfssnapshot.go diff --git a/pkg/apis/openebs.io/core/v1alpha1/zfsvolume.go b/pkg/apis/openebs.io/zfs/v1alpha1/zfsvolume.go similarity index 100% rename from pkg/apis/openebs.io/core/v1alpha1/zfsvolume.go rename to pkg/apis/openebs.io/zfs/v1alpha1/zfsvolume.go diff --git a/pkg/apis/openebs.io/core/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/openebs.io/zfs/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from pkg/apis/openebs.io/core/v1alpha1/zz_generated.deepcopy.go rename to pkg/apis/openebs.io/zfs/v1alpha1/zz_generated.deepcopy.go diff --git a/pkg/builder/snapbuilder/build.go b/pkg/builder/snapbuilder/build.go index bec7fa9d..6f4adb25 100644 --- a/pkg/builder/snapbuilder/build.go +++ b/pkg/builder/snapbuilder/build.go @@ -17,7 +17,7 @@ limitations under the License. package snapbuilder import ( - apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" "github.com/openebs/zfs-localpv/pkg/common/errors" ) diff --git a/pkg/builder/snapbuilder/buildlist.go b/pkg/builder/snapbuilder/buildlist.go index 8d5a6798..a0772a77 100644 --- a/pkg/builder/snapbuilder/buildlist.go +++ b/pkg/builder/snapbuilder/buildlist.go @@ -17,7 +17,7 @@ limitations under the License. package snapbuilder import ( - apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" ) // ListBuilder enables building an instance of diff --git a/pkg/builder/snapbuilder/kubernetes.go b/pkg/builder/snapbuilder/kubernetes.go index 35e038f0..72bea9d6 100644 --- a/pkg/builder/snapbuilder/kubernetes.go +++ b/pkg/builder/snapbuilder/kubernetes.go @@ -17,7 +17,7 @@ package snapbuilder import ( "encoding/json" - apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" client "github.com/openebs/zfs-localpv/pkg/common/kubernetes/client" clientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset" "github.com/pkg/errors" diff --git a/pkg/builder/snapbuilder/snapshot.go b/pkg/builder/snapbuilder/snapshot.go index ea81318a..d365e172 100644 --- a/pkg/builder/snapbuilder/snapshot.go +++ b/pkg/builder/snapbuilder/snapshot.go @@ -15,7 +15,7 @@ package snapbuilder import ( - apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" ) // ZFSSnapshot is a wrapper over diff --git a/pkg/builder/volbuilder/build.go b/pkg/builder/volbuilder/build.go index 46ee738d..a25945f5 100644 --- a/pkg/builder/volbuilder/build.go +++ b/pkg/builder/volbuilder/build.go @@ -17,7 +17,7 @@ limitations under the License. package volbuilder import ( - apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" "github.com/openebs/zfs-localpv/pkg/common/errors" ) diff --git a/pkg/builder/volbuilder/buildlist.go b/pkg/builder/volbuilder/buildlist.go index 026d2ca5..824fc030 100644 --- a/pkg/builder/volbuilder/buildlist.go +++ b/pkg/builder/volbuilder/buildlist.go @@ -17,7 +17,7 @@ limitations under the License. package volbuilder import ( - apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" ) // ListBuilder enables building an instance of diff --git a/pkg/builder/volbuilder/kubernetes.go b/pkg/builder/volbuilder/kubernetes.go index fb3341f7..84780aff 100644 --- a/pkg/builder/volbuilder/kubernetes.go +++ b/pkg/builder/volbuilder/kubernetes.go @@ -17,7 +17,7 @@ package volbuilder import ( "encoding/json" - apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" client "github.com/openebs/zfs-localpv/pkg/common/kubernetes/client" clientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset" "github.com/pkg/errors" diff --git a/pkg/builder/volbuilder/volume.go b/pkg/builder/volbuilder/volume.go index c0dca565..569c2bb0 100644 --- a/pkg/builder/volbuilder/volume.go +++ b/pkg/builder/volbuilder/volume.go @@ -15,7 +15,7 @@ package volbuilder import ( - apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" ) // ZFSVolume is a wrapper over diff --git a/pkg/driver/agent.go b/pkg/driver/agent.go index b1874a7c..156584ad 100644 --- a/pkg/driver/agent.go +++ b/pkg/driver/agent.go @@ -19,7 +19,7 @@ package driver import ( "github.com/Sirupsen/logrus" "github.com/container-storage-interface/spec/lib/go/csi" - apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" "github.com/openebs/zfs-localpv/pkg/builder/volbuilder" "github.com/openebs/zfs-localpv/pkg/mgmt/snapshot" "github.com/openebs/zfs-localpv/pkg/mgmt/volume" diff --git a/pkg/generated/clientset/internalclientset/clientset.go b/pkg/generated/clientset/internalclientset/clientset.go index 527ce0ac..f2309867 100644 --- a/pkg/generated/clientset/internalclientset/clientset.go +++ b/pkg/generated/clientset/internalclientset/clientset.go @@ -19,7 +19,7 @@ limitations under the License. package internalclientset import ( - openebsv1alpha1 "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/typed/core/v1alpha1" + openebsv1alpha1 "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/generated/clientset/internalclientset/fake/clientset_generated.go b/pkg/generated/clientset/internalclientset/fake/clientset_generated.go index 40508848..4659e4ab 100644 --- a/pkg/generated/clientset/internalclientset/fake/clientset_generated.go +++ b/pkg/generated/clientset/internalclientset/fake/clientset_generated.go @@ -20,8 +20,8 @@ package fake import ( clientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset" - openebsv1alpha1 "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/typed/core/v1alpha1" - fakeopenebsv1alpha1 "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/typed/core/v1alpha1/fake" + openebsv1alpha1 "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1" + fakeopenebsv1alpha1 "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/pkg/generated/clientset/internalclientset/fake/register.go b/pkg/generated/clientset/internalclientset/fake/register.go index 8c7a7476..636e6edd 100644 --- a/pkg/generated/clientset/internalclientset/fake/register.go +++ b/pkg/generated/clientset/internalclientset/fake/register.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - openebsv1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + openebsv1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/clientset/internalclientset/scheme/register.go b/pkg/generated/clientset/internalclientset/scheme/register.go index 85b1a92b..4c46183d 100644 --- a/pkg/generated/clientset/internalclientset/scheme/register.go +++ b/pkg/generated/clientset/internalclientset/scheme/register.go @@ -19,7 +19,7 @@ limitations under the License. package scheme import ( - openebsv1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + openebsv1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/clientset/internalclientset/typed/core/v1alpha1/doc.go b/pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/doc.go similarity index 100% rename from pkg/generated/clientset/internalclientset/typed/core/v1alpha1/doc.go rename to pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/doc.go diff --git a/pkg/generated/clientset/internalclientset/typed/core/v1alpha1/fake/doc.go b/pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/fake/doc.go similarity index 100% rename from pkg/generated/clientset/internalclientset/typed/core/v1alpha1/fake/doc.go rename to pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/fake/doc.go diff --git a/pkg/generated/clientset/internalclientset/typed/core/v1alpha1/fake/fake_core_client.go b/pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/fake/fake_zfs_client.go similarity index 96% rename from pkg/generated/clientset/internalclientset/typed/core/v1alpha1/fake/fake_core_client.go rename to pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/fake/fake_zfs_client.go index 59265cc8..084b0361 100644 --- a/pkg/generated/clientset/internalclientset/typed/core/v1alpha1/fake/fake_core_client.go +++ b/pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/fake/fake_zfs_client.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/typed/core/v1alpha1" + v1alpha1 "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/generated/clientset/internalclientset/typed/core/v1alpha1/fake/fake_zfssnapshot.go b/pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/fake/fake_zfssnapshot.go similarity index 98% rename from pkg/generated/clientset/internalclientset/typed/core/v1alpha1/fake/fake_zfssnapshot.go rename to pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/fake/fake_zfssnapshot.go index 523c6a6a..fa439a11 100644 --- a/pkg/generated/clientset/internalclientset/typed/core/v1alpha1/fake/fake_zfssnapshot.go +++ b/pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/fake/fake_zfssnapshot.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + v1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/clientset/internalclientset/typed/core/v1alpha1/fake/fake_zfsvolume.go b/pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/fake/fake_zfsvolume.go similarity index 98% rename from pkg/generated/clientset/internalclientset/typed/core/v1alpha1/fake/fake_zfsvolume.go rename to pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/fake/fake_zfsvolume.go index 6bf5b731..f36da9c1 100644 --- a/pkg/generated/clientset/internalclientset/typed/core/v1alpha1/fake/fake_zfsvolume.go +++ b/pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/fake/fake_zfsvolume.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + v1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/clientset/internalclientset/typed/core/v1alpha1/generated_expansion.go b/pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/generated_expansion.go similarity index 100% rename from pkg/generated/clientset/internalclientset/typed/core/v1alpha1/generated_expansion.go rename to pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/generated_expansion.go diff --git a/pkg/generated/clientset/internalclientset/typed/core/v1alpha1/core_client.go b/pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/zfs_client.go similarity index 97% rename from pkg/generated/clientset/internalclientset/typed/core/v1alpha1/core_client.go rename to pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/zfs_client.go index 30a88e5a..bb9143a6 100644 --- a/pkg/generated/clientset/internalclientset/typed/core/v1alpha1/core_client.go +++ b/pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/zfs_client.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + v1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/scheme" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" diff --git a/pkg/generated/clientset/internalclientset/typed/core/v1alpha1/zfssnapshot.go b/pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/zfssnapshot.go similarity index 98% rename from pkg/generated/clientset/internalclientset/typed/core/v1alpha1/zfssnapshot.go rename to pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/zfssnapshot.go index daf809a4..6fddff8f 100644 --- a/pkg/generated/clientset/internalclientset/typed/core/v1alpha1/zfssnapshot.go +++ b/pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/zfssnapshot.go @@ -21,7 +21,7 @@ package v1alpha1 import ( "time" - v1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + v1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" scheme "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/generated/clientset/internalclientset/typed/core/v1alpha1/zfsvolume.go b/pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/zfsvolume.go similarity index 98% rename from pkg/generated/clientset/internalclientset/typed/core/v1alpha1/zfsvolume.go rename to pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/zfsvolume.go index b48695a4..570b1075 100644 --- a/pkg/generated/clientset/internalclientset/typed/core/v1alpha1/zfsvolume.go +++ b/pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/zfsvolume.go @@ -21,7 +21,7 @@ package v1alpha1 import ( "time" - v1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + v1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" scheme "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/generated/informer/externalversions/factory.go b/pkg/generated/informer/externalversions/factory.go index b2531e06..e59f0b48 100644 --- a/pkg/generated/informer/externalversions/factory.go +++ b/pkg/generated/informer/externalversions/factory.go @@ -24,8 +24,8 @@ import ( time "time" internalclientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset" - core "github.com/openebs/zfs-localpv/pkg/generated/informer/externalversions/core" internalinterfaces "github.com/openebs/zfs-localpv/pkg/generated/informer/externalversions/internalinterfaces" + zfs "github.com/openebs/zfs-localpv/pkg/generated/informer/externalversions/zfs" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -172,9 +172,9 @@ type SharedInformerFactory interface { ForResource(resource schema.GroupVersionResource) (GenericInformer, error) WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool - Openebs() core.Interface + Openebs() zfs.Interface } -func (f *sharedInformerFactory) Openebs() core.Interface { - return core.New(f, f.namespace, f.tweakListOptions) +func (f *sharedInformerFactory) Openebs() zfs.Interface { + return zfs.New(f, f.namespace, f.tweakListOptions) } diff --git a/pkg/generated/informer/externalversions/generic.go b/pkg/generated/informer/externalversions/generic.go index ef23439f..521a11da 100644 --- a/pkg/generated/informer/externalversions/generic.go +++ b/pkg/generated/informer/externalversions/generic.go @@ -21,7 +21,7 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + v1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/pkg/generated/informer/externalversions/core/interface.go b/pkg/generated/informer/externalversions/zfs/interface.go similarity index 97% rename from pkg/generated/informer/externalversions/core/interface.go rename to pkg/generated/informer/externalversions/zfs/interface.go index 5b20847c..788da6d8 100644 --- a/pkg/generated/informer/externalversions/core/interface.go +++ b/pkg/generated/informer/externalversions/zfs/interface.go @@ -19,8 +19,8 @@ limitations under the License. package openebs import ( - v1alpha1 "github.com/openebs/zfs-localpv/pkg/generated/informer/externalversions/core/v1alpha1" internalinterfaces "github.com/openebs/zfs-localpv/pkg/generated/informer/externalversions/internalinterfaces" + v1alpha1 "github.com/openebs/zfs-localpv/pkg/generated/informer/externalversions/zfs/v1alpha1" ) // Interface provides access to each of this group's versions. diff --git a/pkg/generated/informer/externalversions/core/v1alpha1/interface.go b/pkg/generated/informer/externalversions/zfs/v1alpha1/interface.go similarity index 100% rename from pkg/generated/informer/externalversions/core/v1alpha1/interface.go rename to pkg/generated/informer/externalversions/zfs/v1alpha1/interface.go diff --git a/pkg/generated/informer/externalversions/core/v1alpha1/zfssnapshot.go b/pkg/generated/informer/externalversions/zfs/v1alpha1/zfssnapshot.go similarity index 92% rename from pkg/generated/informer/externalversions/core/v1alpha1/zfssnapshot.go rename to pkg/generated/informer/externalversions/zfs/v1alpha1/zfssnapshot.go index 39bfa099..4f310cbb 100644 --- a/pkg/generated/informer/externalversions/core/v1alpha1/zfssnapshot.go +++ b/pkg/generated/informer/externalversions/zfs/v1alpha1/zfssnapshot.go @@ -21,10 +21,10 @@ package v1alpha1 import ( time "time" - corev1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + zfsv1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" internalclientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset" internalinterfaces "github.com/openebs/zfs-localpv/pkg/generated/informer/externalversions/internalinterfaces" - v1alpha1 "github.com/openebs/zfs-localpv/pkg/generated/lister/core/v1alpha1" + v1alpha1 "github.com/openebs/zfs-localpv/pkg/generated/lister/zfs/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -70,7 +70,7 @@ func NewFilteredZFSSnapshotInformer(client internalclientset.Interface, namespac return client.OpenebsV1alpha1().ZFSSnapshots(namespace).Watch(options) }, }, - &corev1alpha1.ZFSSnapshot{}, + &zfsv1alpha1.ZFSSnapshot{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *zFSSnapshotInformer) defaultInformer(client internalclientset.Interface } func (f *zFSSnapshotInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&corev1alpha1.ZFSSnapshot{}, f.defaultInformer) + return f.factory.InformerFor(&zfsv1alpha1.ZFSSnapshot{}, f.defaultInformer) } func (f *zFSSnapshotInformer) Lister() v1alpha1.ZFSSnapshotLister { diff --git a/pkg/generated/informer/externalversions/core/v1alpha1/zfsvolume.go b/pkg/generated/informer/externalversions/zfs/v1alpha1/zfsvolume.go similarity index 92% rename from pkg/generated/informer/externalversions/core/v1alpha1/zfsvolume.go rename to pkg/generated/informer/externalversions/zfs/v1alpha1/zfsvolume.go index 52b30407..5d64bee2 100644 --- a/pkg/generated/informer/externalversions/core/v1alpha1/zfsvolume.go +++ b/pkg/generated/informer/externalversions/zfs/v1alpha1/zfsvolume.go @@ -21,10 +21,10 @@ package v1alpha1 import ( time "time" - corev1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + zfsv1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" internalclientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset" internalinterfaces "github.com/openebs/zfs-localpv/pkg/generated/informer/externalversions/internalinterfaces" - v1alpha1 "github.com/openebs/zfs-localpv/pkg/generated/lister/core/v1alpha1" + v1alpha1 "github.com/openebs/zfs-localpv/pkg/generated/lister/zfs/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -70,7 +70,7 @@ func NewFilteredZFSVolumeInformer(client internalclientset.Interface, namespace return client.OpenebsV1alpha1().ZFSVolumes(namespace).Watch(options) }, }, - &corev1alpha1.ZFSVolume{}, + &zfsv1alpha1.ZFSVolume{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *zFSVolumeInformer) defaultInformer(client internalclientset.Interface, } func (f *zFSVolumeInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&corev1alpha1.ZFSVolume{}, f.defaultInformer) + return f.factory.InformerFor(&zfsv1alpha1.ZFSVolume{}, f.defaultInformer) } func (f *zFSVolumeInformer) Lister() v1alpha1.ZFSVolumeLister { diff --git a/pkg/generated/lister/core/v1alpha1/expansion_generated.go b/pkg/generated/lister/zfs/v1alpha1/expansion_generated.go similarity index 100% rename from pkg/generated/lister/core/v1alpha1/expansion_generated.go rename to pkg/generated/lister/zfs/v1alpha1/expansion_generated.go diff --git a/pkg/generated/lister/core/v1alpha1/zfssnapshot.go b/pkg/generated/lister/zfs/v1alpha1/zfssnapshot.go similarity index 97% rename from pkg/generated/lister/core/v1alpha1/zfssnapshot.go rename to pkg/generated/lister/zfs/v1alpha1/zfssnapshot.go index f0bbc573..894fa326 100644 --- a/pkg/generated/lister/core/v1alpha1/zfssnapshot.go +++ b/pkg/generated/lister/zfs/v1alpha1/zfssnapshot.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + v1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/generated/lister/core/v1alpha1/zfsvolume.go b/pkg/generated/lister/zfs/v1alpha1/zfsvolume.go similarity index 97% rename from pkg/generated/lister/core/v1alpha1/zfsvolume.go rename to pkg/generated/lister/zfs/v1alpha1/zfsvolume.go index 67f6306f..215b0bd6 100644 --- a/pkg/generated/lister/core/v1alpha1/zfsvolume.go +++ b/pkg/generated/lister/zfs/v1alpha1/zfsvolume.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + v1alpha1 "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/mgmt/snapshot/builder.go b/pkg/mgmt/snapshot/builder.go index e37909e8..65047de8 100644 --- a/pkg/mgmt/snapshot/builder.go +++ b/pkg/mgmt/snapshot/builder.go @@ -22,7 +22,7 @@ import ( clientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset" openebsScheme "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/scheme" informers "github.com/openebs/zfs-localpv/pkg/generated/informer/externalversions" - listers "github.com/openebs/zfs-localpv/pkg/generated/lister/core/v1alpha1" + listers "github.com/openebs/zfs-localpv/pkg/generated/lister/zfs/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" diff --git a/pkg/mgmt/snapshot/snapshot.go b/pkg/mgmt/snapshot/snapshot.go index 0c955f52..8b30d120 100644 --- a/pkg/mgmt/snapshot/snapshot.go +++ b/pkg/mgmt/snapshot/snapshot.go @@ -22,7 +22,7 @@ import ( "github.com/Sirupsen/logrus" - apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" zfs "github.com/openebs/zfs-localpv/pkg/zfs" k8serror "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/util/runtime" diff --git a/pkg/mgmt/volume/builder.go b/pkg/mgmt/volume/builder.go index 5aff3eba..22a13a6f 100644 --- a/pkg/mgmt/volume/builder.go +++ b/pkg/mgmt/volume/builder.go @@ -22,7 +22,7 @@ import ( clientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset" openebsScheme "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/scheme" informers "github.com/openebs/zfs-localpv/pkg/generated/informer/externalversions" - listers "github.com/openebs/zfs-localpv/pkg/generated/lister/core/v1alpha1" + listers "github.com/openebs/zfs-localpv/pkg/generated/lister/zfs/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" diff --git a/pkg/mgmt/volume/volume.go b/pkg/mgmt/volume/volume.go index fcfd5547..8eb8c920 100644 --- a/pkg/mgmt/volume/volume.go +++ b/pkg/mgmt/volume/volume.go @@ -22,7 +22,7 @@ import ( "github.com/Sirupsen/logrus" - apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" zfs "github.com/openebs/zfs-localpv/pkg/zfs" k8serror "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/util/runtime" diff --git a/pkg/zfs/mount.go b/pkg/zfs/mount.go index 9ac09030..814f78d5 100644 --- a/pkg/zfs/mount.go +++ b/pkg/zfs/mount.go @@ -5,7 +5,7 @@ import ( "os" "github.com/Sirupsen/logrus" - apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "k8s.io/kubernetes/pkg/util/mount" diff --git a/pkg/zfs/resize.go b/pkg/zfs/resize.go index 4421840d..351838be 100644 --- a/pkg/zfs/resize.go +++ b/pkg/zfs/resize.go @@ -18,7 +18,7 @@ package zfs import ( "github.com/Sirupsen/logrus" - apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" "k8s.io/kubernetes/pkg/util/mount" "os/exec" ) diff --git a/pkg/zfs/volume.go b/pkg/zfs/volume.go index da02f0b6..89e9aa20 100644 --- a/pkg/zfs/volume.go +++ b/pkg/zfs/volume.go @@ -19,7 +19,7 @@ import ( "os" "strconv" - apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" "github.com/openebs/zfs-localpv/pkg/builder/snapbuilder" "github.com/openebs/zfs-localpv/pkg/builder/volbuilder" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/zfs/zfs_util.go b/pkg/zfs/zfs_util.go index cefb3b1e..13741c00 100644 --- a/pkg/zfs/zfs_util.go +++ b/pkg/zfs/zfs_util.go @@ -21,7 +21,7 @@ import ( "path/filepath" "github.com/Sirupsen/logrus" - apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" ) // zfs related constants diff --git a/tests/utils.go b/tests/utils.go index 766df873..8fc110d5 100644 --- a/tests/utils.go +++ b/tests/utils.go @@ -21,7 +21,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/core/v1alpha1" + apis "github.com/openebs/zfs-localpv/pkg/apis/openebs.io/zfs/v1alpha1" "github.com/openebs/zfs-localpv/pkg/zfs" "github.com/openebs/zfs-localpv/tests/container" "github.com/openebs/zfs-localpv/tests/deploy"