refactor(crd): move CR from openebs.io to zfs.openebs.io (#70)

Changed the group name from openebs.io to zfs.openebs.io. Now ZFS Volume CR will look like this : ``` apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: zfszvolumes.zfs.openebs.io spec: group: zfs.openebs.io version: v1alpha1 scope: Namespaced names: plural: zfsvolumes singular: zfsvolume kind:ZFSVolume shortNames: - zfsvol - zv ``` Snapshot CR will look like this : ``` apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: zfssnapshots.zfs.openebs.io spec: group: zfs.openebs.io version: v1alpha1 scope: Namespaced names: plural: fssnapshots singular: zfssnapshot kind: ZFSSnapshot shortNames: - zfssnapshot - zfssnap ``` Signed-off-by: Pawan <pawan@mayadata.io>
openebs · Mar 30, 2020 · c4c2278 · c4c2278
1 parent 3e874ff
commit c4c2278
Show file tree

Hide file tree

Showing 48 changed files with 52 additions and 52 deletions.
diff --git 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
@@ -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
@@ -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 → pkg/apis/openebs.io/zfs/v1alpha1/doc.go b/pkg/apis/openebs.io/core/v1alpha1/doc.go → pkg/apis/openebs.io/zfs/v1alpha1/doc.go
diff --git a/...apis/openebs.io/core/v1alpha1/register.go → pkg/apis/openebs.io/zfs/v1alpha1/register.go b/...apis/openebs.io/core/v1alpha1/register.go → 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/...s/openebs.io/core/v1alpha1/zfssnapshot.go → ...is/openebs.io/zfs/v1alpha1/zfssnapshot.go b/...s/openebs.io/core/v1alpha1/zfssnapshot.go → ...is/openebs.io/zfs/v1alpha1/zfssnapshot.go
diff --git a/...pis/openebs.io/core/v1alpha1/zfsvolume.go → ...apis/openebs.io/zfs/v1alpha1/zfsvolume.go b/...pis/openebs.io/core/v1alpha1/zfsvolume.go → ...apis/openebs.io/zfs/v1alpha1/zfsvolume.go
diff --git a/...io/core/v1alpha1/zz_generated.deepcopy.go → ....io/zfs/v1alpha1/zz_generated.deepcopy.go b/...io/core/v1alpha1/zz_generated.deepcopy.go → ....io/zfs/v1alpha1/zz_generated.deepcopy.go
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/pkg/generated/clientset/internalclientset/fake/clientset_generated.go b/pkg/generated/clientset/internalclientset/fake/clientset_generated.go
diff --git a/pkg/generated/clientset/internalclientset/fake/register.go b/pkg/generated/clientset/internalclientset/fake/register.go
diff --git a/pkg/generated/clientset/internalclientset/scheme/register.go b/pkg/generated/clientset/internalclientset/scheme/register.go
diff --git a/...ernalclientset/typed/core/v1alpha1/doc.go → ...ternalclientset/typed/zfs/v1alpha1/doc.go b/...ernalclientset/typed/core/v1alpha1/doc.go → ...ternalclientset/typed/zfs/v1alpha1/doc.go
diff --git a/...clientset/typed/core/v1alpha1/fake/doc.go → ...lclientset/typed/zfs/v1alpha1/fake/doc.go b/...clientset/typed/core/v1alpha1/fake/doc.go → ...lclientset/typed/zfs/v1alpha1/fake/doc.go
diff --git a/...ed/core/v1alpha1/fake/fake_core_client.go → ...yped/zfs/v1alpha1/fake/fake_zfs_client.go b/...ed/core/v1alpha1/fake/fake_core_client.go → ...yped/zfs/v1alpha1/fake/fake_zfs_client.go
diff --git a/...ed/core/v1alpha1/fake/fake_zfssnapshot.go → ...ped/zfs/v1alpha1/fake/fake_zfssnapshot.go b/...ed/core/v1alpha1/fake/fake_zfssnapshot.go → ...ped/zfs/v1alpha1/fake/fake_zfssnapshot.go
diff --git a/...yped/core/v1alpha1/fake/fake_zfsvolume.go → ...typed/zfs/v1alpha1/fake/fake_zfsvolume.go b/...yped/core/v1alpha1/fake/fake_zfsvolume.go → ...typed/zfs/v1alpha1/fake/fake_zfsvolume.go
diff --git a/...yped/core/v1alpha1/generated_expansion.go → ...typed/zfs/v1alpha1/generated_expansion.go b/...yped/core/v1alpha1/generated_expansion.go → ...typed/zfs/v1alpha1/generated_expansion.go
diff --git a/...entset/typed/core/v1alpha1/core_client.go → ...lientset/typed/zfs/v1alpha1/zfs_client.go b/...entset/typed/core/v1alpha1/core_client.go → ...lientset/typed/zfs/v1alpha1/zfs_client.go
diff --git a/...entset/typed/core/v1alpha1/zfssnapshot.go → ...ientset/typed/zfs/v1alpha1/zfssnapshot.go b/...entset/typed/core/v1alpha1/zfssnapshot.go → ...ientset/typed/zfs/v1alpha1/zfssnapshot.go
diff --git a/...lientset/typed/core/v1alpha1/zfsvolume.go → ...clientset/typed/zfs/v1alpha1/zfsvolume.go b/...lientset/typed/core/v1alpha1/zfsvolume.go → ...clientset/typed/zfs/v1alpha1/zfsvolume.go
diff --git a/pkg/generated/informer/externalversions/factory.go b/pkg/generated/informer/externalversions/factory.go
diff --git a/pkg/generated/informer/externalversions/generic.go b/pkg/generated/informer/externalversions/generic.go
diff --git a/...former/externalversions/core/interface.go → ...nformer/externalversions/zfs/interface.go b/...former/externalversions/core/interface.go → ...nformer/externalversions/zfs/interface.go
diff --git a/...ternalversions/core/v1alpha1/interface.go → ...xternalversions/zfs/v1alpha1/interface.go b/...ternalversions/core/v1alpha1/interface.go → ...xternalversions/zfs/v1alpha1/interface.go
diff --git a/...rnalversions/core/v1alpha1/zfssnapshot.go → ...ernalversions/zfs/v1alpha1/zfssnapshot.go b/...rnalversions/core/v1alpha1/zfssnapshot.go → ...ernalversions/zfs/v1alpha1/zfssnapshot.go
diff --git a/...ternalversions/core/v1alpha1/zfsvolume.go → ...xternalversions/zfs/v1alpha1/zfsvolume.go b/...ternalversions/core/v1alpha1/zfsvolume.go → ...xternalversions/zfs/v1alpha1/zfsvolume.go
diff --git a/...ster/core/v1alpha1/expansion_generated.go → ...ister/zfs/v1alpha1/expansion_generated.go b/...ster/core/v1alpha1/expansion_generated.go → ...ister/zfs/v1alpha1/expansion_generated.go
diff --git a/...rated/lister/core/v1alpha1/zfssnapshot.go → ...erated/lister/zfs/v1alpha1/zfssnapshot.go b/...rated/lister/core/v1alpha1/zfssnapshot.go → ...erated/lister/zfs/v1alpha1/zfssnapshot.go
diff --git a/...nerated/lister/core/v1alpha1/zfsvolume.go → ...enerated/lister/zfs/v1alpha1/zfsvolume.go b/...nerated/lister/core/v1alpha1/zfsvolume.go → ...enerated/lister/zfs/v1alpha1/zfsvolume.go
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
 )