Move to k8s 1.19 and updates vendors for klogv2

go.mod

@@ -3,49 +3,41 @@ module github.com/kubernetes-csi/csi-driver-iscsi
 go 1.13
 
 require (
-	github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 // indirect
-	github.com/container-storage-interface/spec v1.1.0
-	github.com/docker/distribution v2.7.1+incompatible // indirect
-	github.com/gogo/protobuf v1.1.1 // indirect
+	github.com/container-storage-interface/spec v1.2.0
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff // indirect
-	github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
-	github.com/googleapis/gnostic v0.2.0 // indirect
-	github.com/hashicorp/golang-lru v0.5.0 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/json-iterator/go v1.1.5 // indirect
 	github.com/kubernetes-csi/csi-lib-iscsi v0.0.0-20190415173011-c545557492f4
 	github.com/kubernetes-csi/csi-lib-utils v0.2.0
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
-	github.com/onsi/ginkgo v1.11.0 // indirect
 	github.com/onsi/gomega v1.8.1 // indirect
-	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
-	github.com/pborman/uuid v1.2.0 // indirect
-	github.com/prometheus/client_golang v0.9.1 // indirect
-	github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 // indirect
-	github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce // indirect
-	github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d // indirect
-	github.com/spf13/cobra v0.0.3
-	github.com/spf13/pflag v1.0.3 // indirect
-	golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869 // indirect
-	golang.org/x/net v0.0.0-20181113165502-88d92db4c548
-	golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288 // indirect
-	golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 // indirect
-	golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
-	google.golang.org/appengine v1.3.0 // indirect
-	google.golang.org/genproto v0.0.0-20181109154231-b5d43981345b // indirect
-	google.golang.org/grpc v1.16.0
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	k8s.io/api v0.0.0-20190313235455-40a48860b5ab // indirect
-	k8s.io/apiextensions-apiserver v0.0.0-20190315093550-53c4693659ed // indirect
-	k8s.io/apimachinery v0.0.0-20181110190943-2a7c93004028 // indirect
-	k8s.io/apiserver v0.0.0-20190313205120-8b27c41bdbb1 // indirect
-	k8s.io/client-go v11.0.0+incompatible // indirect
-	k8s.io/cloud-provider v0.0.0-20190314002645-c892ea32361a // indirect
-	k8s.io/kube-openapi v0.0.0-20181109181836-c59034cc13d5 // indirect
-	k8s.io/kubernetes v1.14.3
-	k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a // indirect
-	sigs.k8s.io/yaml v1.1.0 // indirect
+	github.com/spf13/cobra v1.0.0
+	golang.org/x/net v0.0.0-20200707034311-ab3426394381
+	google.golang.org/grpc v1.27.0
+	k8s.io/kubernetes v1.19.4
+	k8s.io/utils v0.0.0-20200729134348-d5654de09c73
+)
+
+replace (
+	k8s.io/api => k8s.io/api v0.19.4
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.4
+	k8s.io/apimachinery => k8s.io/apimachinery v0.19.4
+	k8s.io/apiserver => k8s.io/apiserver v0.19.4
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.4
+	k8s.io/client-go => k8s.io/client-go v0.19.4
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.4
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.4
+	k8s.io/code-generator => k8s.io/code-generator v0.19.4
+	k8s.io/component-base => k8s.io/component-base v0.19.4
+	k8s.io/cri-api => k8s.io/cri-api v0.19.4
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.4
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.4
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.4
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.4
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.4
+	k8s.io/kubectl => k8s.io/kubectl v0.19.4
+	k8s.io/kubelet => k8s.io/kubelet v0.19.4
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.4
+	k8s.io/metrics => k8s.io/metrics v0.19.4
+	k8s.io/node-api => k8s.io/node-api v0.19.4
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.4
+	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.19.4
+	k8s.io/sample-controller => k8s.io/sample-controller v0.19.4
 )

pkg/iscsi/iscsi.go

@@ -24,8 +24,9 @@ import (
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	iscsi_lib "github.com/kubernetes-csi/csi-lib-iscsi/iscsi"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume/util"
+	"k8s.io/utils/exec"
+	"k8s.io/utils/mount"
 )
 
 func getISCSIInfo(req *csi.NodePublishVolumeRequest) (*iscsiDisk, error) {
@@ -125,8 +126,8 @@ func getISCSIDiskMounter(iscsiInfo *iscsiDisk, req *csi.NodePublishVolumeRequest
 		fsType:       fsType,
 		readOnly:     readOnly,
 		mountOptions: mountOptions,
-		mounter:      &mount.SafeFormatAndMount{Interface: mount.New(""), Exec: mount.NewOsExec()},
-		exec:         mount.NewOsExec(),
+		mounter:      &mount.SafeFormatAndMount{Interface: mount.New(""), Exec: exec.New()},
+		exec:         exec.New(),
 		targetPath:   req.GetTargetPath(),
 		deviceUtil:   util.NewDeviceHandler(util.NewIOHandler()),
 		connector:    buildISCSIConnector(iscsiInfo),
@@ -139,7 +140,7 @@ func getISCSIDiskUnmounter(req *csi.NodeUnpublishVolumeRequest) *iscsiDiskUnmoun
 			VolName: req.GetVolumeId(),
 		},
 		mounter: mount.New(""),
-		exec:    mount.NewOsExec(),
+		exec:    exec.New(),
 	}
 }
 
@@ -228,7 +229,7 @@ type iscsiDiskMounter struct {
 	fsType       string
 	mountOptions []string
 	mounter      *mount.SafeFormatAndMount
-	exec         mount.Exec
+	exec         exec.Interface
 	deviceUtil   util.DeviceUtil
 	targetPath   string
 	connector    *iscsi_lib.Connector
@@ -237,5 +238,5 @@ type iscsiDiskMounter struct {
 type iscsiDiskUnmounter struct {
 	*iscsiDisk
 	mounter mount.Interface
-	exec    mount.Exec
+	exec    exec.Interface
 }

pkg/iscsi/iscsi_util.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/golang/glog"
 	iscsi_lib "github.com/kubernetes-csi/csi-lib-iscsi/iscsi"
-	"k8s.io/kubernetes/pkg/util/mount"
+	"k8s.io/utils/mount"
 )
 
 type ISCSIUtil struct{}