Skip to content

Commit

Permalink
fix: introduce /v5 module suffix for go.mod
Browse files Browse the repository at this point in the history
changes the go.mod path to add /v5 so that go module is resolved properly
  • Loading branch information
jakobmoellerdev committed Jun 24, 2024
1 parent e45cf27 commit 61c5174
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 18 deletions.
14 changes: 7 additions & 7 deletions cmd/csi-provisioner/csi-provisioner.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime/schema"
validation "k8s.io/apimachinery/pkg/util/validation"
"k8s.io/apimachinery/pkg/util/validation"
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes"
Expand All @@ -52,17 +52,17 @@ import (
_ "k8s.io/component-base/metrics/prometheus/clientgo/leaderelection" // register leader election in the default legacy registry
_ "k8s.io/component-base/metrics/prometheus/workqueue" // register work queues in the default legacy registry
csitrans "k8s.io/csi-translation-lib"
klog "k8s.io/klog/v2"
"k8s.io/klog/v2"
"sigs.k8s.io/sig-storage-lib-external-provisioner/v10/controller"
libmetrics "sigs.k8s.io/sig-storage-lib-external-provisioner/v10/controller/metrics"

"github.com/kubernetes-csi/csi-lib-utils/leaderelection"
"github.com/kubernetes-csi/csi-lib-utils/metrics"
"github.com/kubernetes-csi/external-provisioner/pkg/capacity"
"github.com/kubernetes-csi/external-provisioner/pkg/capacity/topology"
ctrl "github.com/kubernetes-csi/external-provisioner/pkg/controller"
"github.com/kubernetes-csi/external-provisioner/pkg/features"
"github.com/kubernetes-csi/external-provisioner/pkg/owner"
"github.com/kubernetes-csi/external-provisioner/v5/pkg/capacity"
"github.com/kubernetes-csi/external-provisioner/v5/pkg/capacity/topology"
ctrl "github.com/kubernetes-csi/external-provisioner/v5/pkg/controller"
"github.com/kubernetes-csi/external-provisioner/v5/pkg/features"
"github.com/kubernetes-csi/external-provisioner/v5/pkg/owner"
snapclientset "github.com/kubernetes-csi/external-snapshotter/client/v6/clientset/versioned"
gatewayclientset "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned"
gatewayInformers "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/kubernetes-csi/external-provisioner
module github.com/kubernetes-csi/external-provisioner/v5

go 1.22.3

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

"github.com/container-storage-interface/spec/lib/go/csi"
"github.com/kubernetes-csi/external-provisioner/pkg/capacity/topology"
"github.com/kubernetes-csi/external-provisioner/v5/pkg/capacity/topology"
"google.golang.org/grpc"
v1 "k8s.io/api/core/v1"
storagev1 "k8s.io/api/storage/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/capacity/capacity_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"time"

"github.com/container-storage-interface/spec/lib/go/csi"
"github.com/kubernetes-csi/external-provisioner/pkg/capacity/topology"
"github.com/kubernetes-csi/external-provisioner/v5/pkg/capacity/topology"
"github.com/stretchr/testify/require"
"google.golang.org/grpc"
"google.golang.org/protobuf/types/known/wrapperspb"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (

"github.com/container-storage-interface/spec/lib/go/csi"
"github.com/kubernetes-csi/csi-lib-utils/accessmodes"
"github.com/kubernetes-csi/external-provisioner/pkg/features"
"github.com/kubernetes-csi/external-provisioner/v5/pkg/features"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
Expand All @@ -50,7 +50,7 @@ import (
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/record"
"k8s.io/client-go/util/workqueue"
klog "k8s.io/klog/v2"
"k8s.io/klog/v2"
"sigs.k8s.io/sig-storage-lib-external-provisioner/v10/controller"
"sigs.k8s.io/sig-storage-lib-external-provisioner/v10/util"

Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ import (
"k8s.io/component-base/featuregate"
utilfeaturetesting "k8s.io/component-base/featuregate/testing"
csitrans "k8s.io/csi-translation-lib"
klog "k8s.io/klog/v2"
"k8s.io/klog/v2"
"sigs.k8s.io/sig-storage-lib-external-provisioner/v10/controller"

"github.com/kubernetes-csi/csi-lib-utils/connection"
"github.com/kubernetes-csi/csi-lib-utils/metrics"
"github.com/kubernetes-csi/csi-lib-utils/rpc"
"github.com/kubernetes-csi/csi-test/v5/driver"
"github.com/kubernetes-csi/external-provisioner/pkg/features"
"github.com/kubernetes-csi/external-provisioner/v5/pkg/features"
crdv1 "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
"github.com/kubernetes-csi/external-snapshotter/client/v6/clientset/versioned/fake"
gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/fake_translator_test.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Automatically generated by MockGen. DO NOT EDIT!
// Source: github.com/kubernetes-csi/external-provisioner/pkg/controller (interfaces: ProvisionerCSITranslator)
// Source: github.com/kubernetes-csi/external-provisioner/v5/pkg/controller (interfaces: ProvisionerCSITranslator)

package controller

import (
gomock "github.com/golang/mock/gomock"
"github.com/golang/mock/gomock"
v1 "k8s.io/api/core/v1"
storagev1 "k8s.io/api/storage/v1"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/topology.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-utils/rpc"
"github.com/kubernetes-csi/external-provisioner/pkg/features"
"github.com/kubernetes-csi/external-provisioner/v5/pkg/features"
v1 "k8s.io/api/core/v1"
storagev1 "k8s.io/api/storage/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"k8s.io/kubernetes/test/e2e/framework/config"

// test sources
_ "github.com/kubernetes-csi/external-provisioner/test/e2e/storage"
_ "github.com/kubernetes-csi/external-provisioner/v5/test/e2e/storage"
)

func TestMain(m *testing.M) {
Expand Down

0 comments on commit 61c5174

Please sign in to comment.