Skip to content

Commit c66e140

Browse files
fix: introduce /v5 module suffix for go.mod
changes the go.mod path to add /v5 so that go module is resolved properly
1 parent e45cf27 commit c66e140

File tree

10 files changed

+19
-19
lines changed

10 files changed

+19
-19
lines changed

.prow.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/bash
22

3-
CSI_PROW_SIDECAR_E2E_IMPORT_PATH="github.com/kubernetes-csi/external-provisioner/test/e2e"
3+
CSI_PROW_SIDECAR_E2E_IMPORT_PATH="github.com/kubernetes-csi/external-provisioner/v5/test/e2e"
44

55
. release-tools/prow.sh
66

cmd/csi-provisioner/csi-provisioner.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3939
"k8s.io/apimachinery/pkg/labels"
4040
"k8s.io/apimachinery/pkg/runtime/schema"
41-
validation "k8s.io/apimachinery/pkg/util/validation"
41+
"k8s.io/apimachinery/pkg/util/validation"
4242
utilfeature "k8s.io/apiserver/pkg/util/feature"
4343
"k8s.io/client-go/informers"
4444
"k8s.io/client-go/kubernetes"
@@ -52,17 +52,17 @@ import (
5252
_ "k8s.io/component-base/metrics/prometheus/clientgo/leaderelection" // register leader election in the default legacy registry
5353
_ "k8s.io/component-base/metrics/prometheus/workqueue" // register work queues in the default legacy registry
5454
csitrans "k8s.io/csi-translation-lib"
55-
klog "k8s.io/klog/v2"
55+
"k8s.io/klog/v2"
5656
"sigs.k8s.io/sig-storage-lib-external-provisioner/v10/controller"
5757
libmetrics "sigs.k8s.io/sig-storage-lib-external-provisioner/v10/controller/metrics"
5858

5959
"github.com/kubernetes-csi/csi-lib-utils/leaderelection"
6060
"github.com/kubernetes-csi/csi-lib-utils/metrics"
61-
"github.com/kubernetes-csi/external-provisioner/pkg/capacity"
62-
"github.com/kubernetes-csi/external-provisioner/pkg/capacity/topology"
63-
ctrl "github.com/kubernetes-csi/external-provisioner/pkg/controller"
64-
"github.com/kubernetes-csi/external-provisioner/pkg/features"
65-
"github.com/kubernetes-csi/external-provisioner/pkg/owner"
61+
"github.com/kubernetes-csi/external-provisioner/v5/pkg/capacity"
62+
"github.com/kubernetes-csi/external-provisioner/v5/pkg/capacity/topology"
63+
ctrl "github.com/kubernetes-csi/external-provisioner/v5/pkg/controller"
64+
"github.com/kubernetes-csi/external-provisioner/v5/pkg/features"
65+
"github.com/kubernetes-csi/external-provisioner/v5/pkg/owner"
6666
snapclientset "github.com/kubernetes-csi/external-snapshotter/client/v6/clientset/versioned"
6767
gatewayclientset "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned"
6868
gatewayInformers "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions"

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/kubernetes-csi/external-provisioner
1+
module github.com/kubernetes-csi/external-provisioner/v5
22

33
go 1.22.3
44

pkg/capacity/capacity.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"time"
2828

2929
"github.com/container-storage-interface/spec/lib/go/csi"
30-
"github.com/kubernetes-csi/external-provisioner/pkg/capacity/topology"
30+
"github.com/kubernetes-csi/external-provisioner/v5/pkg/capacity/topology"
3131
"google.golang.org/grpc"
3232
v1 "k8s.io/api/core/v1"
3333
storagev1 "k8s.io/api/storage/v1"

pkg/capacity/capacity_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"time"
3131

3232
"github.com/container-storage-interface/spec/lib/go/csi"
33-
"github.com/kubernetes-csi/external-provisioner/pkg/capacity/topology"
33+
"github.com/kubernetes-csi/external-provisioner/v5/pkg/capacity/topology"
3434
"github.com/stretchr/testify/require"
3535
"google.golang.org/grpc"
3636
"google.golang.org/protobuf/types/known/wrapperspb"

pkg/controller/controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
"github.com/container-storage-interface/spec/lib/go/csi"
2929
"github.com/kubernetes-csi/csi-lib-utils/accessmodes"
30-
"github.com/kubernetes-csi/external-provisioner/pkg/features"
30+
"github.com/kubernetes-csi/external-provisioner/v5/pkg/features"
3131
"google.golang.org/grpc"
3232
"google.golang.org/grpc/codes"
3333
"google.golang.org/grpc/status"
@@ -50,7 +50,7 @@ import (
5050
"k8s.io/client-go/tools/cache"
5151
"k8s.io/client-go/tools/record"
5252
"k8s.io/client-go/util/workqueue"
53-
klog "k8s.io/klog/v2"
53+
"k8s.io/klog/v2"
5454
"sigs.k8s.io/sig-storage-lib-external-provisioner/v10/controller"
5555
"sigs.k8s.io/sig-storage-lib-external-provisioner/v10/util"
5656

pkg/controller/controller_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ import (
4646
"k8s.io/component-base/featuregate"
4747
utilfeaturetesting "k8s.io/component-base/featuregate/testing"
4848
csitrans "k8s.io/csi-translation-lib"
49-
klog "k8s.io/klog/v2"
49+
"k8s.io/klog/v2"
5050
"sigs.k8s.io/sig-storage-lib-external-provisioner/v10/controller"
5151

5252
"github.com/kubernetes-csi/csi-lib-utils/connection"
5353
"github.com/kubernetes-csi/csi-lib-utils/metrics"
5454
"github.com/kubernetes-csi/csi-lib-utils/rpc"
5555
"github.com/kubernetes-csi/csi-test/v5/driver"
56-
"github.com/kubernetes-csi/external-provisioner/pkg/features"
56+
"github.com/kubernetes-csi/external-provisioner/v5/pkg/features"
5757
crdv1 "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
5858
"github.com/kubernetes-csi/external-snapshotter/client/v6/clientset/versioned/fake"
5959
gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"

pkg/controller/fake_translator_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Automatically generated by MockGen. DO NOT EDIT!
2-
// Source: github.com/kubernetes-csi/external-provisioner/pkg/controller (interfaces: ProvisionerCSITranslator)
2+
// Source: github.com/kubernetes-csi/external-provisioner/v5/pkg/controller (interfaces: ProvisionerCSITranslator)
33

44
package controller
55

66
import (
7-
gomock "github.com/golang/mock/gomock"
7+
"github.com/golang/mock/gomock"
88
v1 "k8s.io/api/core/v1"
99
storagev1 "k8s.io/api/storage/v1"
1010
)

pkg/controller/topology.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626

2727
"github.com/container-storage-interface/spec/lib/go/csi"
2828
"github.com/kubernetes-csi/csi-lib-utils/rpc"
29-
"github.com/kubernetes-csi/external-provisioner/pkg/features"
29+
"github.com/kubernetes-csi/external-provisioner/v5/pkg/features"
3030
v1 "k8s.io/api/core/v1"
3131
storagev1 "k8s.io/api/storage/v1"
3232
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

test/e2e/e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"k8s.io/kubernetes/test/e2e/framework/config"
1313

1414
// test sources
15-
_ "github.com/kubernetes-csi/external-provisioner/test/e2e/storage"
15+
_ "github.com/kubernetes-csi/external-provisioner/v5/test/e2e/storage"
1616
)
1717

1818
func TestMain(m *testing.M) {

0 commit comments

Comments
 (0)