Merge pull request #555 from jingxu97/July/msensitive

Add MountSensitive in CSIproxy mounter

Author: k8s-ci-robot

Makefile

@@ -24,7 +24,7 @@ STAGINGIMAGE=${GCE_PD_CSI_STAGING_IMAGE}
 DRIVERBINARY=gce-pd-csi-driver
 DRIVERWINDOWSBINARY=${DRIVERBINARY}.exe
 
-all: gce-pd-driver
+all: gce-pd-driver gce-pd-driver-windows
 gce-pd-driver:
 	mkdir -p bin
 	go build -mod=vendor -ldflags "-X main.vendorVersion=${STAGINGVERSION}" -o bin/${DRIVERBINARY} ./cmd/

hack/verify-all.sh

@@ -22,3 +22,5 @@ PKG_ROOT=$(git rev-parse --show-toplevel)
 
 ${PKG_ROOT}/hack/verify-gofmt.sh
 ${PKG_ROOT}/hack/verify-govet.sh
+
+make -C "${PKG_ROOT}" all

pkg/mount-manager/safe-mounter_windows.go

@@ -77,6 +77,15 @@ func NewSafeMounter() (*mount.SafeFormatAndMount, error) {
 
 // Mount just creates a soft link at target pointing to source.
 func (mounter *CSIProxyMounter) Mount(source string, target string, fstype string, options []string) error {
+	return mounter.MountSensitive(source, target, fstype, options, nil /* sensitiveOptions */)
+}
+
+// MountSensitive is the same as Mount() but this method allows
+// sensitiveOptions to be passed in a separate parameter from the normal
+// mount options and ensures the sensitiveOptions are never logged.
+// Since Mount here is just create a synlink, so options and sensitiveOptions
+// are not used here
+func (mounter *CSIProxyMounter) MountSensitive(source string, target string, fstype string, options []string, sensitiveOptions []string) error {
 	// Mount is called after the format is done.
 	// TODO: Confirm that fstype is empty.
 	// Call the LinkPath CSI proxy from the source path to the target path