Skip to content

Commit

Permalink
chore(deps): update go mod to use the openebs v3 api modules (#403)
Browse files Browse the repository at this point in the history
Updates the openebs/api dependencies to use v3 release.
  • Loading branch information
Abhishek Agarwal authored Nov 29, 2021
1 parent 608147a commit 1d4b9b2
Show file tree
Hide file tree
Showing 282 changed files with 567 additions and 524 deletions.
6 changes: 3 additions & 3 deletions cmd/cspc-operator/app/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"strconv"
"time"

clientset "github.com/openebs/api/v2/pkg/client/clientset/versioned"
informers "github.com/openebs/api/v2/pkg/client/informers/externalversions"
leader "github.com/openebs/api/v2/pkg/kubernetes/leaderelection"
clientset "github.com/openebs/api/v3/pkg/client/clientset/versioned"
informers "github.com/openebs/api/v3/pkg/client/informers/externalversions"
leader "github.com/openebs/api/v3/pkg/kubernetes/leaderelection"
cspccontroller "github.com/openebs/cstor-operators/pkg/controllers/cspc-controller"
"github.com/pkg/errors"
kubeinformers "k8s.io/client-go/informers"
Expand Down
4 changes: 2 additions & 2 deletions cmd/pool-manager/app/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"github.com/pkg/errors"
"k8s.io/klog"

clientset "github.com/openebs/api/v2/pkg/client/clientset/versioned"
informers "github.com/openebs/api/v2/pkg/client/informers/externalversions"
clientset "github.com/openebs/api/v3/pkg/client/clientset/versioned"
informers "github.com/openebs/api/v3/pkg/client/informers/externalversions"
"github.com/openebs/cstor-operators/pkg/signals"
kubeinformers "k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes"
Expand Down
2 changes: 1 addition & 1 deletion cmd/volume-manager/app/commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package app

import (
"github.com/openebs/api/v2/pkg/util"
"github.com/openebs/api/v3/pkg/util"
"github.com/spf13/cobra"
"k8s.io/klog"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/webhook/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"k8s.io/client-go/tools/clientcmd"
"k8s.io/klog"

clientset "github.com/openebs/api/v2/pkg/client/clientset/versioned"
clientset "github.com/openebs/api/v3/pkg/client/clientset/versioned"
//snapclientset "github.com/openebs/maya/pkg/client/generated/openebs.io/snapshot/v1alpha1/clientset/internalclientset"
)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/imdario/mergo v0.3.8 // indirect
github.com/onsi/ginkgo v1.12.0
github.com/onsi/gomega v1.9.0
github.com/openebs/api/v2 v2.4.0
github.com/openebs/api/v3 v3.0.0-20211116062351-ecd9a8a61d3e
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v0.0.5
github.com/spf13/pflag v1.0.5
Expand Down
5 changes: 3 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 h1:cenwrSVm+Z7QLSV/BsnenAOcDXdX4cMv4wP0B/5QbPg=
github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
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/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
Expand Down Expand Up @@ -190,8 +191,8 @@ github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg=
github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
github.com/openebs/api/v2 v2.4.0 h1:MiDyuNe1TnwskN+1JAQr5DoiI/IWxbgljKg7ssGPIjg=
github.com/openebs/api/v2 v2.4.0/go.mod h1:nLCaNvVjgjkjeD2a+n1fMbv5HjoEYP4XB8OAbwmIXtY=
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/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
Expand Down
10 changes: 5 additions & 5 deletions pkg/controllers/backup-controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ import (

"github.com/openebs/cstor-operators/pkg/controllers/common"

cstorapis "github.com/openebs/api/v2/pkg/apis/cstor/v1"
openebstypes "github.com/openebs/api/v2/pkg/apis/types"
cstorapis "github.com/openebs/api/v3/pkg/apis/cstor/v1"
openebstypes "github.com/openebs/api/v3/pkg/apis/types"

clientset "github.com/openebs/api/v2/pkg/client/clientset/versioned"
openebsScheme "github.com/openebs/api/v2/pkg/client/clientset/versioned/scheme"
informers "github.com/openebs/api/v2/pkg/client/informers/externalversions"
clientset "github.com/openebs/api/v3/pkg/client/clientset/versioned"
openebsScheme "github.com/openebs/api/v3/pkg/client/clientset/versioned/scheme"
informers "github.com/openebs/api/v3/pkg/client/informers/externalversions"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/backup-controller/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"testing"
"time"

openebsFakeClientset "github.com/openebs/api/v2/pkg/client/clientset/versioned/fake"
openebsinformers "github.com/openebs/api/v2/pkg/client/informers/externalversions"
openebsFakeClientset "github.com/openebs/api/v3/pkg/client/clientset/versioned/fake"
openebsinformers "github.com/openebs/api/v3/pkg/client/informers/externalversions"

kubeinformers "k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes/fake"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/backup-controller/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"context"
"fmt"

cstorapis "github.com/openebs/api/v2/pkg/apis/cstor/v1"
cstorapis "github.com/openebs/api/v3/pkg/apis/cstor/v1"
"github.com/openebs/cstor-operators/pkg/controllers/common"
"github.com/openebs/cstor-operators/pkg/volumereplica"
corev1 "k8s.io/api/core/v1"
Expand Down
6 changes: 3 additions & 3 deletions pkg/controllers/common/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"sync"
"time"

cstor "github.com/openebs/api/v2/pkg/apis/cstor/v1"
clientset "github.com/openebs/api/v2/pkg/client/clientset/versioned"
"github.com/openebs/api/v2/pkg/util"
cstor "github.com/openebs/api/v3/pkg/apis/cstor/v1"
clientset "github.com/openebs/api/v3/pkg/client/clientset/versioned"
"github.com/openebs/api/v3/pkg/util"
"github.com/openebs/cstor-operators/pkg/pool"
"github.com/openebs/cstor-operators/pkg/volumereplica"
zcmd "github.com/openebs/cstor-operators/pkg/zcmd"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/common/common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"testing"
"time"

apis "github.com/openebs/api/v2/pkg/apis/cstor/v1"
openebsFakeClientset "github.com/openebs/api/v2/pkg/client/clientset/versioned/fake"
apis "github.com/openebs/api/v3/pkg/apis/cstor/v1"
openebsFakeClientset "github.com/openebs/api/v3/pkg/client/clientset/versioned/fake"
"github.com/openebs/cstor-operators/pkg/pool"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog"
Expand Down
6 changes: 3 additions & 3 deletions pkg/controllers/cspc-controller/cleanup.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package cspccontroller
import (
"context"

apis "github.com/openebs/api/v2/pkg/apis/cstor/v1"
"github.com/openebs/api/v2/pkg/apis/types"
apis "github.com/openebs/api/v3/pkg/apis/cstor/v1"
"github.com/openebs/api/v3/pkg/apis/types"

"github.com/openebs/api/v2/pkg/util"
"github.com/openebs/api/v3/pkg/util"
"github.com/pkg/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog"
Expand Down
8 changes: 4 additions & 4 deletions pkg/controllers/cspc-controller/cleanup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ limitations under the License.
package cspccontroller

import (
cstor "github.com/openebs/api/v2/pkg/apis/cstor/v1"
"github.com/openebs/api/v2/pkg/apis/types"
openebsFakeClientset "github.com/openebs/api/v2/pkg/client/clientset/versioned/fake"
informers "github.com/openebs/api/v2/pkg/client/informers/externalversions"
cstor "github.com/openebs/api/v3/pkg/apis/cstor/v1"
"github.com/openebs/api/v3/pkg/apis/types"
openebsFakeClientset "github.com/openebs/api/v3/pkg/client/clientset/versioned/fake"
informers "github.com/openebs/api/v3/pkg/client/informers/externalversions"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kubeinformers "k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes/fake"
Expand Down
18 changes: 9 additions & 9 deletions pkg/controllers/cspc-controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ package cspccontroller
import (
"fmt"

cstor "github.com/openebs/api/v2/pkg/apis/cstor/v1"
types "github.com/openebs/api/v2/pkg/apis/types"
clientset "github.com/openebs/api/v2/pkg/client/clientset/versioned"
openebsScheme "github.com/openebs/api/v2/pkg/client/clientset/versioned/scheme"
cstorstoredversion "github.com/openebs/api/v2/pkg/client/clientset/versioned/typed/cstor/v1"
openebsstoredversion "github.com/openebs/api/v2/pkg/client/clientset/versioned/typed/openebs.io/v1alpha1"
informers "github.com/openebs/api/v2/pkg/client/informers/externalversions"
v1interface "github.com/openebs/api/v2/pkg/client/informers/externalversions/cstor/v1"
listers "github.com/openebs/api/v2/pkg/client/listers/cstor/v1"
cstor "github.com/openebs/api/v3/pkg/apis/cstor/v1"
types "github.com/openebs/api/v3/pkg/apis/types"
clientset "github.com/openebs/api/v3/pkg/client/clientset/versioned"
openebsScheme "github.com/openebs/api/v3/pkg/client/clientset/versioned/scheme"
cstorstoredversion "github.com/openebs/api/v3/pkg/client/clientset/versioned/typed/cstor/v1"
openebsstoredversion "github.com/openebs/api/v3/pkg/client/clientset/versioned/typed/openebs.io/v1alpha1"
informers "github.com/openebs/api/v3/pkg/client/informers/externalversions"
v1interface "github.com/openebs/api/v3/pkg/client/informers/externalversions/cstor/v1"
listers "github.com/openebs/api/v3/pkg/client/listers/cstor/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/kubernetes"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/cspc-controller/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import (
"context"
"fmt"

"github.com/openebs/api/v2/pkg/apis/types"
"github.com/openebs/api/v3/pkg/apis/types"
"github.com/openebs/cstor-operators/pkg/cspc/algorithm"

"time"

cstor "github.com/openebs/api/v2/pkg/apis/cstor/v1"
cstor "github.com/openebs/api/v3/pkg/apis/cstor/v1"
k8serror "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/runtime"
Expand Down
10 changes: 5 additions & 5 deletions pkg/controllers/cspc-controller/handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
"testing"
"time"

cstor "github.com/openebs/api/v2/pkg/apis/cstor/v1"
openebscore "github.com/openebs/api/v2/pkg/apis/openebs.io/v1alpha1"
"github.com/openebs/api/v2/pkg/apis/types"
openebsFakeClientset "github.com/openebs/api/v2/pkg/client/clientset/versioned/fake"
openebsinformers "github.com/openebs/api/v2/pkg/client/informers/externalversions"
cstor "github.com/openebs/api/v3/pkg/apis/cstor/v1"
openebscore "github.com/openebs/api/v3/pkg/apis/openebs.io/v1alpha1"
"github.com/openebs/api/v3/pkg/apis/types"
openebsFakeClientset "github.com/openebs/api/v3/pkg/client/clientset/versioned/fake"
openebsinformers "github.com/openebs/api/v3/pkg/client/informers/externalversions"
"github.com/openebs/cstor-operators/pkg/controllers/testutil"
"github.com/openebs/cstor-operators/pkg/cspc/algorithm"
"github.com/pkg/errors"
Expand Down
6 changes: 3 additions & 3 deletions pkg/controllers/cspc-controller/operations.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ package cspccontroller
import (
"context"

cstor "github.com/openebs/api/v2/pkg/apis/cstor/v1"
openebsapis "github.com/openebs/api/v2/pkg/apis/openebs.io/v1alpha1"
"github.com/openebs/api/v2/pkg/apis/types"
cstor "github.com/openebs/api/v3/pkg/apis/cstor/v1"
openebsapis "github.com/openebs/api/v3/pkg/apis/openebs.io/v1alpha1"
"github.com/openebs/api/v3/pkg/apis/types"
"github.com/pkg/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/cspc-controller/scale.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"context"
"fmt"

cstor "github.com/openebs/api/v2/pkg/apis/cstor/v1"
"github.com/openebs/api/v2/pkg/apis/types"
cstor "github.com/openebs/api/v3/pkg/apis/cstor/v1"
"github.com/openebs/api/v3/pkg/apis/types"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/runtime"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/cspc-controller/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package cspccontroller
import (
"context"

cstor "github.com/openebs/api/v2/pkg/apis/cstor/v1"
"github.com/openebs/api/v2/pkg/apis/types"
cstor "github.com/openebs/api/v3/pkg/apis/cstor/v1"
"github.com/openebs/api/v3/pkg/apis/types"
"github.com/openebs/cstor-operators/pkg/controllers/cspc-controller/util"
"github.com/pkg/errors"
appsv1 "k8s.io/api/apps/v1"
Expand Down
8 changes: 4 additions & 4 deletions pkg/controllers/cspc-controller/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"reflect"
"strings"

cstor "github.com/openebs/api/v2/pkg/apis/cstor/v1"
"github.com/openebs/api/v2/pkg/apis/types"
clientset "github.com/openebs/api/v2/pkg/client/clientset/versioned"
"github.com/openebs/api/v2/pkg/util"
cstor "github.com/openebs/api/v3/pkg/apis/cstor/v1"
"github.com/openebs/api/v3/pkg/apis/types"
clientset "github.com/openebs/api/v3/pkg/client/clientset/versioned"
"github.com/openebs/api/v3/pkg/util"
"github.com/openebs/cstor-operators/pkg/cspc/algorithm"
"github.com/openebs/cstor-operators/pkg/version"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/cspc-controller/util/cspc_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package util

import (
cstor "github.com/openebs/api/v2/pkg/apis/cstor/v1"
cstor "github.com/openebs/api/v3/pkg/apis/cstor/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/cspc-controller/util/cspc_util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ limitations under the License.
package util

import (
cstor "github.com/openebs/api/v2/pkg/apis/cstor/v1"
cstor "github.com/openebs/api/v3/pkg/apis/cstor/v1"
corev1 "k8s.io/api/core/v1"
"reflect"

Expand Down
8 changes: 4 additions & 4 deletions pkg/controllers/cspi-controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ import (
"k8s.io/client-go/util/workqueue"
"k8s.io/klog"

cstor "github.com/openebs/api/v2/pkg/apis/cstor/v1"
cstor "github.com/openebs/api/v3/pkg/apis/cstor/v1"
common "github.com/openebs/cstor-operators/pkg/controllers/common"
zcmd "github.com/openebs/cstor-operators/pkg/zcmd/bin"

clientset "github.com/openebs/api/v2/pkg/client/clientset/versioned"
openebsScheme "github.com/openebs/api/v2/pkg/client/clientset/versioned/scheme"
informers "github.com/openebs/api/v2/pkg/client/informers/externalversions"
clientset "github.com/openebs/api/v3/pkg/client/clientset/versioned"
openebsScheme "github.com/openebs/api/v3/pkg/client/clientset/versioned/scheme"
informers "github.com/openebs/api/v3/pkg/client/informers/externalversions"
)

const poolControllerName = "CStorPoolInstance"
Expand Down
8 changes: 4 additions & 4 deletions pkg/controllers/cspi-controller/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"os"
"strings"

cstor "github.com/openebs/api/v2/pkg/apis/cstor/v1"
"github.com/openebs/api/v2/pkg/apis/types"
clientset "github.com/openebs/api/v2/pkg/client/clientset/versioned"
"github.com/openebs/api/v2/pkg/util"
cstor "github.com/openebs/api/v3/pkg/apis/cstor/v1"
"github.com/openebs/api/v3/pkg/apis/types"
clientset "github.com/openebs/api/v3/pkg/client/clientset/versioned"
"github.com/openebs/api/v3/pkg/util"
"github.com/openebs/cstor-operators/pkg/controllers/common"
cspiutil "github.com/openebs/cstor-operators/pkg/controllers/cspi-controller/util"
zpool "github.com/openebs/cstor-operators/pkg/pool/operations"
Expand Down
12 changes: 6 additions & 6 deletions pkg/controllers/cspi-controller/handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ import (
"testing"
"time"

cstor "github.com/openebs/api/v2/pkg/apis/cstor/v1"
openebscore "github.com/openebs/api/v2/pkg/apis/openebs.io/v1alpha1"
"github.com/openebs/api/v2/pkg/apis/types"
openebsFakeClientset "github.com/openebs/api/v2/pkg/client/clientset/versioned/fake"
openebsinformers "github.com/openebs/api/v2/pkg/client/informers/externalversions"
"github.com/openebs/api/v2/pkg/util"
cstor "github.com/openebs/api/v3/pkg/apis/cstor/v1"
openebscore "github.com/openebs/api/v3/pkg/apis/openebs.io/v1alpha1"
"github.com/openebs/api/v3/pkg/apis/types"
openebsFakeClientset "github.com/openebs/api/v3/pkg/client/clientset/versioned/fake"
openebsinformers "github.com/openebs/api/v3/pkg/client/informers/externalversions"
"github.com/openebs/api/v3/pkg/util"
"github.com/openebs/cstor-operators/pkg/controllers/common"
cspiutil "github.com/openebs/cstor-operators/pkg/controllers/cspi-controller/util"
"github.com/openebs/cstor-operators/pkg/controllers/testutil"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/cspi-controller/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"context"
"time"

cstor "github.com/openebs/api/v2/pkg/apis/cstor/v1"
cstor "github.com/openebs/api/v3/pkg/apis/cstor/v1"
cspiutil "github.com/openebs/cstor-operators/pkg/controllers/cspi-controller/util"
"github.com/pkg/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/cspi-controller/status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"context"
"testing"

cstor "github.com/openebs/api/v2/pkg/apis/cstor/v1"
openebsFakeClientset "github.com/openebs/api/v2/pkg/client/clientset/versioned/fake"
cstor "github.com/openebs/api/v3/pkg/apis/cstor/v1"
openebsFakeClientset "github.com/openebs/api/v3/pkg/client/clientset/versioned/fake"
cspiutil "github.com/openebs/cstor-operators/pkg/controllers/cspi-controller/util"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/cspi-controller/util/cspi_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package cspicontroller

import (
cstor "github.com/openebs/api/v2/pkg/apis/cstor/v1"
cstor "github.com/openebs/api/v3/pkg/apis/cstor/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/cspi-controller/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"os"
"reflect"

types "github.com/openebs/api/v2/pkg/apis/types"
types "github.com/openebs/api/v3/pkg/apis/types"

cstor "github.com/openebs/api/v2/pkg/apis/cstor/v1"
cstor "github.com/openebs/api/v3/pkg/apis/cstor/v1"
"github.com/pkg/errors"
)

Expand Down
8 changes: 4 additions & 4 deletions pkg/controllers/cstorvolumeconfig/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ import (
"strings"
"time"

apis "github.com/openebs/api/v2/pkg/apis/cstor/v1"
apitypes "github.com/openebs/api/v2/pkg/apis/types"
"github.com/openebs/api/v2/pkg/util"
apis "github.com/openebs/api/v3/pkg/apis/cstor/v1"
apitypes "github.com/openebs/api/v3/pkg/apis/types"
"github.com/openebs/api/v3/pkg/util"
"github.com/openebs/cstor-operators/pkg/util/hash"
"github.com/openebs/cstor-operators/pkg/version"
errors "github.com/pkg/errors"
"k8s.io/klog"

clientset "github.com/openebs/api/v2/pkg/client/clientset/versioned"
clientset "github.com/openebs/api/v3/pkg/client/clientset/versioned"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
policy "k8s.io/api/policy/v1beta1"
Expand Down
Loading

0 comments on commit 1d4b9b2

Please sign in to comment.