chore(mod): update jiva to v1 (#142)

Signed-off-by: shubham <[email protected]>

Author: shubham14bajpai

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/google/go-cmp v0.5.4
 	github.com/kubernetes-csi/external-snapshotter/client/v4 v4.0.0
 	github.com/openebs/api/v3 v3.0.0-20211116062351-ecd9a8a61d3e
-	github.com/openebs/jiva-operator v1.12.2-0.20210305095718-9ceaccf89e9d
+	github.com/openebs/jiva-operator v1.12.2-0.20211126122511-b8b205d44bfa
 	github.com/openebs/maya v1.12.1-0.20210308113344-5c43ada4c9e2
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/cobra v1.1.1

go.sum

@@ -42,10 +42,8 @@ github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuN
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -107,7 +105,6 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn
 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc=
 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
-github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk=
 github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -142,19 +139,15 @@ github.com/go-logr/zapr v0.2.0 h1:v6Ji8yBW77pva6NkJKQdHLAJKrIJKRHz0RXwPqCHSR4=
 github.com/go-logr/zapr v0.2.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU=
 github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
-github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
 github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
-github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o=
 github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
 github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
 github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
-github.com/go-openapi/spec v0.19.4 h1:ixzUSnHTd6hCemgtAJgluaTSGYpLNpJY4mA2DIkdOAo=
 github.com/go-openapi/spec v0.19.4/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
 github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
 github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
@@ -294,7 +287,6 @@ github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP
 github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
 github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
@@ -347,8 +339,8 @@ github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/openebs/api/v3 v3.0.0-20211116062351-ecd9a8a61d3e h1:7k/1G9XfczLmBuCP8hIqcCBMZrJFjmHZaJirzFq5lxY=
 github.com/openebs/api/v3 v3.0.0-20211116062351-ecd9a8a61d3e/go.mod h1:GQFzH6s1YHJElE8YIFcyLATk8+wOIHo9ZoN5tAtUFCo=
-github.com/openebs/jiva-operator v1.12.2-0.20210305095718-9ceaccf89e9d h1:E0aitfg5/zKtHQWusIb5oN2JPmvsqlY/EmDch0OjGAk=
-github.com/openebs/jiva-operator v1.12.2-0.20210305095718-9ceaccf89e9d/go.mod h1:5oMQaMQKa0swN1hJnAP7CEMI/MOLVz0S2Mcu0H/l0oc=
+github.com/openebs/jiva-operator v1.12.2-0.20211126122511-b8b205d44bfa h1:go7MbV7IpNhVKOd6/hIiVn/n1oE4LtqtmV7fErxB2nk=
+github.com/openebs/jiva-operator v1.12.2-0.20211126122511-b8b205d44bfa/go.mod h1:Iwadw0YAXb7FM6lWcJZ8MgybVAu0glCEXfJtdigWS8g=
 github.com/openebs/lib-csi v0.3.0/go.mod h1:uruyzJiTwRoytQPQXOf4spaezn1cjkiAXjvFGw6aY/8=
 github.com/openebs/maya v1.12.1-0.20210308113344-5c43ada4c9e2 h1:m88pal/racL0GyejsavIHSUwCAnyertu68+SlJQiz+M=
 github.com/openebs/maya v1.12.1-0.20210308113344-5c43ada4c9e2/go.mod h1:J3DC3bzJ346KPhstfae02FfIpe8ikpk/4xV1iSqKLXQ=

pkg/migrate/cstor/backup_restore.go

@@ -46,7 +46,14 @@ func TranslateBackupToV1(oldBackup openebsio.CStorBackup) *cstor.CStorBackup {
 // TranslateRestoreToV1 translates v1alpha resources to v1
 func TranslateRestoreToV1(oldRestore openebsio.CStorRestore) *cstor.CStorRestore {
 	newRestore := &cstor.CStorRestore{}
-	newRestore.ObjectMeta = oldRestore.ObjectMeta
+	newRestore.ObjectMeta = metav1.ObjectMeta{
+		Name:            oldRestore.Name,
+		Namespace:       oldRestore.Namespace,
+		Labels:          oldRestore.Labels,
+		Annotations:     oldRestore.Annotations,
+		Finalizers:      oldRestore.Finalizers,
+		OwnerReferences: oldRestore.OwnerReferences,
+	}
 	newRestore.Spec = cstor.CStorRestoreSpec{
 		RestoreName:   oldRestore.Spec.RestoreName,
 		VolumeName:    oldRestore.Spec.VolumeName,
@@ -64,7 +71,14 @@ func TranslateRestoreToV1(oldRestore openebsio.CStorRestore) *cstor.CStorRestore
 // TranslateCompletedBackupToV1 translates v1alpha resources to v1
 func TranslateCompletedBackupToV1(oldCompletedBackup openebsio.CStorCompletedBackup) *cstor.CStorCompletedBackup {
 	newCompletedBackup := &cstor.CStorCompletedBackup{}
-	newCompletedBackup.ObjectMeta = oldCompletedBackup.ObjectMeta
+	newCompletedBackup.ObjectMeta = metav1.ObjectMeta{
+		Name:            oldCompletedBackup.Name,
+		Namespace:       oldCompletedBackup.Namespace,
+		Labels:          oldCompletedBackup.Labels,
+		Annotations:     oldCompletedBackup.Annotations,
+		Finalizers:      oldCompletedBackup.Finalizers,
+		OwnerReferences: oldCompletedBackup.OwnerReferences,
+	}
 	newCompletedBackup.Spec = cstor.CStorCompletedBackupSpec{
 		BackupName:         oldCompletedBackup.Spec.BackupName,
 		VolumeName:         oldCompletedBackup.Spec.VolumeName,

pkg/upgrade/patch/jivavolume.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 
 	// clientset "github.com/openebs/api/v3/pkg/client/clientset/versioned"
-	jv "github.com/openebs/jiva-operator/pkg/apis/openebs/v1alpha1"
+	jv "github.com/openebs/jiva-operator/pkg/apis/openebs/v1"
 	"github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog"

pkg/upgrade/upgrader/jiva_volume.go

@@ -20,7 +20,7 @@ import (
 	"time"
 
 	v1Alpha1API "github.com/openebs/api/v3/pkg/apis/openebs.io/v1alpha1"
-	jv "github.com/openebs/jiva-operator/pkg/apis/openebs/v1alpha1"
+	jv "github.com/openebs/jiva-operator/pkg/apis/openebs/v1"
 	"github.com/openebs/upgrade/pkg/upgrade/patch"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"

pkg/version/util.go

@@ -27,7 +27,7 @@ var (
 		"2.4.0": true, "2.4.1": true, "2.5.0": true, "2.6.0": true,
 		"2.7.0": true, "2.8.0": true, "2.9.0": true, "2.10.0": true,
 		"2.10.1": true, "2.11.0": true, "2.12.0": true, "2.12.1": true,
-		"2.12.2": true,
+		"2.12.2": true, "3.0.0": true,
 	}
 	validDesiredVersion = strings.Split(GetVersion(), "-")[0]
 )