Skip to content

Commit

Permalink
chore(deps): update go mod to use the openebs v3 api modules (#167)
Browse files Browse the repository at this point in the history
This commit does the following changes: 
- Updates the openebs/api dependencies to use v3 modules release.
- Bumps the Go version to 1.16


Signed-off-by: Abhishek Agarwal <[email protected]>
  • Loading branch information
Abhishek Agarwal authored Nov 29, 2021
1 parent 31f93ab commit e8cc59f
Show file tree
Hide file tree
Showing 99 changed files with 118 additions and 141 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ jobs:
- name: Checkout
uses: actions/[email protected]

- name: Set up Go 1.14
- name: Set up Go 1.16.5
uses: actions/setup-go@v2
with:
go-version: 1.14.7
go-version: 1.16.5

- name: Setup Minikube-Kubernetes
uses: manusa/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ jobs:
- name: Checkout
uses: actions/[email protected]

- name: Set up Go 1.14
- name: Set up Go 1.16
uses: actions/setup-go@v2
with:
go-version: 1.14.7
go-version: 1.16.5

- name: Setup Minikube-Kubernetes
uses: manusa/[email protected]
Expand Down
5 changes: 2 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/openebs/cstor-csi

go 1.15
go 1.16

require (
github.com/container-storage-interface/spec v1.4.0
Expand All @@ -14,7 +14,7 @@ require (
github.com/kubernetes-csi/csi-lib-utils v0.7.0
github.com/onsi/ginkgo v1.11.0
github.com/onsi/gomega v1.7.1
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/sirupsen/logrus v1.6.0
github.com/spf13/cobra v1.1.1
Expand All @@ -26,7 +26,6 @@ require (
k8s.io/apimachinery v0.20.2
k8s.io/client-go v0.20.2
k8s.io/code-generator v0.20.2
k8s.io/klog v1.0.0
k8s.io/kubernetes v1.20.2
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
)
Expand Down
48 changes: 2 additions & 46 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/cstor/snapshot/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"strings"

v1proto "github.com/openebs/api/v2/pkg/proto"
v1proto "github.com/openebs/api/v3/pkg/proto"
"github.com/pkg/errors"
"google.golang.org/grpc"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/cstor/volume/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package v1alpha1

import (
apismaya "github.com/openebs/api/v2/pkg/apis/cstor/v1"
apismaya "github.com/openebs/api/v3/pkg/apis/cstor/v1"
"github.com/pkg/errors"
"k8s.io/apimachinery/pkg/api/resource"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/cstor/volume/cstorvolume.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package v1alpha1

import (
v1apis "github.com/openebs/api/v2/pkg/apis/cstor/v1"
v1apis "github.com/openebs/api/v3/pkg/apis/cstor/v1"
)

// CStorVolume a wrapper for CStorVolume object
Expand Down
4 changes: 2 additions & 2 deletions pkg/cstor/volume/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"context"
"encoding/json"

apisv1 "github.com/openebs/api/v2/pkg/apis/cstor/v1"
clientset "github.com/openebs/api/v2/pkg/client/clientset/versioned"
apisv1 "github.com/openebs/api/v3/pkg/apis/cstor/v1"
clientset "github.com/openebs/api/v3/pkg/client/clientset/versioned"
client "github.com/openebs/cstor-csi/pkg/kubernetes/client"

"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cstor/volumeattachment/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package volumeattachment

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

Expand Down
2 changes: 1 addition & 1 deletion pkg/cstor/volumeattachment/buildlist.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package volumeattachment

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

// ListBuilder enables building an instance of
Expand Down
4 changes: 2 additions & 2 deletions pkg/cstor/volumeattachment/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"context"
"encoding/json"

apis "github.com/openebs/api/v2/pkg/apis/cstor/v1"
clientset "github.com/openebs/api/v2/pkg/client/clientset/versioned"
apis "github.com/openebs/api/v3/pkg/apis/cstor/v1"
clientset "github.com/openebs/api/v3/pkg/client/clientset/versioned"
client "github.com/openebs/cstor-csi/pkg/kubernetes/client"
"github.com/pkg/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cstor/volumeattachment/volume.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package volumeattachment

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

// CStorVolumeAttachment is a wrapper over
Expand Down
2 changes: 1 addition & 1 deletion pkg/cstor/volumeconfig/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package volumeconfig
import (
"strconv"

apisv1 "github.com/openebs/api/v2/pkg/apis/cstor/v1"
apisv1 "github.com/openebs/api/v3/pkg/apis/cstor/v1"
"github.com/pkg/errors"
metav1 "k8s.io/api/core/v1"
resource "k8s.io/apimachinery/pkg/api/resource"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cstor/volumeconfig/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package volumeconfig

import (
apisv1 "github.com/openebs/api/v2/pkg/apis/cstor/v1"
apisv1 "github.com/openebs/api/v3/pkg/apis/cstor/v1"
)

// CStorVolumeConfig a wrapper for ume object
Expand Down
4 changes: 2 additions & 2 deletions pkg/cstor/volumeconfig/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"encoding/json"
"fmt"

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

clientset "github.com/openebs/api/v2/pkg/client/clientset/versioned"
clientset "github.com/openebs/api/v3/pkg/client/clientset/versioned"
client "github.com/openebs/cstor-csi/pkg/kubernetes/client"

"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cstor/volumeconfig/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"encoding/json"
"fmt"

apisv1 "github.com/openebs/api/v2/pkg/apis/cstor/v1"
apisv1 "github.com/openebs/api/v3/pkg/apis/cstor/v1"
"k8s.io/apimachinery/pkg/util/strategicpatch"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/driver/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"time"

"github.com/container-storage-interface/spec/lib/go/csi"
apisv1 "github.com/openebs/api/v2/pkg/apis/cstor/v1"
apisv1 "github.com/openebs/api/v3/pkg/apis/cstor/v1"
"github.com/openebs/cstor-csi/pkg/env"
k8snode "github.com/openebs/cstor-csi/pkg/kubernetes/node"
csipayload "github.com/openebs/cstor-csi/pkg/payload"
Expand Down
2 changes: 1 addition & 1 deletion pkg/driver/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"strings"

"github.com/container-storage-interface/spec/lib/go/csi"
apis "github.com/openebs/api/v2/pkg/apis/cstor/v1"
apis "github.com/openebs/api/v3/pkg/apis/cstor/v1"
iscsiutils "github.com/openebs/cstor-csi/pkg/iscsi"
k8snode "github.com/openebs/cstor-csi/pkg/kubernetes/node"
utils "github.com/openebs/cstor-csi/pkg/utils"
Expand Down
2 changes: 1 addition & 1 deletion pkg/driver/node_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

"github.com/container-storage-interface/spec/lib/go/csi"
"github.com/kubernetes-csi/csi-lib-iscsi/iscsi"
apis "github.com/openebs/api/v2/pkg/apis/cstor/v1"
apis "github.com/openebs/api/v3/pkg/apis/cstor/v1"
"github.com/openebs/cstor-csi/pkg/cstor/volumeattachment"
iscsiutils "github.com/openebs/cstor-csi/pkg/iscsi"
k8snode "github.com/openebs/cstor-csi/pkg/kubernetes/node"
Expand Down
2 changes: 1 addition & 1 deletion pkg/driver/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"

"github.com/container-storage-interface/spec/lib/go/csi"
apisv1 "github.com/openebs/api/v2/pkg/apis/cstor/v1"
apisv1 "github.com/openebs/api/v3/pkg/apis/cstor/v1"
utils "github.com/openebs/cstor-csi/pkg/utils"
"golang.org/x/sys/unix"
corev1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/iscsi/iscsi_extra_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"

"github.com/container-storage-interface/spec/lib/go/csi"
apis "github.com/openebs/api/v2/pkg/apis/cstor/v1"
apis "github.com/openebs/api/v3/pkg/apis/cstor/v1"
utilexec "k8s.io/utils/exec"
"k8s.io/utils/mount"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/iscsi/mount.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package iscsi

import (
apis "github.com/openebs/api/v2/pkg/apis/cstor/v1"
apis "github.com/openebs/api/v3/pkg/apis/cstor/v1"
utilexec "k8s.io/utils/exec"
"k8s.io/utils/mount"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package utils

import (
apis "github.com/openebs/api/v2/pkg/apis/cstor/v1"
apis "github.com/openebs/api/v3/pkg/apis/cstor/v1"
csv "github.com/openebs/cstor-csi/pkg/cstor/volume"
csivolume "github.com/openebs/cstor-csi/pkg/cstor/volumeattachment"
node "github.com/openebs/cstor-csi/pkg/kubernetes/node"
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/maya.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"strings"
"time"

cstorapis "github.com/openebs/api/v2/pkg/apis/cstor/v1"
cstorapis "github.com/openebs/api/v3/pkg/apis/cstor/v1"
cv "github.com/openebs/cstor-csi/pkg/cstor/volume"
csivol "github.com/openebs/cstor-csi/pkg/cstor/volumeattachment"
cvc "github.com/openebs/cstor-csi/pkg/cstor/volumeconfig"
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (

"github.com/google/uuid"
"github.com/kubernetes-csi/csi-lib-utils/protosanitizer"
apis "github.com/openebs/api/v2/pkg/apis/cstor/v1"
apis "github.com/openebs/api/v3/pkg/apis/cstor/v1"
"github.com/openebs/cstor-csi/pkg/cstor/snapshot"
iscsiutils "github.com/openebs/cstor-csi/pkg/iscsi"
"github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
openebsv1 "github.com/openebs/api/v2/pkg/apis/cstor/v1"
openebsv1 "github.com/openebs/api/v3/pkg/apis/cstor/v1"
corev1 "k8s.io/api/core/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/run_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
//. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

apis "github.com/openebs/api/v2/pkg/apis/openebs.io/v1alpha1"
apis "github.com/openebs/api/v3/pkg/apis/openebs.io/v1alpha1"
)

func execAtLocal(cmd string, input []byte, args ...string) ([]byte, []byte, error) {
Expand Down
File renamed without changes.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e8cc59f

Please sign in to comment.