From fc0fef721d63416c84f0fef64734e072fbb4ee3b Mon Sep 17 00:00:00 2001 From: Guy Margalit Date: Mon, 17 May 2021 22:41:07 +0300 Subject: [PATCH] trying to fix #625 - update go.mod to /v5 Signed-off-by: Guy Margalit --- .gitignore | 4 +- cmd/manager/main.go | 2 +- cmd/version/main.go | 2 +- go.mod | 2 +- main.go | 2 +- pkg/apis/addtoscheme_noobaa_v1alpha1.go | 2 +- pkg/backingstore/backingstore.go | 12 +++--- pkg/backingstore/reconciler.go | 12 +++--- pkg/bucket/bucket.go | 6 +-- pkg/bucketclass/bucketclass.go | 8 ++-- pkg/bucketclass/reconciler.go | 41 ++++++++++--------- pkg/bundler/bundler.go | 4 +- pkg/cli/cli.go | 30 +++++++------- pkg/cli/cli_test.go | 2 +- pkg/controller/add_backingstore.go | 2 +- pkg/controller/add_bucketclass.go | 2 +- pkg/controller/add_cephcluster.go | 2 +- pkg/controller/add_namespacestore.go | 2 +- pkg/controller/add_noobaa.go | 2 +- pkg/controller/add_obc.go | 2 +- .../backingstore/backingstore_controller.go | 6 +-- .../bucketclass/bucketclass_controller.go | 6 +-- .../cephcluster/cephcluster_controller.go | 10 ++--- .../namespacestore_controller.go | 6 +-- pkg/controller/noobaa/noobaa_controller.go | 10 ++--- pkg/controller/obc/obc_controller.go | 2 +- pkg/crd/crd.go | 4 +- pkg/diagnose/diagnose.go | 6 +-- pkg/install/install.go | 16 ++++---- pkg/namespacestore/namespacestore.go | 12 +++--- pkg/namespacestore/reconciler.go | 12 +++--- pkg/nb/router.go | 2 +- pkg/nb/rpc.go | 4 +- pkg/nb/rpc_http.go | 2 +- pkg/obc/obc.go | 12 +++--- pkg/obc/provisioner.go | 10 ++--- pkg/olm/olm.go | 14 +++---- pkg/operator/manager.go | 12 +++--- pkg/operator/operator.go | 8 ++-- pkg/options/options.go | 4 +- pkg/pvstore/pvstore.go | 6 +-- pkg/system/cmd_api_call.go | 4 +- pkg/system/cmd_ui.go | 4 +- pkg/system/phase1_verifying.go | 6 +-- pkg/system/phase2_creating.go | 6 +-- pkg/system/phase3_connecting.go | 4 +- pkg/system/phase4_configuring.go | 10 ++--- pkg/system/reconciler.go | 12 +++--- pkg/system/system.go | 12 +++--- pkg/util/util.go | 26 ++++++------ pkg/version/version.go | 6 +-- test/rpcbench/rpcbench.go | 2 +- 52 files changed, 200 insertions(+), 197 deletions(-) diff --git a/.gitignore b/.gitignore index d463afbdd..624274e5b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,6 @@ build-releases/ /noobaa-operator # visual studio code intellisense configuration -.vscode/ \ No newline at end of file +.vscode/ + +*.IGNORE diff --git a/cmd/manager/main.go b/cmd/manager/main.go index b70f2fa00..def4d968e 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -7,7 +7,7 @@ package main //go:generate make gen import ( - "github.com/noobaa/noobaa-operator/v2/pkg/cli" + "github.com/noobaa/noobaa-operator/v5/pkg/cli" ) func main() { diff --git a/cmd/version/main.go b/cmd/version/main.go index 8a5438ae8..49d4aa1b5 100644 --- a/cmd/version/main.go +++ b/cmd/version/main.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/noobaa/noobaa-operator/v2/version" + "github.com/noobaa/noobaa-operator/v5/version" ) func main() { diff --git a/go.mod b/go.mod index f3190cfed..e771f7cce 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/noobaa/noobaa-operator/v2 +module github.com/noobaa/noobaa-operator/v5 go 1.16 diff --git a/main.go b/main.go index cbf617801..d09be537f 100644 --- a/main.go +++ b/main.go @@ -6,7 +6,7 @@ package main //go:generate make gen import ( - "github.com/noobaa/noobaa-operator/v2/pkg/cli" + "github.com/noobaa/noobaa-operator/v5/pkg/cli" ) func main() { diff --git a/pkg/apis/addtoscheme_noobaa_v1alpha1.go b/pkg/apis/addtoscheme_noobaa_v1alpha1.go index aef6edcf3..12cdec54d 100644 --- a/pkg/apis/addtoscheme_noobaa_v1alpha1.go +++ b/pkg/apis/addtoscheme_noobaa_v1alpha1.go @@ -1,7 +1,7 @@ package apis import ( - "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" ) func init() { diff --git a/pkg/backingstore/backingstore.go b/pkg/backingstore/backingstore.go index bf21ccd2c..1e990970a 100644 --- a/pkg/backingstore/backingstore.go +++ b/pkg/backingstore/backingstore.go @@ -7,12 +7,12 @@ import ( "strings" "time" - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/bundle" - "github.com/noobaa/noobaa-operator/v2/pkg/nb" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/system" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/bundle" + "github.com/noobaa/noobaa-operator/v5/pkg/nb" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/system" + "github.com/noobaa/noobaa-operator/v5/pkg/util" "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" diff --git a/pkg/backingstore/reconciler.go b/pkg/backingstore/reconciler.go index 4502fb2ce..e9cb13b54 100644 --- a/pkg/backingstore/reconciler.go +++ b/pkg/backingstore/reconciler.go @@ -12,12 +12,12 @@ import ( "strings" "time" - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/bundle" - "github.com/noobaa/noobaa-operator/v2/pkg/nb" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/system" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/bundle" + "github.com/noobaa/noobaa-operator/v5/pkg/nb" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/system" + "github.com/noobaa/noobaa-operator/v5/pkg/util" cephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1" "github.com/sirupsen/logrus" diff --git a/pkg/bucket/bucket.go b/pkg/bucket/bucket.go index cf963b8f0..31dd0b417 100644 --- a/pkg/bucket/bucket.go +++ b/pkg/bucket/bucket.go @@ -4,9 +4,9 @@ import ( "fmt" "log" - "github.com/noobaa/noobaa-operator/v2/pkg/nb" - "github.com/noobaa/noobaa-operator/v2/pkg/system" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + "github.com/noobaa/noobaa-operator/v5/pkg/nb" + "github.com/noobaa/noobaa-operator/v5/pkg/system" + "github.com/noobaa/noobaa-operator/v5/pkg/util" "github.com/spf13/cobra" ) diff --git a/pkg/bucketclass/bucketclass.go b/pkg/bucketclass/bucketclass.go index 8af052d59..f2a14c9c0 100644 --- a/pkg/bucketclass/bucketclass.go +++ b/pkg/bucketclass/bucketclass.go @@ -6,10 +6,10 @@ import ( "log" "time" - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/bundle" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/bundle" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/util" "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/bucketclass/reconciler.go b/pkg/bucketclass/reconciler.go index f78dd858c..cfac3ec28 100644 --- a/pkg/bucketclass/reconciler.go +++ b/pkg/bucketclass/reconciler.go @@ -5,12 +5,12 @@ import ( "fmt" "time" - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/bundle" - "github.com/noobaa/noobaa-operator/v2/pkg/nb" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/system" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/bundle" + "github.com/noobaa/noobaa-operator/v5/pkg/nb" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/system" + "github.com/noobaa/noobaa-operator/v5/pkg/util" "github.com/sirupsen/logrus" corev1 "k8s.io/api/core/v1" @@ -361,28 +361,29 @@ func (r *Reconciler) updateNamespaceBucketClass(bucketNames []string) error { var readResources []nb.NamespaceResourceFullConfig createBucketParams := &nb.CreateBucketParams{} createBucketParams.Namespace = &nb.NamespaceBucketInfo{} - + if namespacePolicyType == nbv1.NSBucketClassTypeSingle { - createBucketParams.Namespace.WriteResource = nb.NamespaceResourceFullConfig{ - Resource: r.BucketClass.Spec.NamespacePolicy.Single.Resource } - createBucketParams.Namespace.ReadResources = append(readResources, nb.NamespaceResourceFullConfig{ - Resource: r.BucketClass.Spec.NamespacePolicy.Single.Resource }) - + createBucketParams.Namespace.WriteResource = nb.NamespaceResourceFullConfig{ + Resource: r.BucketClass.Spec.NamespacePolicy.Single.Resource} + createBucketParams.Namespace.ReadResources = append(readResources, nb.NamespaceResourceFullConfig{ + Resource: r.BucketClass.Spec.NamespacePolicy.Single.Resource}) + } else if namespacePolicyType == nbv1.NSBucketClassTypeMulti { - createBucketParams.Namespace.WriteResource = nb.NamespaceResourceFullConfig{ - Resource: r.BucketClass.Spec.NamespacePolicy.Multi.WriteResource } + createBucketParams.Namespace.WriteResource = nb.NamespaceResourceFullConfig{ + Resource: r.BucketClass.Spec.NamespacePolicy.Multi.WriteResource} for i := range r.BucketClass.Spec.NamespacePolicy.Multi.ReadResources { rr := r.BucketClass.Spec.NamespacePolicy.Multi.ReadResources[i] - readResources = append(readResources, nb.NamespaceResourceFullConfig{ Resource: rr }) } + readResources = append(readResources, nb.NamespaceResourceFullConfig{Resource: rr}) + } createBucketParams.Namespace.ReadResources = readResources - + } else if namespacePolicyType == nbv1.NSBucketClassTypeCache { - createBucketParams.Namespace.WriteResource = nb.NamespaceResourceFullConfig{ - Resource: r.BucketClass.Spec.NamespacePolicy.Cache.HubResource } - createBucketParams.Namespace.ReadResources = append(readResources, nb.NamespaceResourceFullConfig{ - Resource: r.BucketClass.Spec.NamespacePolicy.Cache.HubResource }) + createBucketParams.Namespace.WriteResource = nb.NamespaceResourceFullConfig{ + Resource: r.BucketClass.Spec.NamespacePolicy.Cache.HubResource} + createBucketParams.Namespace.ReadResources = append(readResources, nb.NamespaceResourceFullConfig{ + Resource: r.BucketClass.Spec.NamespacePolicy.Cache.HubResource}) createBucketParams.Namespace.Caching = &nb.CacheSpec{TTLMs: r.BucketClass.Spec.NamespacePolicy.Cache.Caching.TTL} //cachePrefix := r.BucketClass.Spec.NamespacePolicy.Cache.Prefix } diff --git a/pkg/bundler/bundler.go b/pkg/bundler/bundler.go index 43acbb2d8..8d1cca101 100644 --- a/pkg/bundler/bundler.go +++ b/pkg/bundler/bundler.go @@ -11,8 +11,8 @@ import ( "regexp" "strings" - "github.com/noobaa/noobaa-operator/v2/pkg/util" - "github.com/noobaa/noobaa-operator/v2/version" + "github.com/noobaa/noobaa-operator/v5/pkg/util" + "github.com/noobaa/noobaa-operator/v5/version" "github.com/sirupsen/logrus" ) diff --git a/pkg/cli/cli.go b/pkg/cli/cli.go index 030b02a2a..70d5d26db 100644 --- a/pkg/cli/cli.go +++ b/pkg/cli/cli.go @@ -7,21 +7,21 @@ import ( "os" "time" - "github.com/noobaa/noobaa-operator/v2/pkg/backingstore" - "github.com/noobaa/noobaa-operator/v2/pkg/bucket" - "github.com/noobaa/noobaa-operator/v2/pkg/bucketclass" - "github.com/noobaa/noobaa-operator/v2/pkg/crd" - "github.com/noobaa/noobaa-operator/v2/pkg/diagnose" - "github.com/noobaa/noobaa-operator/v2/pkg/install" - "github.com/noobaa/noobaa-operator/v2/pkg/namespacestore" - "github.com/noobaa/noobaa-operator/v2/pkg/obc" - "github.com/noobaa/noobaa-operator/v2/pkg/olm" - "github.com/noobaa/noobaa-operator/v2/pkg/operator" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/pvstore" - "github.com/noobaa/noobaa-operator/v2/pkg/system" - "github.com/noobaa/noobaa-operator/v2/pkg/util" - "github.com/noobaa/noobaa-operator/v2/pkg/version" + "github.com/noobaa/noobaa-operator/v5/pkg/backingstore" + "github.com/noobaa/noobaa-operator/v5/pkg/bucket" + "github.com/noobaa/noobaa-operator/v5/pkg/bucketclass" + "github.com/noobaa/noobaa-operator/v5/pkg/crd" + "github.com/noobaa/noobaa-operator/v5/pkg/diagnose" + "github.com/noobaa/noobaa-operator/v5/pkg/install" + "github.com/noobaa/noobaa-operator/v5/pkg/namespacestore" + "github.com/noobaa/noobaa-operator/v5/pkg/obc" + "github.com/noobaa/noobaa-operator/v5/pkg/olm" + "github.com/noobaa/noobaa-operator/v5/pkg/operator" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/pvstore" + "github.com/noobaa/noobaa-operator/v5/pkg/system" + "github.com/noobaa/noobaa-operator/v5/pkg/util" + "github.com/noobaa/noobaa-operator/v5/pkg/version" "github.com/spf13/cobra" "k8s.io/kubectl/pkg/util/templates" diff --git a/pkg/cli/cli_test.go b/pkg/cli/cli_test.go index d28a9e9ec..4b2553a93 100644 --- a/pkg/cli/cli_test.go +++ b/pkg/cli/cli_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/noobaa/noobaa-operator/v2/version" + "github.com/noobaa/noobaa-operator/v5/version" ) const ( diff --git a/pkg/controller/add_backingstore.go b/pkg/controller/add_backingstore.go index 993834a44..b62a9c94a 100644 --- a/pkg/controller/add_backingstore.go +++ b/pkg/controller/add_backingstore.go @@ -1,7 +1,7 @@ package controller import ( - "github.com/noobaa/noobaa-operator/v2/pkg/controller/backingstore" + "github.com/noobaa/noobaa-operator/v5/pkg/controller/backingstore" ) func init() { diff --git a/pkg/controller/add_bucketclass.go b/pkg/controller/add_bucketclass.go index 5acc0a56c..7c112ca89 100644 --- a/pkg/controller/add_bucketclass.go +++ b/pkg/controller/add_bucketclass.go @@ -1,7 +1,7 @@ package controller import ( - "github.com/noobaa/noobaa-operator/v2/pkg/controller/bucketclass" + "github.com/noobaa/noobaa-operator/v5/pkg/controller/bucketclass" ) func init() { diff --git a/pkg/controller/add_cephcluster.go b/pkg/controller/add_cephcluster.go index c77d53264..dd1db4cc5 100644 --- a/pkg/controller/add_cephcluster.go +++ b/pkg/controller/add_cephcluster.go @@ -1,6 +1,6 @@ package controller -import "github.com/noobaa/noobaa-operator/v2/pkg/controller/cephcluster" +import "github.com/noobaa/noobaa-operator/v5/pkg/controller/cephcluster" func init() { // AddToManagerFuncs is a list of functions to create controllers and add them to a manager. diff --git a/pkg/controller/add_namespacestore.go b/pkg/controller/add_namespacestore.go index 2b86e1068..8d2be6e15 100644 --- a/pkg/controller/add_namespacestore.go +++ b/pkg/controller/add_namespacestore.go @@ -1,7 +1,7 @@ package controller import ( - "github.com/noobaa/noobaa-operator/v2/pkg/controller/namespacestore" + "github.com/noobaa/noobaa-operator/v5/pkg/controller/namespacestore" ) func init() { diff --git a/pkg/controller/add_noobaa.go b/pkg/controller/add_noobaa.go index 63b95fa72..c96335586 100644 --- a/pkg/controller/add_noobaa.go +++ b/pkg/controller/add_noobaa.go @@ -1,7 +1,7 @@ package controller import ( - "github.com/noobaa/noobaa-operator/v2/pkg/controller/noobaa" + "github.com/noobaa/noobaa-operator/v5/pkg/controller/noobaa" ) func init() { diff --git a/pkg/controller/add_obc.go b/pkg/controller/add_obc.go index 8b98ba3b5..6c5ffa8af 100644 --- a/pkg/controller/add_obc.go +++ b/pkg/controller/add_obc.go @@ -1,7 +1,7 @@ package controller import ( - "github.com/noobaa/noobaa-operator/v2/pkg/controller/obc" + "github.com/noobaa/noobaa-operator/v5/pkg/controller/obc" ) func init() { diff --git a/pkg/controller/backingstore/backingstore_controller.go b/pkg/controller/backingstore/backingstore_controller.go index 0eb72638b..8301f69c3 100644 --- a/pkg/controller/backingstore/backingstore_controller.go +++ b/pkg/controller/backingstore/backingstore_controller.go @@ -1,9 +1,9 @@ package backingstore import ( - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/backingstore" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/backingstore" + "github.com/noobaa/noobaa-operator/v5/pkg/util" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/controller" diff --git a/pkg/controller/bucketclass/bucketclass_controller.go b/pkg/controller/bucketclass/bucketclass_controller.go index 24e1f7396..539c70394 100644 --- a/pkg/controller/bucketclass/bucketclass_controller.go +++ b/pkg/controller/bucketclass/bucketclass_controller.go @@ -1,9 +1,9 @@ package bucketclass import ( - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/bucketclass" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/bucketclass" + "github.com/noobaa/noobaa-operator/v5/pkg/util" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/controller" diff --git a/pkg/controller/cephcluster/cephcluster_controller.go b/pkg/controller/cephcluster/cephcluster_controller.go index ef913675e..033430b30 100644 --- a/pkg/controller/cephcluster/cephcluster_controller.go +++ b/pkg/controller/cephcluster/cephcluster_controller.go @@ -1,14 +1,14 @@ package cephcluster import ( - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/nb" - "github.com/noobaa/noobaa-operator/v2/pkg/system" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/nb" + "github.com/noobaa/noobaa-operator/v5/pkg/system" cephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1" "github.com/sirupsen/logrus" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/util" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/event" diff --git a/pkg/controller/namespacestore/namespacestore_controller.go b/pkg/controller/namespacestore/namespacestore_controller.go index d8ef2cea8..62d691e9f 100644 --- a/pkg/controller/namespacestore/namespacestore_controller.go +++ b/pkg/controller/namespacestore/namespacestore_controller.go @@ -1,9 +1,9 @@ package namespacestore import ( - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/namespacestore" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/namespacestore" + "github.com/noobaa/noobaa-operator/v5/pkg/util" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/event" diff --git a/pkg/controller/noobaa/noobaa_controller.go b/pkg/controller/noobaa/noobaa_controller.go index 84fa261b7..288ccb34f 100644 --- a/pkg/controller/noobaa/noobaa_controller.go +++ b/pkg/controller/noobaa/noobaa_controller.go @@ -1,11 +1,11 @@ package noobaa import ( - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/nb" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/system" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/nb" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/system" + "github.com/noobaa/noobaa-operator/v5/pkg/util" "github.com/sirupsen/logrus" appsv1 "k8s.io/api/apps/v1" diff --git a/pkg/controller/obc/obc_controller.go b/pkg/controller/obc/obc_controller.go index 8c1ecfa60..e74baa7d3 100644 --- a/pkg/controller/obc/obc_controller.go +++ b/pkg/controller/obc/obc_controller.go @@ -1,7 +1,7 @@ package obc import ( - "github.com/noobaa/noobaa-operator/v2/pkg/obc" + "github.com/noobaa/noobaa-operator/v5/pkg/obc" "sigs.k8s.io/controller-runtime/pkg/manager" ) diff --git a/pkg/crd/crd.go b/pkg/crd/crd.go index 6dc3055eb..a3d0c601e 100644 --- a/pkg/crd/crd.go +++ b/pkg/crd/crd.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" - "github.com/noobaa/noobaa-operator/v2/pkg/bundle" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + "github.com/noobaa/noobaa-operator/v5/pkg/bundle" + "github.com/noobaa/noobaa-operator/v5/pkg/util" "sigs.k8s.io/controller-runtime/pkg/client" apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" diff --git a/pkg/diagnose/diagnose.go b/pkg/diagnose/diagnose.go index d92ef6a17..e9521f91a 100644 --- a/pkg/diagnose/diagnose.go +++ b/pkg/diagnose/diagnose.go @@ -6,9 +6,9 @@ import ( "strings" "time" - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/util" "github.com/sirupsen/logrus" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/install/install.go b/pkg/install/install.go index 0cbc591b4..cb1c4d7f6 100644 --- a/pkg/install/install.go +++ b/pkg/install/install.go @@ -3,14 +3,14 @@ package install import ( "fmt" - "github.com/noobaa/noobaa-operator/v2/pkg/backingstore" - "github.com/noobaa/noobaa-operator/v2/pkg/bucketclass" - "github.com/noobaa/noobaa-operator/v2/pkg/crd" - "github.com/noobaa/noobaa-operator/v2/pkg/obc" - "github.com/noobaa/noobaa-operator/v2/pkg/operator" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/system" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + "github.com/noobaa/noobaa-operator/v5/pkg/backingstore" + "github.com/noobaa/noobaa-operator/v5/pkg/bucketclass" + "github.com/noobaa/noobaa-operator/v5/pkg/crd" + "github.com/noobaa/noobaa-operator/v5/pkg/obc" + "github.com/noobaa/noobaa-operator/v5/pkg/operator" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/system" + "github.com/noobaa/noobaa-operator/v5/pkg/util" "github.com/spf13/cobra" ) diff --git a/pkg/namespacestore/namespacestore.go b/pkg/namespacestore/namespacestore.go index 9c1561eb9..fe48658e3 100644 --- a/pkg/namespacestore/namespacestore.go +++ b/pkg/namespacestore/namespacestore.go @@ -4,12 +4,12 @@ import ( "fmt" "time" - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/bundle" - "github.com/noobaa/noobaa-operator/v2/pkg/nb" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/system" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/bundle" + "github.com/noobaa/noobaa-operator/v5/pkg/nb" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/system" + "github.com/noobaa/noobaa-operator/v5/pkg/util" "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" diff --git a/pkg/namespacestore/reconciler.go b/pkg/namespacestore/reconciler.go index 6282a027d..f519f5af5 100644 --- a/pkg/namespacestore/reconciler.go +++ b/pkg/namespacestore/reconciler.go @@ -7,12 +7,12 @@ import ( "regexp" "time" - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/bundle" - "github.com/noobaa/noobaa-operator/v2/pkg/nb" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/system" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/bundle" + "github.com/noobaa/noobaa-operator/v5/pkg/nb" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/system" + "github.com/noobaa/noobaa-operator/v5/pkg/util" "github.com/sirupsen/logrus" corev1 "k8s.io/api/core/v1" diff --git a/pkg/nb/router.go b/pkg/nb/router.go index 2140d1d5d..287737781 100644 --- a/pkg/nb/router.go +++ b/pkg/nb/router.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + "github.com/noobaa/noobaa-operator/v5/pkg/util" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/nb/rpc.go b/pkg/nb/rpc.go index 097e415b3..fb46b770d 100644 --- a/pkg/nb/rpc.go +++ b/pkg/nb/rpc.go @@ -6,7 +6,7 @@ import ( "sync" "time" - util "github.com/noobaa/noobaa-operator/v2/pkg/util" + util "github.com/noobaa/noobaa-operator/v5/pkg/util" "github.com/sirupsen/logrus" ) @@ -19,7 +19,7 @@ const ( RPCMaxMessageSize = 64 * 1024 * 1024 // RPCSendTimeout is a limit the time we wait for getting reply from the server - RPCSendTimeout = 120 * time.Second; + RPCSendTimeout = 120 * time.Second ) // GlobalRPC is the global rpc diff --git a/pkg/nb/rpc_http.go b/pkg/nb/rpc_http.go index fdd51027f..a62ba24d1 100644 --- a/pkg/nb/rpc_http.go +++ b/pkg/nb/rpc_http.go @@ -7,7 +7,7 @@ import ( "net/http" "strconv" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + "github.com/noobaa/noobaa-operator/v5/pkg/util" ) // RPCConnHTTP is an http connection which is created per request diff --git a/pkg/obc/obc.go b/pkg/obc/obc.go index df81e796a..b967e427f 100644 --- a/pkg/obc/obc.go +++ b/pkg/obc/obc.go @@ -4,12 +4,12 @@ import ( "fmt" "time" - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/bundle" - "github.com/noobaa/noobaa-operator/v2/pkg/nb" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/system" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/bundle" + "github.com/noobaa/noobaa-operator/v5/pkg/nb" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/system" + "github.com/noobaa/noobaa-operator/v5/pkg/util" obv1 "github.com/kube-object-storage/lib-bucket-provisioner/pkg/apis/objectbucket.io/v1alpha1" "github.com/spf13/cobra" diff --git a/pkg/obc/provisioner.go b/pkg/obc/provisioner.go index ece9efa41..bc2ef5cc3 100644 --- a/pkg/obc/provisioner.go +++ b/pkg/obc/provisioner.go @@ -10,11 +10,11 @@ import ( "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/s3" - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/nb" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/system" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/nb" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/system" + "github.com/noobaa/noobaa-operator/v5/pkg/util" "github.com/kube-object-storage/lib-bucket-provisioner/pkg/provisioner" obAPI "github.com/kube-object-storage/lib-bucket-provisioner/pkg/provisioner/api" diff --git a/pkg/olm/olm.go b/pkg/olm/olm.go index 934e39c6a..e4535c4c5 100644 --- a/pkg/olm/olm.go +++ b/pkg/olm/olm.go @@ -8,13 +8,13 @@ import ( "os" "strings" - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/bundle" - "github.com/noobaa/noobaa-operator/v2/pkg/crd" - "github.com/noobaa/noobaa-operator/v2/pkg/operator" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/util" - "github.com/noobaa/noobaa-operator/v2/version" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/bundle" + "github.com/noobaa/noobaa-operator/v5/pkg/crd" + "github.com/noobaa/noobaa-operator/v5/pkg/operator" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/util" + "github.com/noobaa/noobaa-operator/v5/version" "github.com/blang/semver" operv1 "github.com/operator-framework/api/pkg/operators/v1alpha1" diff --git a/pkg/operator/manager.go b/pkg/operator/manager.go index 3a2d1d173..a5e80122e 100644 --- a/pkg/operator/manager.go +++ b/pkg/operator/manager.go @@ -3,18 +3,18 @@ package operator import ( "fmt" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/system" - "github.com/noobaa/noobaa-operator/v2/pkg/version" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/system" + "github.com/noobaa/noobaa-operator/v5/pkg/version" "github.com/spf13/cobra" // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) _ "k8s.io/client-go/plugin/pkg/client/auth" - "github.com/noobaa/noobaa-operator/v2/pkg/apis" - "github.com/noobaa/noobaa-operator/v2/pkg/controller" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + "github.com/noobaa/noobaa-operator/v5/pkg/apis" + "github.com/noobaa/noobaa-operator/v5/pkg/controller" + "github.com/noobaa/noobaa-operator/v5/pkg/util" "github.com/operator-framework/operator-lib/leader" "sigs.k8s.io/controller-runtime/pkg/manager" diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go index 90777a75a..b368cb674 100644 --- a/pkg/operator/operator.go +++ b/pkg/operator/operator.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "github.com/noobaa/noobaa-operator/v2/pkg/bundle" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + "github.com/noobaa/noobaa-operator/v5/pkg/bundle" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/util" secv1 "github.com/openshift/api/security/v1" "github.com/spf13/cobra" @@ -154,7 +154,7 @@ func RunUninstall(cmd *cobra.Command, args []string) { func RunStatus(cmd *cobra.Command, args []string) { c := LoadOperatorConf(cmd) util.KubeCheck(c.NS) - if util.KubeCheck(c.SA) && util.KubeCheck(c.SAEndpoint){ + if util.KubeCheck(c.SA) && util.KubeCheck(c.SAEndpoint) { // in OLM deployment the roles and bindings have generated names // so we list and lookup bindings to our service account to discover the actual names DetectRole(c) diff --git a/pkg/options/options.go b/pkg/options/options.go index 17c9b3eff..dc9f8e6bc 100644 --- a/pkg/options/options.go +++ b/pkg/options/options.go @@ -1,8 +1,8 @@ package options import ( - "github.com/noobaa/noobaa-operator/v2/pkg/util" - "github.com/noobaa/noobaa-operator/v2/version" + "github.com/noobaa/noobaa-operator/v5/pkg/util" + "github.com/noobaa/noobaa-operator/v5/version" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/pkg/pvstore/pvstore.go b/pkg/pvstore/pvstore.go index 100511bed..0ff32329e 100644 --- a/pkg/pvstore/pvstore.go +++ b/pkg/pvstore/pvstore.go @@ -3,9 +3,9 @@ package pvstore import ( "fmt" - "github.com/noobaa/noobaa-operator/v2/pkg/nb" - "github.com/noobaa/noobaa-operator/v2/pkg/system" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + "github.com/noobaa/noobaa-operator/v5/pkg/nb" + "github.com/noobaa/noobaa-operator/v5/pkg/system" + "github.com/noobaa/noobaa-operator/v5/pkg/util" "github.com/spf13/cobra" ) diff --git a/pkg/system/cmd_api_call.go b/pkg/system/cmd_api_call.go index 3efe91dab..f2d6ab3a3 100644 --- a/pkg/system/cmd_api_call.go +++ b/pkg/system/cmd_api_call.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/noobaa/noobaa-operator/v2/pkg/nb" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + "github.com/noobaa/noobaa-operator/v5/pkg/nb" + "github.com/noobaa/noobaa-operator/v5/pkg/util" "github.com/spf13/cobra" sigyaml "sigs.k8s.io/yaml" ) diff --git a/pkg/system/cmd_ui.go b/pkg/system/cmd_ui.go index 13330a6c8..1d475728f 100644 --- a/pkg/system/cmd_ui.go +++ b/pkg/system/cmd_ui.go @@ -5,8 +5,8 @@ import ( "os/exec" "runtime" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/util" "github.com/spf13/cobra" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/system/phase1_verifying.go b/pkg/system/phase1_verifying.go index efecb90a6..059963e72 100644 --- a/pkg/system/phase1_verifying.go +++ b/pkg/system/phase1_verifying.go @@ -7,9 +7,9 @@ import ( "github.com/asaskevich/govalidator" semver "github.com/coreos/go-semver/semver" dockerref "github.com/docker/distribution/reference" - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/util" ) // ReconcilePhaseVerifying runs the reconcile verify phase diff --git a/pkg/system/phase2_creating.go b/pkg/system/phase2_creating.go index 2b0855432..0a6c1ce83 100644 --- a/pkg/system/phase2_creating.go +++ b/pkg/system/phase2_creating.go @@ -8,9 +8,9 @@ import ( "strings" "time" - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/util" cloudcredsv1 "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1" cephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1" appsv1 "k8s.io/api/apps/v1" diff --git a/pkg/system/phase3_connecting.go b/pkg/system/phase3_connecting.go index 12ec15c3b..fee624541 100644 --- a/pkg/system/phase3_connecting.go +++ b/pkg/system/phase3_connecting.go @@ -6,8 +6,8 @@ import ( "path" "strings" - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/nb" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/nb" routev1 "github.com/openshift/api/route/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/pkg/system/phase4_configuring.go b/pkg/system/phase4_configuring.go index 0a2ef53a5..4957f3211 100644 --- a/pkg/system/phase4_configuring.go +++ b/pkg/system/phase4_configuring.go @@ -15,11 +15,11 @@ import ( "google.golang.org/api/option" "github.com/marstr/randname" - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/bundle" - "github.com/noobaa/noobaa-operator/v2/pkg/nb" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/util" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/bundle" + "github.com/noobaa/noobaa-operator/v5/pkg/nb" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/util" "github.com/sirupsen/logrus" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/pkg/system/reconciler.go b/pkg/system/reconciler.go index 63d795f1e..78172fc52 100644 --- a/pkg/system/reconciler.go +++ b/pkg/system/reconciler.go @@ -8,12 +8,12 @@ import ( "text/template" "time" - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/bundle" - "github.com/noobaa/noobaa-operator/v2/pkg/nb" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/util" - "github.com/noobaa/noobaa-operator/v2/version" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/bundle" + "github.com/noobaa/noobaa-operator/v5/pkg/nb" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/util" + "github.com/noobaa/noobaa-operator/v5/version" monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" routev1 "github.com/openshift/api/route/v1" diff --git a/pkg/system/system.go b/pkg/system/system.go index e327bd238..da4422830 100644 --- a/pkg/system/system.go +++ b/pkg/system/system.go @@ -8,12 +8,12 @@ import ( "strings" "time" - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/bundle" - "github.com/noobaa/noobaa-operator/v2/pkg/nb" - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/util" - "github.com/noobaa/noobaa-operator/v2/version" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/bundle" + "github.com/noobaa/noobaa-operator/v5/pkg/nb" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/util" + "github.com/noobaa/noobaa-operator/v5/version" "github.com/spf13/cobra" appsv1 "k8s.io/api/apps/v1" diff --git a/pkg/util/util.go b/pkg/util/util.go index a69a6f251..c5052f709 100644 --- a/pkg/util/util.go +++ b/pkg/util/util.go @@ -24,9 +24,9 @@ import ( "github.com/hashicorp/vault/api" vaultApi "github.com/hashicorp/vault/api" obv1 "github.com/kube-object-storage/lib-bucket-provisioner/pkg/apis/objectbucket.io/v1alpha1" - nbapis "github.com/noobaa/noobaa-operator/v2/pkg/apis" - nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1" - "github.com/noobaa/noobaa-operator/v2/pkg/bundle" + nbapis "github.com/noobaa/noobaa-operator/v5/pkg/apis" + nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1" + "github.com/noobaa/noobaa-operator/v5/pkg/bundle" routev1 "github.com/openshift/api/route/v1" secv1 "github.com/openshift/api/security/v1" cloudcredsv1 "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1" @@ -56,16 +56,16 @@ import ( ) const ( - oAuthWellKnownEndpoint = "https://openshift.default.svc/.well-known/oauth-authorization-server" - rootSecretPath = "NOOBAA_ROOT_SECRET_PATH" - ibmRegion = "ibm-cloud.kubernetes.io/region" - vaultCaCert = "VAULT_CACERT" - vaultClientCert = "VAULT_CLIENT_CERT" - vaultClientKey = "VAULT_CLIENT_KEY" - vaultAddr = "VAULT_ADDR" - vaultCaPath = "VAULT_CAPATH" - vaultBackendPath = "VAULT_BACKEND_PATH" - kmsProvider = "KMS_PROVIDER" + oAuthWellKnownEndpoint = "https://openshift.default.svc/.well-known/oauth-authorization-server" + rootSecretPath = "NOOBAA_ROOT_SECRET_PATH" + ibmRegion = "ibm-cloud.kubernetes.io/region" + vaultCaCert = "VAULT_CACERT" + vaultClientCert = "VAULT_CLIENT_CERT" + vaultClientKey = "VAULT_CLIENT_KEY" + vaultAddr = "VAULT_ADDR" + vaultCaPath = "VAULT_CAPATH" + vaultBackendPath = "VAULT_BACKEND_PATH" + kmsProvider = "KMS_PROVIDER" defaultVaultBackendPath = "secret/" ) diff --git a/pkg/version/version.go b/pkg/version/version.go index e848921cd..2236848f2 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -1,9 +1,9 @@ package version import ( - "github.com/noobaa/noobaa-operator/v2/pkg/options" - "github.com/noobaa/noobaa-operator/v2/pkg/util" - "github.com/noobaa/noobaa-operator/v2/version" + "github.com/noobaa/noobaa-operator/v5/pkg/options" + "github.com/noobaa/noobaa-operator/v5/pkg/util" + "github.com/noobaa/noobaa-operator/v5/version" "github.com/spf13/cobra" ) diff --git a/test/rpcbench/rpcbench.go b/test/rpcbench/rpcbench.go index 2e39b7e5b..3bb403df2 100644 --- a/test/rpcbench/rpcbench.go +++ b/test/rpcbench/rpcbench.go @@ -4,7 +4,7 @@ import ( "flag" "fmt" - "github.com/noobaa/noobaa-operator/v2/pkg/nb" + "github.com/noobaa/noobaa-operator/v5/pkg/nb" "github.com/sirupsen/logrus" )