From 98db1c09163210cdffbc1b3d363af17045c6ff18 Mon Sep 17 00:00:00 2001 From: bharathpgp Date: Sat, 13 Oct 2018 15:03:16 +0530 Subject: [PATCH 1/6] feat(client-wrapper): Adds support for CVR Adds Get, List, Delete support for CStorVolumeReplicas Custom resource Signed-off-by: bharathpgp --- utils/k8s/openebscrd.go | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/utils/k8s/openebscrd.go b/utils/k8s/openebscrd.go index 4388eb4..a9b7070 100644 --- a/utils/k8s/openebscrd.go +++ b/utils/k8s/openebscrd.go @@ -40,3 +40,26 @@ func (k8s K8S) DeleteStoragePoolClaim(spcName string) error { spcClient := k8s.OpenebsClientSet.Openebs().StoragePoolClaims() return spcClient.Delete(spcName, &meta_v1.DeleteOptions{}) } + +// GetCStorVolumeReplica returns the CStorVolumeReplica object for given cvrName, namespace. +// :return: *openebs_v1.CStorVolumeReplica: Pointer to CStorVolumeReplica objects. +func (k8s K8S) GetCStorVolumeReplica(cvrName, namespace string) (*openebs_v1.CStorVolumeReplica, error) { + cvrClient := k8s.OpenebsClientSet.Openebs().CStorVolumeReplicas(namespace) + return cvrClient.Get(cvrName, meta_v1.GetOptions{}) +} + +// ListCStorVolumeReplica returns all the CStorVolumeReplica objects for given namespace +func (k8s K8S) ListCStorVolumeReplica(namespace string) ([]openebs_v1.CStorVolumeReplica, error) { + cvrClient := k8s.OpenebsClientSet.Openebs().CStorVolumeReplicas(namespace) + cvrs, err := cvrClient.List(meta_v1.ListOptions{}) + if err != nil { + return nil, err + } + return cvrs.Items, nil +} + +// DeleteCStorVolumeReplica deletes a CStorVolumeReplica with the given cvrName, namespace +func (k8s K8S) DeleteCStorVolumeReplica(cvrName, namespace string) error { + cvrClient := k8s.OpenebsClientSet.Openebs().CStorVolumeReplicas(namespace) + return cvrClient.Delete(cvrName, &meta_v1.DeleteOptions{}) +} From 19e143e44706fac6d1170e4483f84c165d110e2f Mon Sep 17 00:00:00 2001 From: bharathpgp Date: Sat, 13 Oct 2018 16:32:30 +0530 Subject: [PATCH 2/6] fix(client-wrapper): Refactor ListCStorVolumeReplica and use OpenebsV1alpha1 insted of Openebs Signed-off-by: bharathpgp --- utils/k8s/openebscrd.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/utils/k8s/openebscrd.go b/utils/k8s/openebscrd.go index a9b7070..7b0e7d8 100644 --- a/utils/k8s/openebscrd.go +++ b/utils/k8s/openebscrd.go @@ -44,22 +44,18 @@ func (k8s K8S) DeleteStoragePoolClaim(spcName string) error { // GetCStorVolumeReplica returns the CStorVolumeReplica object for given cvrName, namespace. // :return: *openebs_v1.CStorVolumeReplica: Pointer to CStorVolumeReplica objects. func (k8s K8S) GetCStorVolumeReplica(cvrName, namespace string) (*openebs_v1.CStorVolumeReplica, error) { - cvrClient := k8s.OpenebsClientSet.Openebs().CStorVolumeReplicas(namespace) + cvrClient := k8s.OpenebsClientSet.OpenebsV1alpha1().CStorVolumeReplicas(namespace) return cvrClient.Get(cvrName, meta_v1.GetOptions{}) } -// ListCStorVolumeReplica returns all the CStorVolumeReplica objects for given namespace -func (k8s K8S) ListCStorVolumeReplica(namespace string) ([]openebs_v1.CStorVolumeReplica, error) { - cvrClient := k8s.OpenebsClientSet.Openebs().CStorVolumeReplicas(namespace) - cvrs, err := cvrClient.List(meta_v1.ListOptions{}) - if err != nil { - return nil, err - } - return cvrs.Items, nil +// ListCStorVolumeReplica returns all the CStorVolumeReplicaList for given namespace +func (k8s K8S) ListCStorVolumeReplica(namespace string) (*openebs_v1.CStorVolumeReplicaList, error) { + cvrClient := k8s.OpenebsClientSet.OpenebsV1alpha1().CStorVolumeReplicas(namespace) + return cvrClient.List(meta_v1.ListOptions{}) } // DeleteCStorVolumeReplica deletes a CStorVolumeReplica with the given cvrName, namespace func (k8s K8S) DeleteCStorVolumeReplica(cvrName, namespace string) error { - cvrClient := k8s.OpenebsClientSet.Openebs().CStorVolumeReplicas(namespace) + cvrClient := k8s.OpenebsClientSet.OpenebsV1alpha1().CStorVolumeReplicas(namespace) return cvrClient.Delete(cvrName, &meta_v1.DeleteOptions{}) } From 9d5d54145f8d10abf4a0321046721ab0b80c7c65 Mon Sep 17 00:00:00 2001 From: bharathpgp Date: Sun, 14 Oct 2018 02:06:10 +0530 Subject: [PATCH 3/6] fix(client-wrapper): Modify comment Signed-off-by: bharathpgp --- utils/k8s/openebscrd.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/utils/k8s/openebscrd.go b/utils/k8s/openebscrd.go index 7b0e7d8..44d6d96 100644 --- a/utils/k8s/openebscrd.go +++ b/utils/k8s/openebscrd.go @@ -41,8 +41,7 @@ func (k8s K8S) DeleteStoragePoolClaim(spcName string) error { return spcClient.Delete(spcName, &meta_v1.DeleteOptions{}) } -// GetCStorVolumeReplica returns the CStorVolumeReplica object for given cvrName, namespace. -// :return: *openebs_v1.CStorVolumeReplica: Pointer to CStorVolumeReplica objects. +// GetCStorVolumeReplica returns the CStorVolumeReplica object for given cvrName and namespace func (k8s K8S) GetCStorVolumeReplica(cvrName, namespace string) (*openebs_v1.CStorVolumeReplica, error) { cvrClient := k8s.OpenebsClientSet.OpenebsV1alpha1().CStorVolumeReplicas(namespace) return cvrClient.Get(cvrName, meta_v1.GetOptions{}) @@ -54,7 +53,7 @@ func (k8s K8S) ListCStorVolumeReplica(namespace string) (*openebs_v1.CStorVolume return cvrClient.List(meta_v1.ListOptions{}) } -// DeleteCStorVolumeReplica deletes a CStorVolumeReplica with the given cvrName, namespace +// DeleteCStorVolumeReplica deletes a CStorVolumeReplica with the given cvrName and namespace func (k8s K8S) DeleteCStorVolumeReplica(cvrName, namespace string) error { cvrClient := k8s.OpenebsClientSet.OpenebsV1alpha1().CStorVolumeReplicas(namespace) return cvrClient.Delete(cvrName, &meta_v1.DeleteOptions{}) From 653deb6308f69b930655964a430e6278adb43291 Mon Sep 17 00:00:00 2001 From: Bharath Natarajan Date: Sun, 14 Oct 2018 17:37:07 +0530 Subject: [PATCH 4/6] Add options as argument and resolve conflict as well. Signed-off-by: Bharath Natarajan --- utils/k8s/openebscrd.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/utils/k8s/openebscrd.go b/utils/k8s/openebscrd.go index 57a996a..01361b2 100644 --- a/utils/k8s/openebscrd.go +++ b/utils/k8s/openebscrd.go @@ -74,20 +74,20 @@ func (k8s K8S) DeleteStoragePool(storagePoolName string, opts *meta_v1.DeleteOpt return storagePoolClient.Delete(storagePoolName, opts) } -// GetCStorVolumeReplica returns the CStorVolumeReplica object for given cvrName and namespace -func (k8s K8S) GetCStorVolumeReplica(cvrName, namespace string) (*openebs_v1.CStorVolumeReplica, error) { +// GetCStorVolumeReplica returns the CStorVolumeReplica object for given CStorVolumeReplicaName and namespace +func (k8s K8S) GetCStorVolumeReplica(cvrName, namespace string, options meta_v1.GetOptions) (*openebs_v1.CStorVolumeReplica, error) { cvrClient := k8s.OpenebsClientSet.OpenebsV1alpha1().CStorVolumeReplicas(namespace) - return cvrClient.Get(cvrName, meta_v1.GetOptions{}) + return cvrClient.Get(cvrName, options) } // ListCStorVolumeReplica returns all the CStorVolumeReplicaList for given namespace -func (k8s K8S) ListCStorVolumeReplica(namespace string) (*openebs_v1.CStorVolumeReplicaList, error) { +func (k8s K8S) ListCStorVolumeReplica(namespace string, options meta_v1.ListOptions) (*openebs_v1.CStorVolumeReplicaList, error) { cvrClient := k8s.OpenebsClientSet.OpenebsV1alpha1().CStorVolumeReplicas(namespace) - return cvrClient.List(meta_v1.ListOptions{}) + return cvrClient.List(options) } -// DeleteCStorVolumeReplica deletes a CStorVolumeReplica with the given cvrName and namespace -func (k8s K8S) DeleteCStorVolumeReplica(cvrName, namespace string) error { +// DeleteCStorVolumeReplica deletes a CStorVolumeReplica with the given CStorVolumeReplicaName and namespace +func (k8s K8S) DeleteCStorVolumeReplica(cvrName, namespace string, options *meta_v1.DeleteOptions) error { cvrClient := k8s.OpenebsClientSet.OpenebsV1alpha1().CStorVolumeReplicas(namespace) - return cvrClient.Delete(cvrName, &meta_v1.DeleteOptions{}) + return cvrClient.Delete(cvrName, options) } From acf2219f1b30b778e568cd36561cba5f6912fc9b Mon Sep 17 00:00:00 2001 From: Bharath Natarajan Date: Mon, 15 Oct 2018 18:24:41 +0530 Subject: [PATCH 5/6] Add support to create CStoreVolumeReplica. #67 Signed-off-by: Bharath Natarajan --- utils/k8s/openebscrd.go | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/utils/k8s/openebscrd.go b/utils/k8s/openebscrd.go index 91fa62c..bdd2572 100644 --- a/utils/k8s/openebscrd.go +++ b/utils/k8s/openebscrd.go @@ -92,20 +92,26 @@ func (k8s K8S) DeleteDisk(diskName string, opts *meta_v1.DeleteOptions) error { return diskClient.Disks().Delete(diskName, opts) } -// GetCStorVolumeReplica returns the CStorVolumeReplica object for given CStorVolumeReplicaName and namespace +// CreateCStoreVolumeReplica creats CStoreVolumeReplica for given CStoreVolumeReplica object and namespace. +func (k8s K8S) CreateCStoreVolumeReplica(namespace string, cStorVolumeReplicas *openebs_v1.CStorVolumeReplica) (*openebs_v1.CStorVolumeReplica, error) { + cStorVolumeReplicaClient := k8s.OpenebsClientSet.OpenebsV1alpha1().CStorVolumeReplicas(namespace) + return cStorVolumeReplicaClient.Create(cStorVolumeReplicas) +} + +// GetCStorVolumeReplica returns the CStorVolumeReplica object for given CStorVolumeReplicaName and namespace. func (k8s K8S) GetCStorVolumeReplica(cvrName, namespace string, opts meta_v1.GetOptions) (*openebs_v1.CStorVolumeReplica, error) { - cvrClient := k8s.OpenebsClientSet.OpenebsV1alpha1().CStorVolumeReplicas(namespace) - return cvrClient.Get(cvrName, opts) + cStorVolumeReplicaClient := k8s.OpenebsClientSet.OpenebsV1alpha1().CStorVolumeReplicas(namespace) + return cStorVolumeReplicaClient.Get(cvrName, opts) } -// ListCStorVolumeReplica returns all the CStorVolumeReplicaList for given namespace +// ListCStorVolumeReplica returns all the CStorVolumeReplicaList for given namespace. func (k8s K8S) ListCStorVolumeReplica(namespace string, opts meta_v1.ListOptions) (*openebs_v1.CStorVolumeReplicaList, error) { - cvrClient := k8s.OpenebsClientSet.OpenebsV1alpha1().CStorVolumeReplicas(namespace) - return cvrClient.List(opts) + cStorVolumeReplicaClient := k8s.OpenebsClientSet.OpenebsV1alpha1().CStorVolumeReplicas(namespace) + return cStorVolumeReplicaClient.List(opts) } -// DeleteCStorVolumeReplica deletes a CStorVolumeReplica with the given CStorVolumeReplicaName and namespace +// DeleteCStorVolumeReplica deletes a CStorVolumeReplica with the given CStorVolumeReplicaName and namespace. func (k8s K8S) DeleteCStorVolumeReplica(cvrName, namespace string, opts *meta_v1.DeleteOptions) error { - cvrClient := k8s.OpenebsClientSet.OpenebsV1alpha1().CStorVolumeReplicas(namespace) - return cvrClient.Delete(cvrName, opts) + cStorVolumeReplicaClient := k8s.OpenebsClientSet.OpenebsV1alpha1().CStorVolumeReplicas(namespace) + return cStorVolumeReplicaClient.Delete(cvrName, opts) } From 965dabacd0641796de0dbd732b595759993c271e Mon Sep 17 00:00:00 2001 From: Bharath Natarajan Date: Tue, 16 Oct 2018 15:11:06 +0530 Subject: [PATCH 6/6] fix(typo) #67 Signed-off-by: Bharath Natarajan --- utils/k8s/openebscrd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/k8s/openebscrd.go b/utils/k8s/openebscrd.go index 10e5c8f..9b4cc82 100644 --- a/utils/k8s/openebscrd.go +++ b/utils/k8s/openebscrd.go @@ -108,7 +108,7 @@ func (k8s K8S) DeleteDisk(diskName string, opts *meta_v1.DeleteOptions) error { return diskClient.Disks().Delete(diskName, opts) } -// CreateCStoreVolumeReplica creats CStoreVolumeReplica for given CStoreVolumeReplica object and namespace. +// CreateCStoreVolumeReplica creates CStoreVolumeReplica for given CStoreVolumeReplica object and namespace. func (k8s K8S) CreateCStoreVolumeReplica(namespace string, cStorVolumeReplicas *openebs_v1.CStorVolumeReplica) (*openebs_v1.CStorVolumeReplica, error) { cStorVolumeReplicaClient := k8s.OpenebsClientSet.OpenebsV1alpha1().CStorVolumeReplicas(namespace) return cStorVolumeReplicaClient.Create(cStorVolumeReplicas)