Merge pull request #275 from alexander-ding/enh/migrate-v2

Bump version to v2
kubernetes-csi · Oct 25, 2022 · 312980b · 312980b
2 parents 4c73b12 + 7f83b4f
commit 312980b
Show file tree

Hide file tree

Showing 24 changed files with 41 additions and 41 deletions.
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/kubernetes-csi/csi-proxy
+module github.com/kubernetes-csi/csi-proxy/v2
 
 go 1.16
 

diff --git a/integrationtests/disk_test.go b/integrationtests/disk_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/kubernetes-csi/csi-proxy/pkg/disk"
-	diskapi "github.com/kubernetes-csi/csi-proxy/pkg/disk/hostapi"
+	"github.com/kubernetes-csi/csi-proxy/v2/pkg/disk"
+	diskapi "github.com/kubernetes-csi/csi-proxy/v2/pkg/disk/hostapi"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

diff --git a/integrationtests/filesystem_test.go b/integrationtests/filesystem_test.go
@@ -14,8 +14,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/kubernetes-csi/csi-proxy/pkg/filesystem"
-	filesystemapi "github.com/kubernetes-csi/csi-proxy/pkg/filesystem/hostapi"
+	"github.com/kubernetes-csi/csi-proxy/v2/pkg/filesystem"
+	filesystemapi "github.com/kubernetes-csi/csi-proxy/v2/pkg/filesystem/hostapi"
 )
 
 func TestFilesystem(t *testing.T) {

diff --git a/integrationtests/iscsi_test.go b/integrationtests/iscsi_test.go
@@ -6,12 +6,12 @@ import (
 	"strconv"
 	"testing"
 
-	disk "github.com/kubernetes-csi/csi-proxy/pkg/disk"
-	diskapi "github.com/kubernetes-csi/csi-proxy/pkg/disk/hostapi"
-	iscsi "github.com/kubernetes-csi/csi-proxy/pkg/iscsi"
-	iscsiapi "github.com/kubernetes-csi/csi-proxy/pkg/iscsi/hostapi"
-	system "github.com/kubernetes-csi/csi-proxy/pkg/system"
-	systemapi "github.com/kubernetes-csi/csi-proxy/pkg/system/hostapi"
+	disk "github.com/kubernetes-csi/csi-proxy/v2/pkg/disk"
+	diskapi "github.com/kubernetes-csi/csi-proxy/v2/pkg/disk/hostapi"
+	iscsi "github.com/kubernetes-csi/csi-proxy/v2/pkg/iscsi"
+	iscsiapi "github.com/kubernetes-csi/csi-proxy/v2/pkg/iscsi/hostapi"
+	system "github.com/kubernetes-csi/csi-proxy/v2/pkg/system"
+	systemapi "github.com/kubernetes-csi/csi-proxy/v2/pkg/system/hostapi"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/integrationtests/smb_test.go b/integrationtests/smb_test.go
@@ -14,10 +14,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	fs "github.com/kubernetes-csi/csi-proxy/pkg/filesystem"
-	fsapi "github.com/kubernetes-csi/csi-proxy/pkg/filesystem/hostapi"
-	"github.com/kubernetes-csi/csi-proxy/pkg/smb"
-	smbapi "github.com/kubernetes-csi/csi-proxy/pkg/smb/hostapi"
+	fs "github.com/kubernetes-csi/csi-proxy/v2/pkg/filesystem"
+	fsapi "github.com/kubernetes-csi/csi-proxy/v2/pkg/filesystem/hostapi"
+	"github.com/kubernetes-csi/csi-proxy/v2/pkg/smb"
+	smbapi "github.com/kubernetes-csi/csi-proxy/v2/pkg/smb/hostapi"
 )
 
 func TestSMB(t *testing.T) {

diff --git a/integrationtests/system_test.go b/integrationtests/system_test.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"testing"
 
-	system "github.com/kubernetes-csi/csi-proxy/pkg/system"
-	systemapi "github.com/kubernetes-csi/csi-proxy/pkg/system/hostapi"
+	system "github.com/kubernetes-csi/csi-proxy/v2/pkg/system"
+	systemapi "github.com/kubernetes-csi/csi-proxy/v2/pkg/system/hostapi"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/integrationtests/utils.go b/integrationtests/utils.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/kubernetes-csi/csi-proxy/pkg/volume"
+	"github.com/kubernetes-csi/csi-proxy/v2/pkg/volume"
 )
 
 // getKubeletPathForTest returns the path to the current working directory

diff --git a/integrationtests/volume_test.go b/integrationtests/volume_test.go
@@ -8,10 +8,10 @@ import (
 	"strings"
 	"testing"
 
-	disk "github.com/kubernetes-csi/csi-proxy/pkg/disk"
-	diskapi "github.com/kubernetes-csi/csi-proxy/pkg/disk/hostapi"
-	volume "github.com/kubernetes-csi/csi-proxy/pkg/volume"
-	volumeapi "github.com/kubernetes-csi/csi-proxy/pkg/volume/hostapi"
+	disk "github.com/kubernetes-csi/csi-proxy/v2/pkg/disk"
+	diskapi "github.com/kubernetes-csi/csi-proxy/v2/pkg/disk/hostapi"
+	volume "github.com/kubernetes-csi/csi-proxy/v2/pkg/volume"
+	volumeapi "github.com/kubernetes-csi/csi-proxy/v2/pkg/volume/hostapi"
 
 	"github.com/stretchr/testify/require"
 )

diff --git a/pkg/disk/disk.go b/pkg/disk/disk.go
@@ -3,7 +3,7 @@ package disk
 import (
 	"context"
 
-	diskapi "github.com/kubernetes-csi/csi-proxy/pkg/disk/hostapi"
+	diskapi "github.com/kubernetes-csi/csi-proxy/v2/pkg/disk/hostapi"
 	"k8s.io/klog/v2"
 )
 

diff --git a/pkg/disk/hostapi/hostapi.go b/pkg/disk/hostapi/hostapi.go
@@ -10,7 +10,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/kubernetes-csi/csi-proxy/pkg/utils"
+	"github.com/kubernetes-csi/csi-proxy/v2/pkg/utils"
 	"k8s.io/klog/v2"
 )
 

diff --git a/pkg/filesystem/filesystem.go b/pkg/filesystem/filesystem.go
@@ -3,7 +3,7 @@ package filesystem
 import (
 	"context"
 
-	filesystemapi "github.com/kubernetes-csi/csi-proxy/pkg/filesystem/hostapi"
+	filesystemapi "github.com/kubernetes-csi/csi-proxy/v2/pkg/filesystem/hostapi"
 	"k8s.io/klog/v2"
 )
 

diff --git a/pkg/filesystem/filesystem_test.go b/pkg/filesystem/filesystem_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	fsapi "github.com/kubernetes-csi/csi-proxy/pkg/filesystem/hostapi"
+	fsapi "github.com/kubernetes-csi/csi-proxy/v2/pkg/filesystem/hostapi"
 )
 
 type fakeFileSystemAPI struct{}

diff --git a/pkg/filesystem/hostapi/hostapi.go b/pkg/filesystem/hostapi/hostapi.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/kubernetes-csi/csi-proxy/pkg/utils"
+	"github.com/kubernetes-csi/csi-proxy/v2/pkg/utils"
 )
 
 // Implements the Filesystem OS API calls. All code here should be very simple

diff --git a/pkg/filesystem/utils.go b/pkg/filesystem/utils.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/kubernetes-csi/csi-proxy/pkg/utils"
+	"github.com/kubernetes-csi/csi-proxy/v2/pkg/utils"
 )
 
 var invalidPathCharsRegexWindows = regexp.MustCompile(`["/\:\?\*|]`)

diff --git a/pkg/iscsi/hostapi/hostapi.go b/pkg/iscsi/hostapi/hostapi.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/kubernetes-csi/csi-proxy/pkg/utils"
+	"github.com/kubernetes-csi/csi-proxy/v2/pkg/utils"
 )
 
 // Implements the iSCSI OS API calls. All code here should be very simple

diff --git a/pkg/iscsi/iscsi.go b/pkg/iscsi/iscsi.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	iscsiapi "github.com/kubernetes-csi/csi-proxy/pkg/iscsi/hostapi"
+	iscsiapi "github.com/kubernetes-csi/csi-proxy/v2/pkg/iscsi/hostapi"
 	"k8s.io/klog/v2"
 )
 

diff --git a/pkg/smb/hostapi/hostapi.go b/pkg/smb/hostapi/hostapi.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/kubernetes-csi/csi-proxy/pkg/utils"
+	"github.com/kubernetes-csi/csi-proxy/v2/pkg/utils"
 )
 
 type HostAPI interface {

diff --git a/pkg/smb/smb.go b/pkg/smb/smb.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strings"
 
-	fs "github.com/kubernetes-csi/csi-proxy/pkg/filesystem"
-	smbapi "github.com/kubernetes-csi/csi-proxy/pkg/smb/hostapi"
+	fs "github.com/kubernetes-csi/csi-proxy/v2/pkg/filesystem"
+	smbapi "github.com/kubernetes-csi/csi-proxy/v2/pkg/smb/hostapi"
 	"k8s.io/klog/v2"
 )
 

diff --git a/pkg/smb/smb_test.go b/pkg/smb/smb_test.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"testing"
 
-	fs "github.com/kubernetes-csi/csi-proxy/pkg/filesystem"
-	fsapi "github.com/kubernetes-csi/csi-proxy/pkg/filesystem/hostapi"
-	smbapi "github.com/kubernetes-csi/csi-proxy/pkg/smb/hostapi"
+	fs "github.com/kubernetes-csi/csi-proxy/v2/pkg/filesystem"
+	fsapi "github.com/kubernetes-csi/csi-proxy/v2/pkg/filesystem/hostapi"
+	smbapi "github.com/kubernetes-csi/csi-proxy/v2/pkg/smb/hostapi"
 )
 
 type fakeSMBAPI struct{}

diff --git a/pkg/system/hostapi/hostapi.go b/pkg/system/hostapi/hostapi.go
@@ -6,7 +6,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/kubernetes-csi/csi-proxy/pkg/utils"
+	"github.com/kubernetes-csi/csi-proxy/v2/pkg/utils"
 )
 
 // Implements the System OS API calls. All code here should be very simple

diff --git a/pkg/system/system.go b/pkg/system/system.go
@@ -3,7 +3,7 @@ package system
 import (
 	"context"
 
-	systemapi "github.com/kubernetes-csi/csi-proxy/pkg/system/hostapi"
+	systemapi "github.com/kubernetes-csi/csi-proxy/v2/pkg/system/hostapi"
 	"k8s.io/klog/v2"
 )
 

diff --git a/pkg/volume/hostapi/hostapi.go b/pkg/volume/hostapi/hostapi.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/kubernetes-csi/csi-proxy/pkg/utils"
+	"github.com/kubernetes-csi/csi-proxy/v2/pkg/utils"
 	"k8s.io/klog/v2"
 )
 

diff --git a/pkg/volume/volume.go b/pkg/volume/volume.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	volumeapi "github.com/kubernetes-csi/csi-proxy/pkg/volume/hostapi"
+	volumeapi "github.com/kubernetes-csi/csi-proxy/v2/pkg/volume/hostapi"
 	"k8s.io/klog/v2"
 )
 

diff --git a/pkg/volume/volume_test.go b/pkg/volume/volume_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	volumeapi "github.com/kubernetes-csi/csi-proxy/pkg/volume/hostapi"
+	volumeapi "github.com/kubernetes-csi/csi-proxy/v2/pkg/volume/hostapi"
 )
 
 type fakeVolumeAPI struct {