Skip to content
This repository has been archived by the owner on Oct 22, 2024. It is now read-only.

Commit

Permalink
deploy: fix FSGroup support when using default FS
Browse files Browse the repository at this point in the history 
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: #644
  • Loading branch information
@pohly
pohly committed Nov 6, 2020
1 parent 371372e commit 2ba30ba
Show file tree
Hide file tree
Showing 35 changed files with 50 additions and 16 deletions.
32 changes: 16 additions & 16 deletions deploy/bindata_generated.go
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions deploy/kubernetes-1.17/direct/pmem-csi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.17/direct/testing/pmem-csi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.17/lvm/pmem-csi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.17/lvm/testing/pmem-csi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.17/pmem-csi-direct-testing.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.17/pmem-csi-direct.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.17/pmem-csi-lvm-testing.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.17/pmem-csi-lvm.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.18/direct/pmem-csi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.18/direct/testing/pmem-csi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.18/lvm/pmem-csi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.18/lvm/testing/pmem-csi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.18/pmem-csi-direct-testing.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.18/pmem-csi-direct.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.18/pmem-csi-lvm-testing.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.18/pmem-csi-lvm.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.19-alpha/direct/pmem-csi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ spec:
- --feature-gates=Topology=true
- --strict-topology=true
- --timeout=5m
- --default-fstype=ext4
- --metrics-address=:10011
env:
- name: POD_NAMESPACE
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.19-alpha/direct/testing/pmem-csi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ spec:
- --feature-gates=Topology=true
- --strict-topology=true
- --timeout=5m
- --default-fstype=ext4
- --metrics-address=:10011
- -v=5
env:
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.19-alpha/lvm/pmem-csi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ spec:
- --feature-gates=Topology=true
- --strict-topology=true
- --timeout=5m
- --default-fstype=ext4
- --metrics-address=:10011
env:
- name: POD_NAMESPACE
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.19-alpha/lvm/testing/pmem-csi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ spec:
- --feature-gates=Topology=true
- --strict-topology=true
- --timeout=5m
- --default-fstype=ext4
- --metrics-address=:10011
- -v=5
env:
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.19-alpha/pmem-csi-direct-testing.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ spec:
- --feature-gates=Topology=true
- --strict-topology=true
- --timeout=5m
- --default-fstype=ext4
- --metrics-address=:10011
- -v=5
env:
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.19-alpha/pmem-csi-direct.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ spec:
- --feature-gates=Topology=true
- --strict-topology=true
- --timeout=5m
- --default-fstype=ext4
- --metrics-address=:10011
env:
- name: POD_NAMESPACE
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.19-alpha/pmem-csi-lvm-testing.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ spec:
- --feature-gates=Topology=true
- --strict-topology=true
- --timeout=5m
- --default-fstype=ext4
- --metrics-address=:10011
- -v=5
env:
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.19-alpha/pmem-csi-lvm.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ spec:
- --feature-gates=Topology=true
- --strict-topology=true
- --timeout=5m
- --default-fstype=ext4
- --metrics-address=:10011
env:
- name: POD_NAMESPACE
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.19/direct/pmem-csi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.19/direct/testing/pmem-csi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.19/lvm/pmem-csi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.19/lvm/testing/pmem-csi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.19/pmem-csi-direct-testing.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.19/pmem-csi-direct.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.19/pmem-csi-lvm-testing.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.19/pmem-csi-lvm.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/kustomize/driver/pmem-csi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions pkg/pmem-csi-operator/controller/deployment/controller_driver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down

0 comments on commit 2ba30ba

Please sign in to comment.