Skip to content

Commit 4b7aec3

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #240 from alex1989hu/feat/fix-gomod-v2-package
fix: go module requirements for semantic versioning
2 parents 0b24a73 + fb6225d commit 4b7aec3

File tree

99 files changed

+169
-93
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+169
-93
lines changed

‎cmd/csi-snapshotter/main.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ import (
3838
"github.com/kubernetes-csi/csi-lib-utils/leaderelection"
3939
"github.com/kubernetes-csi/csi-lib-utils/metrics"
4040
csirpc "github.com/kubernetes-csi/csi-lib-utils/rpc"
41-
controller "github.com/kubernetes-csi/external-snapshotter/pkg/sidecar-controller"
42-
"github.com/kubernetes-csi/external-snapshotter/pkg/snapshotter"
41+
controller "github.com/kubernetes-csi/external-snapshotter/v2/pkg/sidecar-controller"
42+
"github.com/kubernetes-csi/external-snapshotter/v2/pkg/snapshotter"
4343

44-
clientset "github.com/kubernetes-csi/external-snapshotter/pkg/client/clientset/versioned"
45-
snapshotscheme "github.com/kubernetes-csi/external-snapshotter/pkg/client/clientset/versioned/scheme"
46-
informers "github.com/kubernetes-csi/external-snapshotter/pkg/client/informers/externalversions"
44+
clientset "github.com/kubernetes-csi/external-snapshotter/v2/pkg/client/clientset/versioned"
45+
snapshotscheme "github.com/kubernetes-csi/external-snapshotter/v2/pkg/client/clientset/versioned/scheme"
46+
informers "github.com/kubernetes-csi/external-snapshotter/v2/pkg/client/informers/externalversions"
4747
coreinformers "k8s.io/client-go/informers"
4848
)
4949

‎cmd/snapshot-controller/main.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ import (
3131
"k8s.io/klog"
3232

3333
"github.com/kubernetes-csi/csi-lib-utils/leaderelection"
34-
controller "github.com/kubernetes-csi/external-snapshotter/pkg/common-controller"
34+
controller "github.com/kubernetes-csi/external-snapshotter/v2/pkg/common-controller"
3535

36-
clientset "github.com/kubernetes-csi/external-snapshotter/pkg/client/clientset/versioned"
37-
snapshotscheme "github.com/kubernetes-csi/external-snapshotter/pkg/client/clientset/versioned/scheme"
38-
informers "github.com/kubernetes-csi/external-snapshotter/pkg/client/informers/externalversions"
36+
clientset "github.com/kubernetes-csi/external-snapshotter/v2/pkg/client/clientset/versioned"
37+
snapshotscheme "github.com/kubernetes-csi/external-snapshotter/v2/pkg/client/clientset/versioned/scheme"
38+
informers "github.com/kubernetes-csi/external-snapshotter/v2/pkg/client/informers/externalversions"
3939
coreinformers "k8s.io/client-go/informers"
4040
)
4141

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/kubernetes-csi/external-snapshotter
1+
module github.com/kubernetes-csi/external-snapshotter/v2
22

33
go 1.12
44

‎pkg/client/clientset/versioned/clientset.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/clientset/versioned/fake/clientset_generated.go

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/clientset/versioned/fake/register.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/clientset/versioned/scheme/register.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/clientset/versioned/typed/volumesnapshot/v1beta1/fake/fake_volumesnapshot.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/clientset/versioned/typed/volumesnapshot/v1beta1/fake/fake_volumesnapshot_client.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/clientset/versioned/typed/volumesnapshot/v1beta1/fake/fake_volumesnapshotclass.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/clientset/versioned/typed/volumesnapshot/v1beta1/fake/fake_volumesnapshotcontent.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/clientset/versioned/typed/volumesnapshot/v1beta1/volumesnapshot.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/clientset/versioned/typed/volumesnapshot/v1beta1/volumesnapshot_client.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/clientset/versioned/typed/volumesnapshot/v1beta1/volumesnapshotclass.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/clientset/versioned/typed/volumesnapshot/v1beta1/volumesnapshotcontent.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/informers/externalversions/factory.go

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/informers/externalversions/generic.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/informers/externalversions/volumesnapshot/interface.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/informers/externalversions/volumesnapshot/v1beta1/interface.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/informers/externalversions/volumesnapshot/v1beta1/volumesnapshot.go

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/informers/externalversions/volumesnapshot/v1beta1/volumesnapshotclass.go

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/informers/externalversions/volumesnapshot/v1beta1/volumesnapshotcontent.go

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/listers/volumesnapshot/v1beta1/volumesnapshot.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/listers/volumesnapshot/v1beta1/volumesnapshotclass.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/listers/volumesnapshot/v1beta1/volumesnapshotcontent.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/common-controller/framework_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ import (
2828
"testing"
2929
"time"
3030

31-
crdv1 "github.com/kubernetes-csi/external-snapshotter/pkg/apis/volumesnapshot/v1beta1"
32-
clientset "github.com/kubernetes-csi/external-snapshotter/pkg/client/clientset/versioned"
33-
"github.com/kubernetes-csi/external-snapshotter/pkg/client/clientset/versioned/fake"
34-
snapshotscheme "github.com/kubernetes-csi/external-snapshotter/pkg/client/clientset/versioned/scheme"
35-
informers "github.com/kubernetes-csi/external-snapshotter/pkg/client/informers/externalversions"
36-
storagelisters "github.com/kubernetes-csi/external-snapshotter/pkg/client/listers/volumesnapshot/v1beta1"
37-
"github.com/kubernetes-csi/external-snapshotter/pkg/utils"
31+
crdv1 "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
32+
clientset "github.com/kubernetes-csi/external-snapshotter/v2/pkg/client/clientset/versioned"
33+
"github.com/kubernetes-csi/external-snapshotter/v2/pkg/client/clientset/versioned/fake"
34+
snapshotscheme "github.com/kubernetes-csi/external-snapshotter/v2/pkg/client/clientset/versioned/scheme"
35+
informers "github.com/kubernetes-csi/external-snapshotter/v2/pkg/client/informers/externalversions"
36+
storagelisters "github.com/kubernetes-csi/external-snapshotter/v2/pkg/client/listers/volumesnapshot/v1beta1"
37+
"github.com/kubernetes-csi/external-snapshotter/v2/pkg/utils"
3838
v1 "k8s.io/api/core/v1"
3939
storagev1 "k8s.io/api/storage/v1"
4040
"k8s.io/apimachinery/pkg/api/resource"

‎pkg/common-controller/snapshot_controller.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"strings"
2222
"time"
2323

24-
crdv1 "github.com/kubernetes-csi/external-snapshotter/pkg/apis/volumesnapshot/v1beta1"
25-
"github.com/kubernetes-csi/external-snapshotter/pkg/utils"
24+
crdv1 "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
25+
"github.com/kubernetes-csi/external-snapshotter/v2/pkg/utils"
2626
"k8s.io/api/core/v1"
2727
storagev1 "k8s.io/api/storage/v1"
2828
apierrs "k8s.io/apimachinery/pkg/api/errors"

‎pkg/common-controller/snapshot_controller_base.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import (
2020
"fmt"
2121
"time"
2222

23-
crdv1 "github.com/kubernetes-csi/external-snapshotter/pkg/apis/volumesnapshot/v1beta1"
24-
clientset "github.com/kubernetes-csi/external-snapshotter/pkg/client/clientset/versioned"
25-
storageinformers "github.com/kubernetes-csi/external-snapshotter/pkg/client/informers/externalversions/volumesnapshot/v1beta1"
26-
storagelisters "github.com/kubernetes-csi/external-snapshotter/pkg/client/listers/volumesnapshot/v1beta1"
27-
"github.com/kubernetes-csi/external-snapshotter/pkg/utils"
23+
crdv1 "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
24+
clientset "github.com/kubernetes-csi/external-snapshotter/v2/pkg/client/clientset/versioned"
25+
storageinformers "github.com/kubernetes-csi/external-snapshotter/v2/pkg/client/informers/externalversions/volumesnapshot/v1beta1"
26+
storagelisters "github.com/kubernetes-csi/external-snapshotter/v2/pkg/client/listers/volumesnapshot/v1beta1"
27+
"github.com/kubernetes-csi/external-snapshotter/v2/pkg/utils"
2828

2929
"k8s.io/api/core/v1"
3030
"k8s.io/apimachinery/pkg/api/errors"

‎pkg/common-controller/snapshot_controller_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package common_controller
1919
import (
2020
"testing"
2121

22-
crdv1 "github.com/kubernetes-csi/external-snapshotter/pkg/apis/volumesnapshot/v1beta1"
23-
"github.com/kubernetes-csi/external-snapshotter/pkg/utils"
22+
crdv1 "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
23+
"github.com/kubernetes-csi/external-snapshotter/v2/pkg/utils"
2424
"k8s.io/client-go/tools/cache"
2525
)
2626

‎pkg/common-controller/snapshot_create_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"testing"
2222
"time"
2323

24-
crdv1 "github.com/kubernetes-csi/external-snapshotter/pkg/apis/volumesnapshot/v1beta1"
24+
crdv1 "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
2525
v1 "k8s.io/api/core/v1"
2626
storage "k8s.io/api/storage/v1"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎pkg/common-controller/snapshot_delete_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
//"errors"
2121
"testing"
2222

23-
crdv1 "github.com/kubernetes-csi/external-snapshotter/pkg/apis/volumesnapshot/v1beta1"
24-
"github.com/kubernetes-csi/external-snapshotter/pkg/utils"
23+
crdv1 "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
24+
"github.com/kubernetes-csi/external-snapshotter/v2/pkg/utils"
2525
v1 "k8s.io/api/core/v1"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
)

‎pkg/sidecar-controller/csi_handler.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import (
2222
"strings"
2323
"time"
2424

25-
crdv1 "github.com/kubernetes-csi/external-snapshotter/pkg/apis/volumesnapshot/v1beta1"
26-
"github.com/kubernetes-csi/external-snapshotter/pkg/snapshotter"
27-
"github.com/kubernetes-csi/external-snapshotter/pkg/utils"
25+
crdv1 "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
26+
"github.com/kubernetes-csi/external-snapshotter/v2/pkg/snapshotter"
27+
"github.com/kubernetes-csi/external-snapshotter/v2/pkg/utils"
2828
)
2929

3030
// Handler is responsible for handling VolumeSnapshot events from informer.

0 commit comments

Comments
 (0)