technofab/zfs-localpv
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/zfs-localpv.git synced 2025-12-11 22:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -73,7 +73,7 @@ SRC_PKG := github.com/openebs/zfs-localpv/pkg
# code generation for custom resources # code generation for custom resources
.PHONY: kubegen .PHONY: kubegen
kubegen: kubegendelete deepcopy-install clientset-install lister-install informer-install 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 # deletes generated code by codegen
.PHONY: kubegendelete .PHONY: kubegendelete

2
ci/ci-test.sh
View file

@ -81,7 +81,7 @@ echo "get sc details"
kubectl get sc --all-namespaces -oyaml kubectl get sc --all-namespaces -oyaml
echo "get zfs volume details" echo "get zfs volume details"
kubectl get zfsvolumes.openebs.io -n openebs -oyaml kubectl get zfsvolumes.zfs.openebs.io -n openebs -oyaml
exit 1 exit 1
fi fi

8
deploy/zfs-operator.yaml
View file

@ -10,9 +10,9 @@ metadata:
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: zfsvolumes.openebs.io name: zfsvolumes.zfs.openebs.io
spec: spec:
group: openebs.io group: zfs.openebs.io
version: v1alpha1 version: v1alpha1
scope: Namespaced scope: Namespaced
names: names:
@ -57,9 +57,9 @@ spec:
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: zfssnapshots.openebs.io name: zfssnapshots.zfs.openebs.io
spec: spec:
group: openebs.io group: zfs.openebs.io
version: v1alpha1 version: v1alpha1
scope: Namespaced scope: Namespaced
names: names:

0
pkg/apis/openebs.io/core/v1alpha1/doc.go → pkg/apis/openebs.io/zfs/v1alpha1/doc.go
View file

2
pkg/apis/openebs.io/core/v1alpha1/register.go → pkg/apis/openebs.io/zfs/v1alpha1/register.go
View file

@ -28,7 +28,7 @@ import (
// NOTE: // NOTE:
// This variable name should not be changed // This variable name should not be changed
var SchemeGroupVersion = schema.GroupVersion{ var SchemeGroupVersion = schema.GroupVersion{
Group: "openebs.io", Group: "zfs.openebs.io",
Version: "v1alpha1", Version: "v1alpha1",
} }

0
pkg/apis/openebs.io/core/v1alpha1/zfssnapshot.go → pkg/apis/openebs.io/zfs/v1alpha1/zfssnapshot.go
View file

0
pkg/apis/openebs.io/core/v1alpha1/zfsvolume.go → pkg/apis/openebs.io/zfs/v1alpha1/zfsvolume.go
View file

0
pkg/apis/openebs.io/core/v1alpha1/zz_generated.deepcopy.go → pkg/apis/openebs.io/zfs/v1alpha1/zz_generated.deepcopy.go
View file

2
pkg/builder/snapbuilder/build.go
View file

@ -17,7 +17,7 @@ limitations under the License.
package snapbuilder package snapbuilder
import ( 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" "github.com/openebs/zfs-localpv/pkg/common/errors"
) )

2
pkg/builder/snapbuilder/buildlist.go
View file

@ -17,7 +17,7 @@ limitations under the License.
package snapbuilder package snapbuilder
import ( 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 // ListBuilder enables building an instance of

2
pkg/builder/snapbuilder/kubernetes.go
View file

@ -17,7 +17,7 @@ package snapbuilder
import ( import (
"encoding/json" "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" client "github.com/openebs/zfs-localpv/pkg/common/kubernetes/client"
clientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset" clientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset"
"github.com/pkg/errors" "github.com/pkg/errors"

2
pkg/builder/snapbuilder/snapshot.go
View file

@ -15,7 +15,7 @@
package snapbuilder package snapbuilder
import ( 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 // ZFSSnapshot is a wrapper over

2
pkg/builder/volbuilder/build.go
View file

@ -17,7 +17,7 @@ limitations under the License.
package volbuilder package volbuilder
import ( 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" "github.com/openebs/zfs-localpv/pkg/common/errors"
) )

2
pkg/builder/volbuilder/buildlist.go
View file

@ -17,7 +17,7 @@ limitations under the License.
package volbuilder package volbuilder
import ( 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 // ListBuilder enables building an instance of

2
pkg/builder/volbuilder/kubernetes.go
View file

@ -17,7 +17,7 @@ package volbuilder
import ( import (
"encoding/json" "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" client "github.com/openebs/zfs-localpv/pkg/common/kubernetes/client"
clientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset" clientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset"
"github.com/pkg/errors" "github.com/pkg/errors"

2
pkg/builder/volbuilder/volume.go
View file

@ -15,7 +15,7 @@
package volbuilder package volbuilder
import ( 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 // ZFSVolume is a wrapper over

2
pkg/driver/agent.go
View file

@ -19,7 +19,7 @@ package driver
import ( import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/container-storage-interface/spec/lib/go/csi" "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/builder/volbuilder"
"github.com/openebs/zfs-localpv/pkg/mgmt/snapshot" "github.com/openebs/zfs-localpv/pkg/mgmt/snapshot"
"github.com/openebs/zfs-localpv/pkg/mgmt/volume" "github.com/openebs/zfs-localpv/pkg/mgmt/volume"

2
pkg/generated/clientset/internalclientset/clientset.go
View file

@ -19,7 +19,7 @@ limitations under the License.
package internalclientset package internalclientset
import ( 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" discovery "k8s.io/client-go/discovery"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
flowcontrol "k8s.io/client-go/util/flowcontrol" flowcontrol "k8s.io/client-go/util/flowcontrol"

4
pkg/generated/clientset/internalclientset/fake/clientset_generated.go
View file

@ -20,8 +20,8 @@ package fake
import ( import (
clientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset" clientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset"
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"
fakeopenebsv1alpha1 "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/typed/core/v1alpha1/fake" fakeopenebsv1alpha1 "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/fake"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/discovery" "k8s.io/client-go/discovery"

2
pkg/generated/clientset/internalclientset/fake/register.go
View file

@ -19,7 +19,7 @@ limitations under the License.
package fake package fake
import ( 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" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"

2
pkg/generated/clientset/internalclientset/scheme/register.go
View file

@ -19,7 +19,7 @@ limitations under the License.
package scheme package scheme
import ( 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" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"

0
pkg/generated/clientset/internalclientset/typed/core/v1alpha1/doc.go → pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/doc.go
View file

0
pkg/generated/clientset/internalclientset/typed/core/v1alpha1/fake/doc.go → pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/fake/doc.go
View file

2
pkg/generated/clientset/internalclientset/typed/core/v1alpha1/fake/fake_core_client.go → pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/fake/fake_zfs_client.go
View file

@ -19,7 +19,7 @@ limitations under the License.
package fake package fake
import ( 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" rest "k8s.io/client-go/rest"
testing "k8s.io/client-go/testing" testing "k8s.io/client-go/testing"
) )

2
pkg/generated/clientset/internalclientset/typed/core/v1alpha1/fake/fake_zfssnapshot.go → pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/fake/fake_zfssnapshot.go
View file

@ -19,7 +19,7 @@ limitations under the License.
package fake package fake
import ( 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" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"

2
pkg/generated/clientset/internalclientset/typed/core/v1alpha1/fake/fake_zfsvolume.go → pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/fake/fake_zfsvolume.go
View file

@ -19,7 +19,7 @@ limitations under the License.
package fake package fake
import ( 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" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"

0
pkg/generated/clientset/internalclientset/typed/core/v1alpha1/generated_expansion.go → pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/generated_expansion.go
View file

2
pkg/generated/clientset/internalclientset/typed/core/v1alpha1/core_client.go → pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/zfs_client.go
View file

@ -19,7 +19,7 @@ limitations under the License.
package v1alpha1 package v1alpha1
import ( 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" "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/scheme"
serializer "k8s.io/apimachinery/pkg/runtime/serializer" serializer "k8s.io/apimachinery/pkg/runtime/serializer"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"

2
pkg/generated/clientset/internalclientset/typed/core/v1alpha1/zfssnapshot.go → pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/zfssnapshot.go
View file

@ -21,7 +21,7 @@ package v1alpha1
import ( import (
"time" "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" scheme "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/scheme"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"

2
pkg/generated/clientset/internalclientset/typed/core/v1alpha1/zfsvolume.go → pkg/generated/clientset/internalclientset/typed/zfs/v1alpha1/zfsvolume.go
View file

@ -21,7 +21,7 @@ package v1alpha1
import ( import (
"time" "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" scheme "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/scheme"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"

8
pkg/generated/informer/externalversions/factory.go
View file

@ -24,8 +24,8 @@ import (
time "time" time "time"
internalclientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset" 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" 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" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
@ -172,9 +172,9 @@ type SharedInformerFactory interface {
ForResource(resource schema.GroupVersionResource) (GenericInformer, error) ForResource(resource schema.GroupVersionResource) (GenericInformer, error)
WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool
Openebs() core.Interface Openebs() zfs.Interface
} }
func (f *sharedInformerFactory) Openebs() core.Interface { func (f *sharedInformerFactory) Openebs() zfs.Interface {
return core.New(f, f.namespace, f.tweakListOptions) return zfs.New(f, f.namespace, f.tweakListOptions)
} }

2
pkg/generated/informer/externalversions/generic.go
View file

@ -21,7 +21,7 @@ package externalversions
import ( import (
"fmt" "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" schema "k8s.io/apimachinery/pkg/runtime/schema"
cache "k8s.io/client-go/tools/cache" cache "k8s.io/client-go/tools/cache"
) )

2
pkg/generated/informer/externalversions/core/interface.go → pkg/generated/informer/externalversions/zfs/interface.go
View file

@ -19,8 +19,8 @@ limitations under the License.
package openebs package openebs
import ( import (
v1alpha1 "github.com/openebs/zfs-localpv/pkg/generated/informer/externalversions/core/v1alpha1"
internalinterfaces "github.com/openebs/zfs-localpv/pkg/generated/informer/externalversions/internalinterfaces" 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. // Interface provides access to each of this group's versions.

0
pkg/generated/informer/externalversions/core/v1alpha1/interface.go → pkg/generated/informer/externalversions/zfs/v1alpha1/interface.go
View file

8
pkg/generated/informer/externalversions/core/v1alpha1/zfssnapshot.go → pkg/generated/informer/externalversions/zfs/v1alpha1/zfssnapshot.go
View file

@ -21,10 +21,10 @@ package v1alpha1
import ( import (
time "time" 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" internalclientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset"
internalinterfaces "github.com/openebs/zfs-localpv/pkg/generated/informer/externalversions/internalinterfaces" 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" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
@ -70,7 +70,7 @@ func NewFilteredZFSSnapshotInformer(client internalclientset.Interface, namespac
return client.OpenebsV1alpha1().ZFSSnapshots(namespace).Watch(options) return client.OpenebsV1alpha1().ZFSSnapshots(namespace).Watch(options)
}, },
}, },
&corev1alpha1.ZFSSnapshot{}, &zfsv1alpha1.ZFSSnapshot{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@ -81,7 +81,7 @@ func (f *zFSSnapshotInformer) defaultInformer(client internalclientset.Interface
} }
func (f *zFSSnapshotInformer) Informer() cache.SharedIndexInformer { 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 { func (f *zFSSnapshotInformer) Lister() v1alpha1.ZFSSnapshotLister {

8
pkg/generated/informer/externalversions/core/v1alpha1/zfsvolume.go → pkg/generated/informer/externalversions/zfs/v1alpha1/zfsvolume.go
View file

@ -21,10 +21,10 @@ package v1alpha1
import ( import (
time "time" 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" internalclientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset"
internalinterfaces "github.com/openebs/zfs-localpv/pkg/generated/informer/externalversions/internalinterfaces" 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" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
@ -70,7 +70,7 @@ func NewFilteredZFSVolumeInformer(client internalclientset.Interface, namespace
return client.OpenebsV1alpha1().ZFSVolumes(namespace).Watch(options) return client.OpenebsV1alpha1().ZFSVolumes(namespace).Watch(options)
}, },
}, },
&corev1alpha1.ZFSVolume{}, &zfsv1alpha1.ZFSVolume{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@ -81,7 +81,7 @@ func (f *zFSVolumeInformer) defaultInformer(client internalclientset.Interface,
} }
func (f *zFSVolumeInformer) Informer() cache.SharedIndexInformer { 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 { func (f *zFSVolumeInformer) Lister() v1alpha1.ZFSVolumeLister {

0
pkg/generated/lister/core/v1alpha1/expansion_generated.go → pkg/generated/lister/zfs/v1alpha1/expansion_generated.go
View file

2
pkg/generated/lister/core/v1alpha1/zfssnapshot.go → pkg/generated/lister/zfs/v1alpha1/zfssnapshot.go
View file

@ -19,7 +19,7 @@ limitations under the License.
package v1alpha1 package v1alpha1
import ( 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/api/errors"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"

2
pkg/generated/lister/core/v1alpha1/zfsvolume.go → pkg/generated/lister/zfs/v1alpha1/zfsvolume.go
View file

@ -19,7 +19,7 @@ limitations under the License.
package v1alpha1 package v1alpha1
import ( 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/api/errors"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"

2
pkg/mgmt/snapshot/builder.go
View file

@ -22,7 +22,7 @@ import (
clientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset" clientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset"
openebsScheme "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/scheme" openebsScheme "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/scheme"
informers "github.com/openebs/zfs-localpv/pkg/generated/informer/externalversions" 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" corev1 "k8s.io/api/core/v1"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/kubernetes/scheme"

2
pkg/mgmt/snapshot/snapshot.go
View file

@ -22,7 +22,7 @@ import (
"github.com/Sirupsen/logrus" "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" zfs "github.com/openebs/zfs-localpv/pkg/zfs"
k8serror "k8s.io/apimachinery/pkg/api/errors" k8serror "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/runtime"

2
pkg/mgmt/volume/builder.go
View file

@ -22,7 +22,7 @@ import (
clientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset" clientset "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset"
openebsScheme "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/scheme" openebsScheme "github.com/openebs/zfs-localpv/pkg/generated/clientset/internalclientset/scheme"
informers "github.com/openebs/zfs-localpv/pkg/generated/informer/externalversions" 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" corev1 "k8s.io/api/core/v1"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/kubernetes/scheme"

2
pkg/mgmt/volume/volume.go
View file

@ -22,7 +22,7 @@ import (
"github.com/Sirupsen/logrus" "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" zfs "github.com/openebs/zfs-localpv/pkg/zfs"
k8serror "k8s.io/apimachinery/pkg/api/errors" k8serror "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/runtime"

2
pkg/zfs/mount.go
View file

@ -5,7 +5,7 @@ import (
"os" "os"
"github.com/Sirupsen/logrus" "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/codes"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
"k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/util/mount"

2
pkg/zfs/resize.go
View file

@ -18,7 +18,7 @@ package zfs
import ( import (
"github.com/Sirupsen/logrus" "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" "k8s.io/kubernetes/pkg/util/mount"
"os/exec" "os/exec"
) )

2
pkg/zfs/volume.go
View file

@ -19,7 +19,7 @@ import (
"os" "os"
"strconv" "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/snapbuilder"
"github.com/openebs/zfs-localpv/pkg/builder/volbuilder" "github.com/openebs/zfs-localpv/pkg/builder/volbuilder"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
pkg/zfs/zfs_util.go
View file

@ -21,7 +21,7 @@ import (
"path/filepath" "path/filepath"
"github.com/Sirupsen/logrus" "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 // zfs related constants

2
tests/utils.go
View file

@ -21,7 +21,7 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "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/pkg/zfs"
"github.com/openebs/zfs-localpv/tests/container" "github.com/openebs/zfs-localpv/tests/container"
"github.com/openebs/zfs-localpv/tests/deploy" "github.com/openebs/zfs-localpv/tests/deploy"