Remove passwd- file to make CIS benchmark happy

Change-Id: If655240c96b0bed20803185fe5ed7c40b25f2cf9

Author: mattcary

Dockerfile

@@ -36,4 +36,7 @@ RUN ln -fs /bin/rm /usr/sbin/rm \
   && clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs
 COPY --from=mad-hack /lib/udev/scsi_id /lib/udev_containerized/scsi_id
 
+# The CIS benchmark does not like having the backup passwd file accessible.
+RUN rm -f /etc/passwd-
+
 ENTRYPOINT ["/gce-pd-csi-driver"]

test/k8s-integration/main.go

@@ -38,7 +38,7 @@ var (
 	platform             = flag.String("platform", "linux", "platform that the tests will be run, either linux or windows")
 	gceZone              = flag.String("gce-zone", "", "zone that the gce k8s cluster is created/found in")
 	gceRegion            = flag.String("gce-region", "", "region that gke regional cluster should be created in")
-	kubeVersion          = flag.String("kube-version", "", "version of Kubernetes to download and use for the cluster")
+	kubeVersion          = flag.String("kube-version", "1.21.14", "version of Kubernetes to download and use for the cluster. For the release-1.3 branch we default to 1.21 which is the highest version recommended for this version of the driver")
 	testVersion          = flag.String("test-version", "", "version of Kubernetes to download and use for tests")
 	kubeFeatureGates     = flag.String("kube-feature-gates", "", "feature gates to set on new kubernetes cluster")
 	localK8sDir          = flag.String("local-k8s-dir", "", "local prebuilt kubernetes/kubernetes directory to use for cluster and test binaries")
@@ -270,6 +270,7 @@ func handle() error {
 
 	// If kube version is set, then download and build Kubernetes for cluster creation
 	// Otherwise, either GKE or a prebuild local K8s dir is being used
+	klog.Infof("Using kubeVersion %s and testVersion %s", *kubeVersion, *testVersion)
 	if len(*kubeVersion) != 0 {
 		testParams.k8sSourceDir = filepath.Join(testParams.testParentDir, "kubernetes")
 		err := downloadKubernetesSource(testParams.pkgDir, testParams.testParentDir, *kubeVersion)