Merge pull request kubernetes-sigs#1079 from mskanth972/K8sup_and_bye…

…-ssh

updates go and k8s packages and removes SSH from CI as it is unnecessary and introduces a potential flake point.

Makefile

@@ -123,12 +123,13 @@ test-e2e:
 	AWS_AVAILABILITY_ZONES=us-west-2a,us-west-2b,us-west-2c \
 	TEST_PATH=./test/e2e/... \
 	GINKGO_FOCUS="\[efs-csi\]" \
+	GINKGO_SKIP="\[Disruptive\]|\[Serial\]" \
 	./hack/e2e/run.sh
 
 .PHONY: test-e2e-external-eks
 test-e2e-external-eks:
 	CLUSTER_TYPE=eksctl \
-	K8S_VERSION="1.22" \
+	K8S_VERSION="1.25" \
 	DRIVER_NAME=aws-efs-csi-driver \
 	HELM_VALUES_FILE="./hack/values_eksctl.yaml" \
 	CONTAINER_NAME=efs-plugin \
@@ -137,6 +138,7 @@ test-e2e-external-eks:
 	AWS_AVAILABILITY_ZONES=us-west-2a,us-west-2b,us-west-2c \
 	TEST_PATH=./test/e2e/... \
 	GINKGO_FOCUS="\[efs-csi\]" \
+	GINKGO_SKIP="\[Disruptive\]|\[Serial\]" \
 	EKSCTL_ADMIN_ROLE="Infra-prod-KopsDeleteAllLambdaServiceRoleF1578477-1ELDFIB4KCMXV" \
 	./hack/e2e/run.sh
 

cmd/main.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"os"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"github.com/kubernetes-sigs/aws-efs-csi-driver/pkg/driver"
 )

go.mod

@@ -2,59 +2,67 @@ module github.com/kubernetes-sigs/aws-efs-csi-driver
 
 require (
 	github.com/aws/aws-sdk-go v1.44.76
-	github.com/container-storage-interface/spec v1.5.0
+	github.com/container-storage-interface/spec v1.6.0
 	github.com/golang/mock v1.6.0
-	github.com/kubernetes-csi/csi-test v1.1.1
+	github.com/kubernetes-csi/csi-test/v5 v5.0.0
 	github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936
-	github.com/onsi/ginkgo v1.14.0
-	github.com/onsi/gomega v1.10.1
+	github.com/onsi/ginkgo/v2 v2.9.0
+	github.com/onsi/gomega v1.27.1
 	google.golang.org/grpc v1.53.0
-	k8s.io/api v0.22.16
-	k8s.io/apimachinery v0.24.3
-	k8s.io/client-go v1.5.2
-	k8s.io/klog v1.0.0
-	k8s.io/kubernetes v1.22.16
-	k8s.io/mount-utils v0.22.16
+	k8s.io/api v0.25.6
+	k8s.io/apimachinery v0.25.6
+	k8s.io/client-go v0.25.6
+	k8s.io/klog/v2 v2.80.1
+	k8s.io/kubernetes v1.25.6
+	k8s.io/mount-utils v0.25.6
+	k8s.io/pod-security-admission v0.25.6
 )
 
 require (
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bits-and-blooms/bitset v1.2.0 // indirect
-	github.com/blang/semver v3.5.1+incompatible // indirect
+	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/cyphar/filepath-securejoin v0.2.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/docker/distribution v2.7.1+incompatible // indirect
-	github.com/evanphx/json-patch v4.11.0+incompatible // indirect
+	github.com/docker/distribution v2.8.1+incompatible // indirect
+	github.com/emicklei/go-restful/v3 v3.8.0 // indirect
+	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
 	github.com/felixge/httpsnoop v1.0.1 // indirect
-	github.com/fsnotify/fsnotify v1.4.9 // indirect
 	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/jsonreference v0.19.5 // indirect
+	github.com/go-openapi/swag v0.19.14 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/gnostic v0.5.7-v3refs // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	github.com/googleapis/gnostic v0.5.5 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
-	github.com/imdario/mergo v0.3.5 // indirect
+	github.com/imdario/mergo v0.3.6 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/mailru/easyjson v0.7.6 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/moby/spdystream v0.2.0 // indirect
+	github.com/moby/sys/mountinfo v0.6.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/nxadm/tail v1.4.4 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/runc v1.0.2 // indirect
-	github.com/opencontainers/selinux v1.8.2 // indirect
+	github.com/opencontainers/selinux v1.10.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.11.1 // indirect
+	github.com/prometheus/client_golang v1.12.1 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.26.0 // indirect
-	github.com/prometheus/procfs v0.6.0 // indirect
-	github.com/spf13/cobra v1.1.3 // indirect
+	github.com/prometheus/common v0.32.1 // indirect
+	github.com/prometheus/procfs v0.7.3 // indirect
+	github.com/spf13/cobra v1.4.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	go.opentelemetry.io/contrib v0.20.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
@@ -73,58 +81,58 @@ require (
 	golang.org/x/term v0.6.0 // indirect
 	golang.org/x/text v0.8.0 // indirect
 	golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
-	golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
+	golang.org/x/tools v0.6.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiserver v0.22.16 // indirect
-	k8s.io/cloud-provider v0.22.16 // indirect
-	k8s.io/component-base v0.22.16 // indirect
-	k8s.io/component-helpers v0.22.16 // indirect
-	k8s.io/csi-translation-lib v0.22.16 // indirect
-	k8s.io/klog/v2 v2.70.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c // indirect
-	k8s.io/kubectl v0.0.0 // indirect
-	k8s.io/kubelet v0.0.0 // indirect
-	k8s.io/utils v0.0.0-20220713171938-56c0de1e6f5e // indirect
-	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
+	k8s.io/apiextensions-apiserver v0.25.6 // indirect
+	k8s.io/apiserver v0.25.6 // indirect
+	k8s.io/cloud-provider v0.25.6 // indirect
+	k8s.io/component-base v0.25.6 // indirect
+	k8s.io/component-helpers v0.25.6 // indirect
+	k8s.io/csi-translation-lib v0.25.6 // indirect
+	k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
+	k8s.io/kubectl v0.25.6 // indirect
+	k8s.io/kubelet v0.25.6 // indirect
+	k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
+	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.22.16
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.16
-	k8s.io/apimachinery => k8s.io/apimachinery v0.22.4-rc.0
-	k8s.io/apiserver => k8s.io/apiserver v0.22.16
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.22.16
-	k8s.io/client-go => k8s.io/client-go v0.22.16
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.22.16
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.16
-	k8s.io/code-generator => k8s.io/code-generator v0.22.4-rc.0
-	k8s.io/component-base => k8s.io/component-base v0.22.16
-	k8s.io/component-helpers => k8s.io/component-helpers v0.22.16
-	k8s.io/controller-manager => k8s.io/controller-manager v0.22.16
-	k8s.io/cri-api => k8s.io/cri-api v0.23.0-alpha.0
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.22.16
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.22.16
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.22.16
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.22.16
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.22.16
-	k8s.io/kubectl => k8s.io/kubectl v0.22.16
-	k8s.io/kubelet => k8s.io/kubelet v0.22.16
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.22.16
-	k8s.io/metrics => k8s.io/metrics v0.22.16
-	k8s.io/mount-utils => k8s.io/mount-utils v0.22.4-rc.0
-	k8s.io/node-api => k8s.io/node-api v0.18.10
-	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.22.16
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.16
-	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.22.16
-	k8s.io/sample-controller => k8s.io/sample-controller v0.22.16
+	k8s.io/api => k8s.io/api v0.25.6
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.6
+	k8s.io/apimachinery => k8s.io/apimachinery v0.25.6
+	k8s.io/apiserver => k8s.io/apiserver v0.25.6
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.6
+	k8s.io/client-go => k8s.io/client-go v0.25.6
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.6
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.6
+	k8s.io/code-generator => k8s.io/code-generator v0.25.6
+	k8s.io/component-base => k8s.io/component-base v0.25.6
+	k8s.io/component-helpers => k8s.io/component-helpers v0.25.6
+	k8s.io/controller-manager => k8s.io/controller-manager v0.25.6
+	k8s.io/cri-api => k8s.io/cri-api v0.25.6
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.6
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.6
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.6
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.6
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.6
+	k8s.io/kubectl => k8s.io/kubectl v0.25.6
+	k8s.io/kubelet => k8s.io/kubelet v0.25.6
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.6
+	k8s.io/metrics => k8s.io/metrics v0.25.6
+	k8s.io/mount-utils => k8s.io/mount-utils v0.25.6
+	k8s.io/node-api => k8s.io/node-api v0.25.6
+	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.6
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.6
+	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.6
+	k8s.io/sample-controller => k8s.io/sample-controller v0.25.6
 	vbom.ml/util => github.com/fvbommel/util v0.0.0-20180919145318-efcd4e0f9787
 )