Merge pull request openshift#133 from shiftstack/merge-upstream

OCPBUGS-21829: Merge upstream

Author: openshift-ci[bot]

charts/README.md

@@ -47,6 +47,7 @@ The following table lists the configurable parameters of the latest NFS CSI Driv
 | `driver.mountPermissions`                         | default mounted folder permissions                             | `0`
 | `feature.enableFSGroupPolicy`                     | enable [`fsGroupPolicy`](https://kubernetes.io/blog/2020/12/14/kubernetes-release-1.20-fsgroupchangepolicy-fsgrouppolicy/#allow-csi-drivers-to-declare-support-for-fsgroup-based-permissions) on a k8s 1.20+ cluster              | `true`                      |
 | `feature.enableInlineVolume`                      | enable inline volume                     | `false`                      |
+| `feature.propagateHostMountOptions`               | use the default host NFS mount configuration file [`/etc/nfsmount.conf`](https://man7.org/linux/man-pages/man5/nfsmount.conf.5.html) and/or the default host `/etc/nfsmount.d` mount configuration directory as source for mount options | `false`                      |
 | `kubeletDir`                                      | alternative kubelet directory                              | `/var/lib/kubelet`                                                  |
 | `image.nfs.repository`                            | csi-driver-nfs image                                       | `registry.k8s.io/sig-storage/nfsplugin`                          |
 | `image.nfs.tag`                                   | csi-driver-nfs image tag                                   | `latest`                                                |

charts/latest/csi-driver-nfs-v0.0.0.tgz

@@ -56,6 +56,7 @@ spec:
             - "--leader-election"
             - "--leader-election-namespace={{ .Release.Namespace }}"
             - "--extra-create-metadata=true"
+            - "--timeout=1200s"
           env:
             - name: ADDRESS
               value: /csi/csi.sock
@@ -73,6 +74,7 @@ spec:
             - "--csi-address=$(ADDRESS)"
             - "--leader-election-namespace={{ .Release.Namespace }}"
             - "--leader-election"
+            - "--timeout=1200s"
           env:
             - name: ADDRESS
               value: /csi/csi.sock

charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml

@@ -125,6 +125,12 @@ spec:
             - name: pods-mount-dir
               mountPath: {{ .Values.kubeletDir }}/pods
               mountPropagation: "Bidirectional"
+            {{- if .Values.feature.propagateHostMountOptions }}
+            - name: host-nfsmount-conf
+              mountPath: /etc/nfsmount.conf
+            - name: host-nfsmount-conf-d
+              mountPath: /etc/nfsmount.conf.d
+            {{- end }}
           resources: {{- toYaml .Values.node.resources.nfs | nindent 12 }}
       volumes:
         - name: socket-dir
@@ -139,3 +145,13 @@ spec:
             path: {{ .Values.kubeletDir }}/plugins_registry
             type: Directory
           name: registration-dir
+        {{- if .Values.feature.propagateHostMountOptions }}
+        - hostPath:
+            path: /etc/nfsmount.conf
+            type: FileOrCreate
+          name: host-nfsmount-conf
+        - hostPath:
+            path: /etc/nfsmount.conf.d
+            type: DirectoryOrCreate
+          name: host-nfsmount-conf-d
+        {{- end }}

charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml

@@ -41,6 +41,7 @@ driver:
 feature:
   enableFSGroupPolicy: true
   enableInlineVolume: false
+  propagateHostMountOptions: false
 
 kubeletDir: /var/lib/kubelet
 

charts/latest/csi-driver-nfs/values.yaml

@@ -56,6 +56,7 @@ spec:
             - "--leader-election"
             - "--leader-election-namespace={{ .Release.Namespace }}"
             - "--extra-create-metadata=true"
+            - "--timeout=1200s"
           env:
             - name: ADDRESS
               value: /csi/csi.sock
@@ -73,6 +74,7 @@ spec:
             - "--csi-address=$(ADDRESS)"
             - "--leader-election-namespace={{ .Release.Namespace }}"
             - "--leader-election"
+            - "--timeout=1200s"
           env:
             - name: ADDRESS
               value: /csi/csi.sock

charts/v4.4.0/csi-driver-nfs-v4.4.0.tgz

@@ -34,12 +34,9 @@ var (
 	defaultOnDeletePolicy = flag.String("default-ondelete-policy", "", "default policy for deleting subdirectory when deleting a volume")
 )
 
-func init() {
-	_ = flag.Set("logtostderr", "true")
-}
-
 func main() {
 	klog.InitFlags(nil)
+	_ = flag.Set("logtostderr", "true")
 	flag.Parse()
 	if *nodeID == "" {
 		klog.Warning("nodeid is empty")

charts/v4.4.0/csi-driver-nfs/templates/csi-nfs-controller.yaml

@@ -42,6 +42,7 @@ spec:
             - "--leader-election"
             - "--leader-election-namespace=kube-system"
             - "--extra-create-metadata=true"
+            - "--timeout=1200s"
           env:
             - name: ADDRESS
               value: /csi/csi.sock
@@ -61,6 +62,7 @@ spec:
             - "--csi-address=$(ADDRESS)"
             - "--leader-election-namespace=kube-system"
             - "--leader-election"
+            - "--timeout=1200s"
           env:
             - name: ADDRESS
               value: /csi/csi.sock

cmd/nfsplugin/main.go

@@ -42,6 +42,7 @@ spec:
             - "--leader-election"
             - "--leader-election-namespace=kube-system"
             - "--extra-create-metadata=true"
+            - "--timeout=1200s"
           env:
             - name: ADDRESS
               value: /csi/csi.sock
@@ -61,6 +62,7 @@ spec:
             - "--csi-address=$(ADDRESS)"
             - "--leader-election-namespace=kube-system"
             - "--leader-election"
+            - "--timeout=1200s"
           env:
             - name: ADDRESS
               value: /csi/csi.sock