Merge branch 'master' into master-to-1.0

deploy/cephfs/kubernetes/csi-cephfsplugin.yaml

@@ -49,11 +49,16 @@ spec:
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--v=5"
             - "--drivername=csi-cephfsplugin"
+            - "--metadatastorage=k8s_configmap"
           env:
             - name: NODE_ID
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
             - name: CSI_ENDPOINT
               value: unix://var/lib/kubelet/plugins_registry/csi-cephfsplugin/csi.sock
           imagePullPolicy: "IfNotPresent"