Skip to content

Commit e3c4ebd

Browse files
committed
Remove passwd- file to make CIS benchmark happy
Change-Id: If655240c96b0bed20803185fe5ed7c40b25f2cf9
1 parent 9b50710 commit e3c4ebd

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,7 @@ RUN ln -fs /bin/rm /usr/sbin/rm \
3636
&& clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs
3737
COPY --from=mad-hack /lib/udev/scsi_id /lib/udev_containerized/scsi_id
3838

39+
# The CIS benchmark does not like having the backup passwd file accessible.
40+
RUN rm -f /etc/passwd-
41+
3942
ENTRYPOINT ["/gce-pd-csi-driver"]

test/k8s-integration/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ var (
3838
platform = flag.String("platform", "linux", "platform that the tests will be run, either linux or windows")
3939
gceZone = flag.String("gce-zone", "", "zone that the gce k8s cluster is created/found in")
4040
gceRegion = flag.String("gce-region", "", "region that gke regional cluster should be created in")
41-
kubeVersion = flag.String("kube-version", "", "version of Kubernetes to download and use for the cluster")
41+
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")
4242
testVersion = flag.String("test-version", "", "version of Kubernetes to download and use for tests")
4343
kubeFeatureGates = flag.String("kube-feature-gates", "", "feature gates to set on new kubernetes cluster")
4444
localK8sDir = flag.String("local-k8s-dir", "", "local prebuilt kubernetes/kubernetes directory to use for cluster and test binaries")

0 commit comments

Comments
 (0)