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>
This commit is contained in:
Pawan Prakash Sharma 2020-03-30 22:12:34 +05:30 committed by GitHub
parent 3e874ffad7
commit c4c2278d2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
48 changed files with 52 additions and 52 deletions

View file

@ -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

View file

@ -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

View file

@ -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:

View file

@ -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",
}

View file

@ -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"
)

View file

@ -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

View file

@ -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"

View file

@ -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

View file

@ -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"
)

View file

@ -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

View file

@ -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"

View file

@ -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

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"
)

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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)
}

View file

@ -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"
)

View file

@ -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.

View file

@ -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 {

View file

@ -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 {

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"
)

View file

@ -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"

View file

@ -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

View file

@ -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"