Skip to content

Commit baa1d90

Browse files
author
shiftstack-merge-bot
committed
2 parents c063251 + 49ec91f commit baa1d90

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+843
-143
lines changed

‎charts/README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ The following table lists the configurable parameters of the latest NFS CSI Driv
7979
| `controller.resources.csiProvisioner.limits.memory` | csi-provisioner memory limits | 100Mi |
8080
| `controller.resources.csiProvisioner.requests.cpu` | csi-provisioner cpu requests limits | 10m |
8181
| `controller.resources.csiProvisioner.requests.memory` | csi-provisioner memory requests limits | 20Mi |
82+
| `controller.resources.csiResizer.limits.memory` | csi-resizer memory limits | 400Mi |
83+
| `controller.resources.csiResizer.requests.cpu` | csi-resizer cpu requests | 10m |
84+
| `controller.resources.csiResizer.requests.memory` | csi-resizer memory requests | 20Mi |
8285
| `controller.resources.livenessProbe.limits.memory` | liveness-probe memory limits | 100Mi |
8386
| `controller.resources.livenessProbe.requests.cpu` | liveness-probe cpu requests limits | 10m |
8487
| `controller.resources.livenessProbe.requests.memory` | liveness-probe memory requests limits | 20Mi |

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

135 Bytes
Binary file not shown.

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,30 @@ spec:
7575
capabilities:
7676
drop:
7777
- ALL
78+
- name: csi-resizer
79+
{{- if hasPrefix "/" .Values.image.csiResizer.repository }}
80+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.csiResizer.repository }}:{{ .Values.image.csiResizer.tag }}"
81+
{{- else }}
82+
image: "{{ .Values.image.csiResizer.repository }}:{{ .Values.image.csiResizer.tag }}"
83+
{{- end }}
84+
args:
85+
- "-csi-address=$(ADDRESS)"
86+
- "-v=2"
87+
- "-leader-election"
88+
- "--leader-election-namespace={{ .Release.Namespace }}"
89+
- '-handle-volume-inuse-error=false'
90+
env:
91+
- name: ADDRESS
92+
value: /csi/csi.sock
93+
imagePullPolicy: {{ .Values.image.csiResizer.pullPolicy }}
94+
volumeMounts:
95+
- name: socket-dir
96+
mountPath: /csi
97+
resources: {{- toYaml .Values.controller.resources.csiResizer | nindent 12 }}
98+
securityContext:
99+
capabilities:
100+
drop:
101+
- ALL
78102
- name: csi-snapshotter
79103
{{- if hasPrefix "/" .Values.image.csiSnapshotter.repository }}
80104
image: "{{ .Values.image.baseRepo }}{{ .Values.image.csiSnapshotter.repository }}:{{ .Values.image.csiSnapshotter.tag }}"

‎charts/latest/csi-driver-nfs/templates/rbac-csi-nfs.yaml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,42 @@ rules:
5757
resources: ["secrets"]
5858
verbs: ["get"]
5959
---
60+
kind: ClusterRole
61+
apiVersion: rbac.authorization.k8s.io/v1
62+
metadata:
63+
name: {{ .Values.rbac.name }}-external-resizer-role
64+
{{ include "nfs.labels" . | indent 2 }}
65+
rules:
66+
- apiGroups: [""]
67+
resources: ["persistentvolumes"]
68+
verbs: ["get", "list", "watch", "update", "patch"]
69+
- apiGroups: [""]
70+
resources: ["persistentvolumeclaims"]
71+
verbs: ["get", "list", "watch"]
72+
- apiGroups: [""]
73+
resources: ["persistentvolumeclaims/status"]
74+
verbs: ["update", "patch"]
75+
- apiGroups: [""]
76+
resources: ["events"]
77+
verbs: ["list", "watch", "create", "update", "patch"]
78+
- apiGroups: ["coordination.k8s.io"]
79+
resources: ["leases"]
80+
verbs: ["get", "list", "watch", "create", "update", "patch"]
81+
---
82+
kind: ClusterRoleBinding
83+
apiVersion: rbac.authorization.k8s.io/v1
84+
metadata:
85+
name: {{ .Values.rbac.name }}-csi-resizer-role
86+
{{ include "nfs.labels" . | indent 2 }}
87+
subjects:
88+
- kind: ServiceAccount
89+
name: {{ .Values.serviceAccount.controller }}
90+
namespace: {{ .Release.Namespace }}
91+
roleRef:
92+
kind: ClusterRole
93+
name: {{ .Values.rbac.name }}-external-resizer-role
94+
apiGroup: rbac.authorization.k8s.io
95+
---
6096
kind: ClusterRoleBinding
6197
apiVersion: rbac.authorization.k8s.io/v1
6298
metadata:

‎charts/latest/csi-driver-nfs/templates/storageclass.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ parameters:
1616
{{- end }}
1717
reclaimPolicy: {{ .Values.storageClass.reclaimPolicy }}
1818
volumeBindingMode: {{ .Values.storageClass.volumeBindingMode }}
19+
allowVolumeExpansion: true
1920
{{- with .Values.storageClass.mountOptions }}
2021
mountOptions:
2122
{{ toYaml . | nindent 2 }}

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ image:
99
repository: registry.k8s.io/sig-storage/csi-provisioner
1010
tag: v5.1.0
1111
pullPolicy: IfNotPresent
12+
csiResizer:
13+
repository: registry.k8s.io/sig-storage/csi-resizer
14+
tag: v1.12.0
15+
pullPolicy: IfNotPresent
1216
csiSnapshotter:
1317
repository: registry.k8s.io/sig-storage/csi-snapshotter
1418
tag: v8.1.0
@@ -81,6 +85,12 @@ controller:
8185
requests:
8286
cpu: 10m
8387
memory: 20Mi
88+
csiResizer:
89+
limits:
90+
memory: 400Mi
91+
requests:
92+
cpu: 10m
93+
memory: 20Mi
8494
csiSnapshotter:
8595
limits:
8696
memory: 200Mi

‎deploy/csi-nfs-controller.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,30 @@ spec:
6363
capabilities:
6464
drop:
6565
- ALL
66+
- name: csi-resizer
67+
image: registry.k8s.io/sig-storage/csi-resizer:v1.12.0
68+
args:
69+
- "-csi-address=$(ADDRESS)"
70+
- "-v=2"
71+
- "-leader-election"
72+
- "--leader-election-namespace=kube-system"
73+
- '-handle-volume-inuse-error=false'
74+
env:
75+
- name: ADDRESS
76+
value: /csi/csi.sock
77+
volumeMounts:
78+
- name: socket-dir
79+
mountPath: /csi
80+
resources:
81+
limits:
82+
memory: 400Mi
83+
requests:
84+
cpu: 10m
85+
memory: 20Mi
86+
securityContext:
87+
capabilities:
88+
drop:
89+
- ALL
6690
- name: csi-snapshotter
6791
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.1.0
6892
args:

‎deploy/example/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ parameters:
2727
# csi.storage.k8s.io/provisioner-secret-namespace: "default"
2828
reclaimPolicy: Delete
2929
volumeBindingMode: Immediate
30+
allowVolumeExpansion: true
3031
mountOptions:
3132
- nfsvers=4.1
3233
```

‎deploy/example/storageclass-nfs.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@ parameters:
1212
# csi.storage.k8s.io/provisioner-secret-namespace: "default"
1313
reclaimPolicy: Delete
1414
volumeBindingMode: Immediate
15+
allowVolumeExpansion: true
1516
mountOptions:
1617
- nfsvers=4.1

‎deploy/rbac-csi-nfs.yaml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,39 @@ roleRef:
6464
kind: ClusterRole
6565
name: nfs-external-provisioner-role
6666
apiGroup: rbac.authorization.k8s.io
67+
---
68+
69+
kind: ClusterRole
70+
apiVersion: rbac.authorization.k8s.io/v1
71+
metadata:
72+
name: nfs-external-resizer-role
73+
rules:
74+
- apiGroups: [""]
75+
resources: ["persistentvolumes"]
76+
verbs: ["get", "list", "watch", "update", "patch"]
77+
- apiGroups: [""]
78+
resources: ["persistentvolumeclaims"]
79+
verbs: ["get", "list", "watch"]
80+
- apiGroups: [""]
81+
resources: ["persistentvolumeclaims/status"]
82+
verbs: ["update", "patch"]
83+
- apiGroups: [""]
84+
resources: ["events"]
85+
verbs: ["list", "watch", "create", "update", "patch"]
86+
- apiGroups: ["coordination.k8s.io"]
87+
resources: ["leases"]
88+
verbs: ["get", "list", "watch", "create", "update", "patch"]
89+
---
90+
91+
kind: ClusterRoleBinding
92+
apiVersion: rbac.authorization.k8s.io/v1
93+
metadata:
94+
name: nfs-csi-resizer-role
95+
subjects:
96+
- kind: ServiceAccount
97+
name: csi-nfs-controller-sa
98+
namespace: kube-system
99+
roleRef:
100+
kind: ClusterRole
101+
name: nfs-external-resizer-role
102+
apiGroup: rbac.authorization.k8s.io

0 commit comments

Comments
 (0)