deploy: fix FSGroup support when using default FS

The PV must have the filesystem specified for Kubernetes < 1.20 to apply the FSGroup support (a heuristic in Kubernetes). external-provisioner >= 2.0.0 only adds that field if it knows about the default FS. Fixes: intel#644 (cherry picked from commit 2ba30ba)
pohly · Nov 11, 2020 · 3d3a588 · 3d3a588
1 parent c7ea8c9
commit 3d3a588
Show file tree

Hide file tree

Showing 35 changed files with 50 additions and 16 deletions.
diff --git a/deploy/bindata_generated.go b/deploy/bindata_generated.go
diff --git a/deploy/kubernetes-1.17/direct/pmem-csi.yaml b/deploy/kubernetes-1.17/direct/pmem-csi.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.17/direct/testing/pmem-csi.yaml b/deploy/kubernetes-1.17/direct/testing/pmem-csi.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.17/lvm/pmem-csi.yaml b/deploy/kubernetes-1.17/lvm/pmem-csi.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.17/lvm/testing/pmem-csi.yaml b/deploy/kubernetes-1.17/lvm/testing/pmem-csi.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.17/pmem-csi-direct-testing.yaml b/deploy/kubernetes-1.17/pmem-csi-direct-testing.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.17/pmem-csi-direct.yaml b/deploy/kubernetes-1.17/pmem-csi-direct.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.17/pmem-csi-lvm-testing.yaml b/deploy/kubernetes-1.17/pmem-csi-lvm-testing.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.17/pmem-csi-lvm.yaml b/deploy/kubernetes-1.17/pmem-csi-lvm.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.18/direct/pmem-csi.yaml b/deploy/kubernetes-1.18/direct/pmem-csi.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.18/direct/testing/pmem-csi.yaml b/deploy/kubernetes-1.18/direct/testing/pmem-csi.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.18/lvm/pmem-csi.yaml b/deploy/kubernetes-1.18/lvm/pmem-csi.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.18/lvm/testing/pmem-csi.yaml b/deploy/kubernetes-1.18/lvm/testing/pmem-csi.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.18/pmem-csi-direct-testing.yaml b/deploy/kubernetes-1.18/pmem-csi-direct-testing.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.18/pmem-csi-direct.yaml b/deploy/kubernetes-1.18/pmem-csi-direct.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.18/pmem-csi-lvm-testing.yaml b/deploy/kubernetes-1.18/pmem-csi-lvm-testing.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.18/pmem-csi-lvm.yaml b/deploy/kubernetes-1.18/pmem-csi-lvm.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.19-alpha/direct/pmem-csi.yaml b/deploy/kubernetes-1.19-alpha/direct/pmem-csi.yaml
@@ -281,6 +281,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         env:
         - name: POD_NAMESPACE

diff --git a/deploy/kubernetes-1.19-alpha/direct/testing/pmem-csi.yaml b/deploy/kubernetes-1.19-alpha/direct/testing/pmem-csi.yaml
@@ -301,6 +301,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         env:

diff --git a/deploy/kubernetes-1.19-alpha/lvm/pmem-csi.yaml b/deploy/kubernetes-1.19-alpha/lvm/pmem-csi.yaml
@@ -281,6 +281,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         env:
         - name: POD_NAMESPACE

diff --git a/deploy/kubernetes-1.19-alpha/lvm/testing/pmem-csi.yaml b/deploy/kubernetes-1.19-alpha/lvm/testing/pmem-csi.yaml
@@ -301,6 +301,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         env:

diff --git a/deploy/kubernetes-1.19-alpha/pmem-csi-direct-testing.yaml b/deploy/kubernetes-1.19-alpha/pmem-csi-direct-testing.yaml
@@ -301,6 +301,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         env:

diff --git a/deploy/kubernetes-1.19-alpha/pmem-csi-direct.yaml b/deploy/kubernetes-1.19-alpha/pmem-csi-direct.yaml
@@ -281,6 +281,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         env:
         - name: POD_NAMESPACE

diff --git a/deploy/kubernetes-1.19-alpha/pmem-csi-lvm-testing.yaml b/deploy/kubernetes-1.19-alpha/pmem-csi-lvm-testing.yaml
@@ -301,6 +301,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         env:

diff --git a/deploy/kubernetes-1.19-alpha/pmem-csi-lvm.yaml b/deploy/kubernetes-1.19-alpha/pmem-csi-lvm.yaml
@@ -281,6 +281,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         env:
         - name: POD_NAMESPACE

diff --git a/deploy/kubernetes-1.19/direct/pmem-csi.yaml b/deploy/kubernetes-1.19/direct/pmem-csi.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.19/direct/testing/pmem-csi.yaml b/deploy/kubernetes-1.19/direct/testing/pmem-csi.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.19/lvm/pmem-csi.yaml b/deploy/kubernetes-1.19/lvm/pmem-csi.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.19/lvm/testing/pmem-csi.yaml b/deploy/kubernetes-1.19/lvm/testing/pmem-csi.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.19/pmem-csi-direct-testing.yaml b/deploy/kubernetes-1.19/pmem-csi-direct-testing.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.19/pmem-csi-direct.yaml b/deploy/kubernetes-1.19/pmem-csi-direct.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.19/pmem-csi-lvm-testing.yaml b/deploy/kubernetes-1.19/pmem-csi-lvm-testing.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.19/pmem-csi-lvm.yaml b/deploy/kubernetes-1.19/pmem-csi-lvm.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kustomize/driver/pmem-csi.yaml b/deploy/kustomize/driver/pmem-csi.yaml
@@ -123,6 +123,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4 # see https://github.com/kubernetes-csi/external-provisioner/issues/328#issuecomment-714801581
         securityContext:
           readOnlyRootFilesystem: true
         volumeMounts:

diff --git a/pkg/pmem-csi-operator/controller/deployment/controller_driver.go b/pkg/pmem-csi-operator/controller/deployment/controller_driver.go
@@ -1127,6 +1127,7 @@ func (d *PmemCSIDriver) getProvisionerContainer() corev1.Container {
 			"--feature-gates=Topology=true",
 			"--strict-topology=true",
 			"--timeout=5m",
+			"--default-fstype=ext4",
 			fmt.Sprintf("--metrics-address=:%d", provisionerMetricsPort),
 		},
 		VolumeMounts: []corev1.VolumeMount{