go.mod: Remove dependecy on k8s.io/kubernetes

While I was trying to bump up the dependecy in go mod for
k8s.io/kubernetes I noticed we our go mod fails, and I could not
add a new depedency on volume subpackage.

There are some client packages like client-go and k8s.io/utils that are
meant to be imported and are simple to do.

There is an effort to extract common code to client packages so they can
be imported easily. Some example libraries are:
* k8s.io/utils/exec
* k8s.io/mount-utils
that enable to use the mount/resizefs functions.

all packages under k8s.io/kubernetes are not meant to be imported but
sometimes we must, cause there are useful stuff there.

See this post about the problem:
https://suraj.io/post/2021/05/k8s-import/

I came across this comment:
kubernetes/kubernetes#79384 (comment)
recomending using replace

Changes applied:
* use mount-utils package instead of k8s.io/kubernetes/pkg/utils/mount
* use mount-utils package instead of k8s.io/kubernetes/pkg/util/resizefs
* upgrade k8s.io/kubernetes dependency to 1.20
* upgrade csi spec to 1.3.0
* upgrade go.mod to golang 1.16 and update vendor folder
* scripts/download-deps.sh: add script to upgrade k8s deps easily

issue: LBM1-17861

Author: yogev-lb

go.mod

@@ -1,25 +1,53 @@
 module github.com/lightbitslabs/los-csi
 
-go 1.10
+go 1.16
 
 require (
-	github.com/container-storage-interface/spec v1.2.0
+	github.com/container-storage-interface/spec v1.3.0
 	github.com/dell/gofsutil v1.4.0
 	github.com/fsnotify/fsnotify v1.4.9
-	github.com/gogo/protobuf v1.3.1 // indirect
-	github.com/golang/protobuf v1.3.3
-	github.com/google/uuid v1.1.1
-	github.com/grpc-ecosystem/go-grpc-middleware v1.0.0
-	github.com/grpc-ecosystem/grpc-gateway v1.11.3
+	github.com/golang/protobuf v1.5.2
+	github.com/google/uuid v1.1.2
+	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
+	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/kubernetes-csi/csi-test/v3 v3.1.1
-	github.com/sirupsen/logrus v1.4.2
-	github.com/spf13/afero v1.2.2 // indirect
+	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.2.2
-	google.golang.org/genproto v0.0.0-20191114150713-6bbd007550de
-	google.golang.org/grpc v1.29.1
+	github.com/stretchr/testify v1.7.0
+	google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c
+	google.golang.org/grpc v1.38.0
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/apimachinery v0.0.0-20181108192626-90473842928c // indirect
-	k8s.io/kubernetes v1.11.10
-	k8s.io/utils v0.0.0-20180726175726-66066c83e385 // indirect
+	k8s.io/mount-utils v0.21.4
+	k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9
+)
+
+replace (
+	//
+	// k8s.io/kubernetes depends on these k8s.io packages, but unversioned
+	//
+	k8s.io/api => k8s.io/api v0.21.4
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.4
+	k8s.io/apimachinery => k8s.io/apimachinery v0.21.4
+	k8s.io/apiserver => k8s.io/apiserver v0.21.4
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.4
+	k8s.io/client-go => k8s.io/client-go v0.21.4
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.4
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.4
+	k8s.io/code-generator => k8s.io/code-generator v0.21.4
+	k8s.io/component-base => k8s.io/component-base v0.21.4
+	k8s.io/component-helpers => k8s.io/component-helpers v0.21.4
+	k8s.io/controller-manager => k8s.io/controller-manager v0.21.4
+	k8s.io/cri-api => k8s.io/cri-api v0.21.4
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.4
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.4
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.4
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.4
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.4
+	k8s.io/kubectl => k8s.io/kubectl v0.21.4
+	k8s.io/kubelet => k8s.io/kubelet v0.21.4
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.4
+	k8s.io/metrics => k8s.io/metrics v0.21.4
+	k8s.io/mount-utils => k8s.io/mount-utils v0.21.4
+	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.21.4
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.4
 )

go.sum

@@ -359,6 +359,12 @@ func (d *Driver) CreateVolume(
 	return vol, nil
 }
 
+func (d *Driver) ControllerGetVolume(
+	ctx context.Context, req *csi.ControllerGetVolumeRequest,
+) (*csi.ControllerGetVolumeResponse, error) {
+	return nil, status.Error(codes.Unimplemented, "")
+}
+
 func (d *Driver) DeleteVolume(
 	ctx context.Context, req *csi.DeleteVolumeRequest,
 ) (*csi.DeleteVolumeResponse, error) {

pkg/driver/controller.go

@@ -26,7 +26,8 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
-	"k8s.io/kubernetes/pkg/util/mount"
+	mountutils "k8s.io/mount-utils"
+	"k8s.io/utils/exec"
 
 	"github.com/lightbitslabs/los-csi/pkg/driver/backend"
 	_ "github.com/lightbitslabs/los-csi/pkg/driver/backend/dsc" // register backend
@@ -105,7 +106,7 @@ type Driver struct {
 
 	lbclients *lb.ClientPool
 
-	mounter *mount.SafeFormatAndMount
+	mounter *mountutils.SafeFormatAndMount
 
 	be backend.Backend
 
@@ -289,9 +290,9 @@ func New(cfg Config) (*Driver, error) { // nolint:gocritic
 	// it's too good to reimplement from scratch.
 	// TODO: actually, should be passed in as part of the config, to allow
 	// testing/mocking...
-	d.mounter = &mount.SafeFormatAndMount{
-		Interface: mount.New(""),
-		Exec:      mount.NewOsExec(),
+	d.mounter = &mountutils.SafeFormatAndMount{
+		Interface: mountutils.New(""),
+		Exec:      exec.New(),
 	}
 
 	lbdialer := func(

pkg/driver/driver.go

@@ -18,8 +18,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"k8s.io/kubernetes/pkg/util/mount"
-	"k8s.io/kubernetes/pkg/util/resizefs"
+	mountutils "k8s.io/mount-utils"
 
 	"github.com/lightbitslabs/los-csi/pkg/driver/backend"
 	"github.com/lightbitslabs/los-csi/pkg/lb"
@@ -226,7 +225,7 @@ func (d *Driver) NodeStageVolume(
 	// path, or some such). and i THINK i can see `kubelet` creating it
 	// before calling the plugins...
 	tgtPath := req.StagingTargetPath
-	notMnt, err := d.mounter.IsNotMountPoint(tgtPath)
+	notMnt, err := mountutils.IsNotMountPoint(d.mounter, tgtPath)
 	if os.IsNotExist(err) {
 		return nil, mkEinvalf("staging_target_path",
 			"'%s' doesn't exist", tgtPath)
@@ -235,7 +234,7 @@ func (d *Driver) NodeStageVolume(
 	}
 	// don't you not like double negatives?
 	if !notMnt {
-		dev, _, err := mount.GetDeviceNameFromMount(d.mounter, tgtPath)
+		dev, _, err := mountutils.GetDeviceNameFromMount(d.mounter, tgtPath)
 		if err != nil {
 			log.Debugf("failed to find what's mounted at '%s': %s", tgtPath, err)
 		}
@@ -317,7 +316,7 @@ func (d *Driver) NodeStageVolume(
 	// In case the volume came from a snapshot and happens to also be
 	// larger in capacity, we want to update the fs size accordingly, we
 	// don't care really if any actual resize happened...
-	resizer := resizefs.NewResizeFs(d.mounter)
+	resizer := mountutils.NewResizeFs(d.mounter.Exec)
 	_, err = resizer.Resize(devPath, tgtPath)
 	if err != nil {
 		return nil, mkEExec("error when resizing device %s after mount: %v", vid.uuid, err)
@@ -353,7 +352,7 @@ func (d *Driver) NodeUnstageVolume(
 	// retrying the call...
 	vid = vid
 
-	notMnt, err := d.mounter.IsNotMountPoint(tgtPath)
+	notMnt, err := mountutils.IsNotMountPoint(d.mounter, tgtPath)
 	if err != nil && !os.IsNotExist(err) {
 		return nil, mkEExec("can't examine staging path: %s", err)
 	}
@@ -385,7 +384,7 @@ func (d *Driver) nodePublishVolumeForBlock(
 
 	// Create the mount point as a file since bind mount device node requires it to be a file
 	log.Debugf("Creating target file %s", target)
-	err = d.mounter.MakeFile(target)
+	err = MakeFile(target)
 	if err != nil {
 		if removeErr := os.Remove(target); removeErr != nil {
 			return &csi.NodePublishVolumeResponse{},
@@ -408,6 +407,19 @@ func (d *Driver) nodePublishVolumeForBlock(
 	return &csi.NodePublishVolumeResponse{}, nil
 }
 
+func MakeFile(path string) error {
+	f, err := os.OpenFile(path, os.O_CREATE, os.FileMode(0644))
+	if err != nil {
+		if !os.IsExist(err) {
+			return err
+		}
+	}
+	if err = f.Close(); err != nil {
+		return err
+	}
+	return nil
+}
+
 func getDeviceNameFromMount(ctx context.Context, tgtPath string) (string, error) {
 	info, err := gofsutil.GetMounts(ctx)
 	if err != nil {
@@ -495,7 +507,7 @@ func (d *Driver) NodePublishVolume(
 
 	// for idempotency - start in reverse order:
 	if _, err := os.Stat(req.TargetPath); err == nil {
-		notMnt, err := d.mounter.IsNotMountPoint(req.TargetPath)
+		notMnt, err := mountutils.IsNotMountPoint(d.mounter, req.TargetPath)
 		if os.IsNotExist(err) {
 			return nil, mkEinvalf("target_path", "'%s' doesn't exist", req.TargetPath)
 		} else if err != nil {
@@ -550,7 +562,7 @@ func (d *Driver) NodeUnpublishVolume(
 	defer d.bdl.Unlock()
 
 	tgtPath := req.TargetPath
-	notMnt, err := d.mounter.IsNotMountPoint(tgtPath)
+	notMnt, err := mountutils.IsNotMountPoint(d.mounter, tgtPath)
 	if err != nil && !os.IsNotExist(err) {
 		return nil, mkEExec("can't examine staging path: %s", err)
 	}
@@ -638,7 +650,7 @@ func (d *Driver) NodeExpandVolume(
 		return nil, err
 	}
 
-	resizer := resizefs.NewResizeFs(d.mounter)
+	resizer := mountutils.NewResizeFs(d.mounter.Exec)
 	resizedOccurred, err := resizer.Resize(devicePath, volumePath)
 	if err != nil {
 		return nil, mkInternal("Could not resize volume %s (%s): %s", vid.uuid, devicePath, err)

pkg/driver/node.go

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+VERSION=${1#"v"}
+if [ -z "$VERSION" ]; then
+  echo "Please specify the Kubernetes version: e.g."
+  echo "./download-deps.sh v1.21.0"
+  exit 1
+fi
+
+set -euo pipefail
+
+# Find out all the replaced imports, make a list of them.
+MODS=($(
+  curl -sS "https://raw.githubusercontent.com/kubernetes/kubernetes/v${VERSION}/go.mod" |
+    sed -n 's|.*k8s.io/\(.*\) => ./staging/src/k8s.io/.*|k8s.io/\1|p'
+))
+
+# Now add those similar replace statements in the local go.mod file, but first find the version that
+# the Kubernetes is using for them.
+for MOD in "${MODS[@]}"; do
+  V=$(
+    go mod download -json "${MOD}@kubernetes-${VERSION}" |
+      sed -n 's|.*"Version": "\(.*\)".*|\1|p'
+  )
+
+  go mod edit "-replace=${MOD}=${MOD}@${V}"
+done
+
+go get "k8s.io/kubernetes@v${VERSION}"
+go mod download
+go mod vendor