Skip to content

Commit

Permalink
deploy: run external-provisioner with less worker threads
Browse files Browse the repository at this point in the history 
This saves some resources on each node but more importantly, avoids
lengthy output each time the sidecar shuts down due to a connection
loss. Upstream will fix that in
kubernetes-csi/csi-lib-utils#81.
  • Loading branch information
@pohly
pohly committed Feb 9, 2021
1 parent 6a6fd55 commit 6f41cc4
Show file tree
Hide file tree
Showing 43 changed files with 64 additions and 22 deletions.
44 changes: 22 additions & 22 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 @@ -486,6 +486,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
env:
- name: NODE_NAME
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 @@ -529,6 +529,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
- -v=5
env:
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 @@ -486,6 +486,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
env:
- name: NODE_NAME
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 @@ -529,6 +529,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
- -v=5
env:
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 @@ -529,6 +529,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
- -v=5
env:
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 @@ -486,6 +486,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
env:
- name: NODE_NAME
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 @@ -529,6 +529,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
- -v=5
env:
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 @@ -486,6 +486,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
env:
- name: NODE_NAME
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 @@ -486,6 +486,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
env:
- name: NODE_NAME
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 @@ -529,6 +529,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
- -v=5
env:
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 @@ -486,6 +486,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
env:
- name: NODE_NAME
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 @@ -529,6 +529,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
- -v=5
env:
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 @@ -529,6 +529,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
- -v=5
env:
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 @@ -486,6 +486,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
env:
- name: NODE_NAME
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 @@ -529,6 +529,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
- -v=5
env:
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 @@ -486,6 +486,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
env:
- name: NODE_NAME
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 @@ -488,6 +488,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
env:
- name: NODE_NAME
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 @@ -531,6 +531,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --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 @@ -488,6 +488,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
env:
- name: NODE_NAME
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 @@ -531,6 +531,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --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 @@ -531,6 +531,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --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 @@ -488,6 +488,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
env:
- name: NODE_NAME
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 @@ -531,6 +531,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --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 @@ -488,6 +488,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
env:
- name: NODE_NAME
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 @@ -486,6 +486,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
env:
- name: NODE_NAME
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 @@ -529,6 +529,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
- -v=5
env:
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 @@ -486,6 +486,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
env:
- name: NODE_NAME
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 @@ -529,6 +529,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
- -v=5
env:
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 @@ -529,6 +529,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
- -v=5
env:
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 @@ -486,6 +486,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
env:
- name: NODE_NAME
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 @@ -529,6 +529,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
- -v=5
env:
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 @@ -486,6 +486,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
env:
- name: NODE_NAME
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.20/direct/pmem-csi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
env:
- name: NODE_NAME
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.20/direct/testing/pmem-csi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
- -v=5
env:
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.20/lvm/pmem-csi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
env:
- name: NODE_NAME
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.20/lvm/testing/pmem-csi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
- -v=5
env:
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.20/pmem-csi-direct-testing.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
- -v=5
env:
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.20/pmem-csi-direct.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
env:
- name: NODE_NAME
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.20/pmem-csi-lvm-testing.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
- -v=5
env:
Expand Down
1 change: 1 addition & 0 deletions deploy/kubernetes-1.20/pmem-csi-lvm.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4
- --worker-threads=5
- --metrics-address=:10011
env:
- name: NODE_NAME
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 @@ -318,6 +318,7 @@ spec:
- --immediate-topology=false
- --timeout=5m
- --default-fstype=ext4 # see https://github.com/kubernetes-csi/external-provisioner/issues/328#issuecomment-714801581
- --worker-threads=5 # We don't need much concurrency inside a node.
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 @@ -1349,6 +1349,7 @@ func (d *pmemCSIDeployment) getProvisionerContainer() corev1.Container {
// TODO (?): make this configurable?
"--timeout=5m",
"--default-fstype=ext4",
"--worker-threads=5",
fmt.Sprintf("--metrics-address=:%d", provisionerMetricsPort),
},
Env: []corev1.EnvVar{
Expand Down

0 comments on commit 6f41cc4

Please sign in to comment.