diff --git a/README.md b/README.md index 2f33c23e..4d98f59d 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,13 @@ This is a repository for [NFS](https://en.wikipedia.org/wiki/Network_File_System) [CSI](https://kubernetes-csi.github.io/docs/) driver, csi plugin name: `nfs.csi.k8s.io`. This driver requires existing and already configured NFSv3 or NFSv4 server, it supports dynamic provisioning of Persistent Volumes via Persistent Volume Claims by creating a new sub directory under NFS server. -### Project status: Beta +### Project status: GA ### Container Images & Kubernetes Compatibility: |driver version | supported k8s version | status | |----------------|-----------------------|--------| -|master branch | 1.20+ | beta | +|master branch | 1.20+ | GA | +|v4.0.0 | 1.10+ | GA | |v3.1.0 | 1.19+ | beta | |v3.0.0 | 1.19+ | beta | |v2.0.0 | 1.14+ | alpha | diff --git a/charts/README.md b/charts/README.md index c2a24028..a7c123f6 100644 --- a/charts/README.md +++ b/charts/README.md @@ -10,7 +10,7 @@ ### install a specific version ```console helm repo add csi-driver-nfs https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts -helm install csi-driver-nfs csi-driver-nfs/csi-driver-nfs --namespace kube-system --version v3.1.0 +helm install csi-driver-nfs csi-driver-nfs/csi-driver-nfs --namespace kube-system --version v4.0.0 ``` ### install driver with customized driver name, deployment name diff --git a/charts/index.yaml b/charts/index.yaml index 0a31f988..81e8cea4 100644 --- a/charts/index.yaml +++ b/charts/index.yaml @@ -2,17 +2,26 @@ apiVersion: v1 entries: csi-driver-nfs: - apiVersion: v1 - appVersion: latest - created: "2022-04-30T07:45:33.947314152Z" + appVersion: v4.0.0 + created: "2022-05-03T11:18:21.533449624Z" description: CSI NFS Driver for Kubernetes - digest: a90874bcdaeef76bc10aea70f0ed559c69d50a9390d6c7d1b4156c4d54758c3b + digest: 70f403442f59edb6c01fed573ce40c625775be15b1e32c21edf5704adcc94be9 name: csi-driver-nfs urls: - https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/latest/csi-driver-nfs-v4.0.0.tgz version: v4.0.0 + - apiVersion: v1 + appVersion: v4.0.0 + created: "2022-05-03T11:18:21.536514545Z" + description: CSI NFS Driver for Kubernetes + digest: cb537287512ce9f99adaead8cd4904ed7284780bdc44c9b8d6705e66f28bfa5c + name: csi-driver-nfs + urls: + - https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/v4.0.0/csi-driver-nfs-v4.0.0.tgz + version: v4.0.0 - apiVersion: v1 appVersion: v3.1.0 - created: "2022-04-30T07:45:33.949154964Z" + created: "2022-05-03T11:18:21.535854341Z" description: CSI NFS Driver for Kubernetes digest: 7e51bb9188b013195cafc265102fa365de9ec5513780e1dfc5363289f811a4d9 name: csi-driver-nfs @@ -21,7 +30,7 @@ entries: version: v3.1.0 - apiVersion: v1 appVersion: v3.0.0 - created: "2022-04-30T07:45:33.94847026Z" + created: "2022-05-03T11:18:21.535058035Z" description: CSI NFS Driver for Kubernetes digest: 44406231cd5cdada1c62a0541b93b4f5d5a70ccc8c50b33553a8692fe6cfae96 name: csi-driver-nfs @@ -30,11 +39,11 @@ entries: version: v3.0.0 - apiVersion: v1 appVersion: v2.0.0 - created: "2022-04-30T07:45:33.947715955Z" + created: "2022-05-03T11:18:21.533976127Z" description: CSI NFS Driver for Kubernetes digest: 1a32c6fc016526fe19a0c9e0dfbe83d0ddde67ced533bb5f5d24d713f706c613 name: csi-driver-nfs urls: - https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/v2.0.0/csi-driver-nfs-v2.0.0.tgz version: v2.0.0 -generated: "2022-04-30T07:45:33.946482046Z" +generated: "2022-05-03T11:18:21.530613004Z" diff --git a/charts/latest/csi-driver-nfs-v4.0.0.tgz b/charts/latest/csi-driver-nfs-v4.0.0.tgz index 0000a2eb..aa2bdefd 100644 Binary files a/charts/latest/csi-driver-nfs-v4.0.0.tgz and b/charts/latest/csi-driver-nfs-v4.0.0.tgz differ diff --git a/charts/latest/csi-driver-nfs/Chart.yaml b/charts/latest/csi-driver-nfs/Chart.yaml index 40fa2ebf..c591d76b 100755 --- a/charts/latest/csi-driver-nfs/Chart.yaml +++ b/charts/latest/csi-driver-nfs/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: latest +appVersion: v4.0.0 description: CSI NFS Driver for Kubernetes name: csi-driver-nfs version: v4.0.0 diff --git a/charts/latest/csi-driver-nfs/values.yaml b/charts/latest/csi-driver-nfs/values.yaml index 4c9acd21..da1888aa 100755 --- a/charts/latest/csi-driver-nfs/values.yaml +++ b/charts/latest/csi-driver-nfs/values.yaml @@ -1,8 +1,8 @@ customLabels: {} image: nfs: - repository: gcr.io/k8s-staging-sig-storage/nfsplugin - tag: canary + repository: registry.k8s.io/sig-storage/nfsplugin + tag: v4.0.0 pullPolicy: IfNotPresent csiProvisioner: repository: registry.k8s.io/sig-storage/csi-provisioner diff --git a/charts/v4.0.0/csi-driver-nfs-v4.0.0.tgz b/charts/v4.0.0/csi-driver-nfs-v4.0.0.tgz new file mode 100644 index 00000000..1b373e99 Binary files /dev/null and b/charts/v4.0.0/csi-driver-nfs-v4.0.0.tgz differ diff --git a/charts/v4.0.0/csi-driver-nfs/.helmignore b/charts/v4.0.0/csi-driver-nfs/.helmignore new file mode 100644 index 00000000..50af0317 --- /dev/null +++ b/charts/v4.0.0/csi-driver-nfs/.helmignore @@ -0,0 +1,22 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/v4.0.0/csi-driver-nfs/Chart.yaml b/charts/v4.0.0/csi-driver-nfs/Chart.yaml new file mode 100644 index 00000000..c591d76b --- /dev/null +++ b/charts/v4.0.0/csi-driver-nfs/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +appVersion: v4.0.0 +description: CSI NFS Driver for Kubernetes +name: csi-driver-nfs +version: v4.0.0 diff --git a/charts/v4.0.0/csi-driver-nfs/templates/NOTES.txt b/charts/v4.0.0/csi-driver-nfs/templates/NOTES.txt new file mode 100644 index 00000000..19e9a2ea --- /dev/null +++ b/charts/v4.0.0/csi-driver-nfs/templates/NOTES.txt @@ -0,0 +1,5 @@ + The CSI NFS Driver is getting deployed to your cluster. + +To check CSI NFS Driver pods status, please run: + + kubectl --namespace={{ .Release.Namespace }} get pods --selector="release={{ .Release.Name }}" --watch \ No newline at end of file diff --git a/charts/v4.0.0/csi-driver-nfs/templates/_helpers.tpl b/charts/v4.0.0/csi-driver-nfs/templates/_helpers.tpl new file mode 100644 index 00000000..901a53f1 --- /dev/null +++ b/charts/v4.0.0/csi-driver-nfs/templates/_helpers.tpl @@ -0,0 +1,19 @@ +{{/* vim: set filetype=mustache: */}} + +{{/* Expand the name of the chart.*/}} +{{- define "nfs.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* labels for helm resources */}} +{{- define "nfs.labels" -}} +labels: + app.kubernetes.io/instance: "{{ .Release.Name }}" + app.kubernetes.io/managed-by: "{{ .Release.Service }}" + app.kubernetes.io/name: "{{ template "nfs.name" . }}" + app.kubernetes.io/version: "{{ .Chart.AppVersion }}" + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + {{- if .Values.customLabels }} +{{ toYaml .Values.customLabels | indent 2 -}} + {{- end }} +{{- end -}} diff --git a/charts/v4.0.0/csi-driver-nfs/templates/csi-nfs-controller.yaml b/charts/v4.0.0/csi-driver-nfs/templates/csi-nfs-controller.yaml new file mode 100644 index 00000000..1c070d5d --- /dev/null +++ b/charts/v4.0.0/csi-driver-nfs/templates/csi-nfs-controller.yaml @@ -0,0 +1,110 @@ +--- +kind: Deployment +apiVersion: apps/v1 +metadata: + name: {{ .Values.controller.name }} + namespace: {{ .Release.Namespace }} +{{ include "nfs.labels" . | indent 2 }} +spec: + replicas: {{ .Values.controller.replicas }} + selector: + matchLabels: + app: {{ .Values.controller.name }} + template: + metadata: +{{ include "nfs.labels" . | indent 6 }} + app: {{ .Values.controller.name }} + spec: + {{- if .Values.imagePullSecrets }} + imagePullSecrets: +{{ toYaml .Values.imagePullSecrets | indent 8 }} + {{- end }} + hostNetwork: true # controller also needs to mount nfs to create dir + dnsPolicy: {{ .Values.controller.dnsPolicy }} + serviceAccountName: {{ .Values.serviceAccount.controller }} + nodeSelector: + kubernetes.io/os: linux + {{- if .Values.controller.runOnMaster}} + kubernetes.io/role: master + {{- end}} + priorityClassName: system-cluster-critical +{{- with .Values.controller.tolerations }} + tolerations: +{{ toYaml . | indent 8 }} +{{- end }} + containers: + - name: csi-provisioner + image: "{{ .Values.image.csiProvisioner.repository }}:{{ .Values.image.csiProvisioner.tag }}" + args: + - "-v=2" + - "--csi-address=$(ADDRESS)" + - "--leader-election" + - "--leader-election-namespace={{ .Release.Namespace }}" + env: + - name: ADDRESS + value: /csi/csi.sock + imagePullPolicy: {{ .Values.image.csiProvisioner.pullPolicy }} + volumeMounts: + - mountPath: /csi + name: socket-dir + resources: {{- toYaml .Values.controller.resources.csiProvisioner | nindent 12 }} + - name: liveness-probe + image: "{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}" + args: + - --csi-address=/csi/csi.sock + - --probe-timeout=3s + - --health-port={{ .Values.controller.livenessProbe.healthPort }} + - --v=2 + imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }} + volumeMounts: + - name: socket-dir + mountPath: /csi + resources: {{- toYaml .Values.controller.resources.livenessProbe | nindent 12 }} + - name: nfs + image: "{{ .Values.image.nfs.repository }}:{{ .Values.image.nfs.tag }}" + securityContext: + privileged: true + capabilities: + add: ["SYS_ADMIN"] + allowPrivilegeEscalation: true + imagePullPolicy: {{ .Values.image.nfs.pullPolicy }} + args: + - "--v={{ .Values.controller.logLevel }}" + - "--nodeid=$(NODE_ID)" + - "--endpoint=$(CSI_ENDPOINT)" + - "--drivername={{ .Values.driver.name }}" + - "--mount-permissions={{ .Values.driver.mountPermissions }}" + - "--working-mount-dir={{ .Values.controller.workingMountDir }}" + env: + - name: NODE_ID + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: CSI_ENDPOINT + value: unix:///csi/csi.sock + ports: + - containerPort: {{ .Values.controller.livenessProbe.healthPort }} + name: healthz + protocol: TCP + livenessProbe: + failureThreshold: 5 + httpGet: + path: /healthz + port: healthz + initialDelaySeconds: 30 + timeoutSeconds: 10 + periodSeconds: 30 + volumeMounts: + - name: pods-mount-dir + mountPath: {{ .Values.kubeletDir }}/pods + mountPropagation: "Bidirectional" + - mountPath: /csi + name: socket-dir + resources: {{- toYaml .Values.controller.resources.nfs | nindent 12 }} + volumes: + - name: pods-mount-dir + hostPath: + path: {{ .Values.kubeletDir }}/pods + type: Directory + - name: socket-dir + emptyDir: {} diff --git a/charts/v4.0.0/csi-driver-nfs/templates/csi-nfs-driverinfo.yaml b/charts/v4.0.0/csi-driver-nfs/templates/csi-nfs-driverinfo.yaml new file mode 100644 index 00000000..a6afd896 --- /dev/null +++ b/charts/v4.0.0/csi-driver-nfs/templates/csi-nfs-driverinfo.yaml @@ -0,0 +1,15 @@ +--- +apiVersion: storage.k8s.io/v1 +kind: CSIDriver +metadata: + name: {{ .Values.driver.name }} +spec: + attachRequired: false + volumeLifecycleModes: + - Persistent + {{- if .Values.feature.enableInlineVolume}} + - Ephemeral + {{- end}} + {{- if .Values.feature.enableFSGroupPolicy}} + fsGroupPolicy: File + {{- end}} diff --git a/charts/v4.0.0/csi-driver-nfs/templates/csi-nfs-node.yaml b/charts/v4.0.0/csi-driver-nfs/templates/csi-nfs-node.yaml new file mode 100644 index 00000000..644a2701 --- /dev/null +++ b/charts/v4.0.0/csi-driver-nfs/templates/csi-nfs-node.yaml @@ -0,0 +1,126 @@ +--- +kind: DaemonSet +apiVersion: apps/v1 +metadata: + name: {{ .Values.node.name }} + namespace: {{ .Release.Namespace }} +{{ include "nfs.labels" . | indent 2 }} +spec: + updateStrategy: + rollingUpdate: + maxUnavailable: {{ .Values.node.maxUnavailable }} + type: RollingUpdate + selector: + matchLabels: + app: {{ .Values.node.name }} + template: + metadata: +{{ include "nfs.labels" . | indent 6 }} + app: {{ .Values.node.name }} + spec: + {{- if .Values.imagePullSecrets }} + imagePullSecrets: +{{ toYaml .Values.imagePullSecrets | indent 8 }} + {{- end }} + hostNetwork: true # original nfs connection would be broken without hostNetwork setting + dnsPolicy: {{ .Values.controller.dnsPolicy }} + nodeSelector: + kubernetes.io/os: linux +{{- with .Values.node.tolerations }} + tolerations: +{{ toYaml . | indent 8 }} +{{- end }} + containers: + - name: liveness-probe + image: "{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}" + args: + - --csi-address=/csi/csi.sock + - --probe-timeout=3s + - --health-port={{ .Values.node.livenessProbe.healthPort }} + - --v=2 + imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }} + volumeMounts: + - name: socket-dir + mountPath: /csi + resources: {{- toYaml .Values.node.resources.livenessProbe | nindent 12 }} + - name: node-driver-registrar + image: "{{ .Values.image.nodeDriverRegistrar.repository }}:{{ .Values.image.nodeDriverRegistrar.tag }}" + livenessProbe: + exec: + command: + - /csi-node-driver-registrar + - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) + - --mode=kubelet-registration-probe + initialDelaySeconds: 30 + timeoutSeconds: 15 + args: + - --v=2 + - --csi-address=/csi/csi.sock + - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) + env: + - name: DRIVER_REG_SOCK_PATH + value: {{ .Values.kubeletDir }}/plugins/csi-nfsplugin/csi.sock + - name: KUBE_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + imagePullPolicy: {{ .Values.image.nodeDriverRegistrar.pullPolicy }} + volumeMounts: + - name: socket-dir + mountPath: /csi + - name: registration-dir + mountPath: /registration + resources: {{- toYaml .Values.node.resources.nodeDriverRegistrar | nindent 12 }} + - name: nfs + securityContext: + privileged: true + capabilities: + add: ["SYS_ADMIN"] + allowPrivilegeEscalation: true + image: "{{ .Values.image.nfs.repository }}:{{ .Values.image.nfs.tag }}" + args : + - "--v={{ .Values.node.logLevel }}" + - "--nodeid=$(NODE_ID)" + - "--endpoint=$(CSI_ENDPOINT)" + - "--drivername={{ .Values.driver.name }}" + - "--mount-permissions={{ .Values.driver.mountPermissions }}" + env: + - name: NODE_ID + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: CSI_ENDPOINT + value: unix:///csi/csi.sock + ports: + - containerPort: {{ .Values.node.livenessProbe.healthPort }} + name: healthz + protocol: TCP + livenessProbe: + failureThreshold: 5 + httpGet: + path: /healthz + port: healthz + initialDelaySeconds: 30 + timeoutSeconds: 10 + periodSeconds: 30 + imagePullPolicy: {{ .Values.image.nfs.pullPolicy }} + volumeMounts: + - name: socket-dir + mountPath: /csi + - name: pods-mount-dir + mountPath: {{ .Values.kubeletDir }}/pods + mountPropagation: "Bidirectional" + resources: {{- toYaml .Values.node.resources.nfs | nindent 12 }} + volumes: + - name: socket-dir + hostPath: + path: {{ .Values.kubeletDir }}/plugins/csi-nfsplugin + type: DirectoryOrCreate + - name: pods-mount-dir + hostPath: + path: {{ .Values.kubeletDir }}/pods + type: Directory + - hostPath: + path: {{ .Values.kubeletDir }}/plugins_registry + type: Directory + name: registration-dir diff --git a/charts/v4.0.0/csi-driver-nfs/templates/rbac-csi-nfs-controller.yaml b/charts/v4.0.0/csi-driver-nfs/templates/rbac-csi-nfs-controller.yaml new file mode 100644 index 00000000..73e4ae07 --- /dev/null +++ b/charts/v4.0.0/csi-driver-nfs/templates/rbac-csi-nfs-controller.yaml @@ -0,0 +1,57 @@ +{{- if .Values.serviceAccount.create -}} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: csi-{{ .Values.rbac.name }}-controller-sa + namespace: {{ .Release.Namespace }} +{{ include "nfs.labels" . | indent 2 }} +--- +{{- end -}} + +{{- if .Values.rbac.create -}} +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: {{ .Values.rbac.name }}-external-provisioner-role +{{ include "nfs.labels" . | indent 2 }} +rules: + - apiGroups: [""] + resources: ["persistentvolumes"] + verbs: ["get", "list", "watch", "create", "delete"] + - apiGroups: [""] + resources: ["persistentvolumeclaims"] + verbs: ["get", "list", "watch", "update"] + - apiGroups: ["storage.k8s.io"] + resources: ["storageclasses"] + verbs: ["get", "list", "watch"] + - apiGroups: [""] + resources: ["events"] + verbs: ["get", "list", "watch", "create", "update", "patch"] + - apiGroups: ["storage.k8s.io"] + resources: ["csinodes"] + verbs: ["get", "list", "watch"] + - apiGroups: [""] + resources: ["nodes"] + verbs: ["get", "list", "watch"] + - apiGroups: ["coordination.k8s.io"] + resources: ["leases"] + verbs: ["get", "list", "watch", "create", "update", "patch"] + - apiGroups: [""] + resources: ["secrets"] + verbs: ["get"] +--- +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: {{ .Values.rbac.name }}-csi-provisioner-binding +{{ include "nfs.labels" . | indent 2 }} +subjects: + - kind: ServiceAccount + name: csi-{{ .Values.rbac.name }}-controller-sa + namespace: {{ .Release.Namespace }} +roleRef: + kind: ClusterRole + name: {{ .Values.rbac.name }}-external-provisioner-role + apiGroup: rbac.authorization.k8s.io +{{- end -}} diff --git a/charts/v4.0.0/csi-driver-nfs/values.yaml b/charts/v4.0.0/csi-driver-nfs/values.yaml new file mode 100644 index 00000000..da1888aa --- /dev/null +++ b/charts/v4.0.0/csi-driver-nfs/values.yaml @@ -0,0 +1,110 @@ +customLabels: {} +image: + nfs: + repository: registry.k8s.io/sig-storage/nfsplugin + tag: v4.0.0 + pullPolicy: IfNotPresent + csiProvisioner: + repository: registry.k8s.io/sig-storage/csi-provisioner + tag: v3.1.0 + pullPolicy: IfNotPresent + livenessProbe: + repository: registry.k8s.io/sig-storage/livenessprobe + tag: v2.6.0 + pullPolicy: IfNotPresent + nodeDriverRegistrar: + repository: registry.k8s.io/sig-storage/csi-node-driver-registrar + tag: v2.5.0 + pullPolicy: IfNotPresent + +serviceAccount: + create: true # When true, service accounts will be created for you. Set to false if you want to use your own. + controller: csi-nfs-controller-sa # Name of Service Account to be created or used + +rbac: + create: true + name: nfs + +driver: + name: nfs.csi.k8s.io + mountPermissions: 0777 + +feature: + enableFSGroupPolicy: true + enableInlineVolume: false + +kubeletDir: /var/lib/kubelet + +controller: + name: csi-nfs-controller + replicas: 1 + runOnMaster: false + livenessProbe: + healthPort: 29652 + logLevel: 5 + workingMountDir: "/tmp" + dnsPolicy: Default # available values: Default, ClusterFirstWithHostNet, ClusterFirst + tolerations: + - key: "node-role.kubernetes.io/master" + operator: "Exists" + effect: "NoSchedule" + - key: "node-role.kubernetes.io/controlplane" + operator: "Exists" + effect: "NoSchedule" + - key: "node-role.kubernetes.io/control-plane" + operator: "Exists" + effect: "NoSchedule" + resources: + csiProvisioner: + limits: + memory: 400Mi + requests: + cpu: 10m + memory: 20Mi + livenessProbe: + limits: + memory: 100Mi + requests: + cpu: 10m + memory: 20Mi + nfs: + limits: + memory: 200Mi + requests: + cpu: 10m + memory: 20Mi + +node: + name: csi-nfs-node + dnsPolicy: Default # available values: Default, ClusterFirstWithHostNet, ClusterFirst + maxUnavailable: 1 + logLevel: 5 + livenessProbe: + healthPort: 29653 + tolerations: + - operator: "Exists" + resources: + livenessProbe: + limits: + memory: 100Mi + requests: + cpu: 10m + memory: 20Mi + nodeDriverRegistrar: + limits: + memory: 100Mi + requests: + cpu: 10m + memory: 20Mi + nfs: + limits: + memory: 300Mi + requests: + cpu: 10m + memory: 20Mi + +## Reference to one or more secrets to be used when pulling images +## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ +## +imagePullSecrets: [] +# - name: "image-pull-secret" diff --git a/deploy/csi-nfs-controller.yaml b/deploy/csi-nfs-controller.yaml index 115bd357..be6ed741 100644 --- a/deploy/csi-nfs-controller.yaml +++ b/deploy/csi-nfs-controller.yaml @@ -67,7 +67,7 @@ spec: cpu: 10m memory: 20Mi - name: nfs - image: gcr.io/k8s-staging-sig-storage/nfsplugin:canary + image: registry.k8s.io/sig-storage/nfsplugin:v4.0.0 securityContext: privileged: true capabilities: diff --git a/deploy/csi-nfs-node.yaml b/deploy/csi-nfs-node.yaml index 214253ab..686205a2 100644 --- a/deploy/csi-nfs-node.yaml +++ b/deploy/csi-nfs-node.yaml @@ -78,7 +78,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: gcr.io/k8s-staging-sig-storage/nfsplugin:canary + image: registry.k8s.io/sig-storage/nfsplugin:v4.0.0 args: - "-v=5" - "--nodeid=$(NODE_ID)" diff --git a/deploy/v4.0.0/csi-nfs-controller.yaml b/deploy/v4.0.0/csi-nfs-controller.yaml new file mode 100644 index 00000000..be6ed741 --- /dev/null +++ b/deploy/v4.0.0/csi-nfs-controller.yaml @@ -0,0 +1,118 @@ +--- +kind: Deployment +apiVersion: apps/v1 +metadata: + name: csi-nfs-controller + namespace: kube-system +spec: + replicas: 1 + selector: + matchLabels: + app: csi-nfs-controller + template: + metadata: + labels: + app: csi-nfs-controller + spec: + hostNetwork: true # controller also needs to mount nfs to create dir + dnsPolicy: Default # available values: Default, ClusterFirstWithHostNet, ClusterFirst + serviceAccountName: csi-nfs-controller-sa + nodeSelector: + kubernetes.io/os: linux # add "kubernetes.io/role: master" to run controller on master node + priorityClassName: system-cluster-critical + tolerations: + - key: "node-role.kubernetes.io/master" + operator: "Exists" + effect: "NoSchedule" + - key: "node-role.kubernetes.io/controlplane" + operator: "Exists" + effect: "NoSchedule" + - key: "node-role.kubernetes.io/control-plane" + operator: "Exists" + effect: "NoSchedule" + containers: + - name: csi-provisioner + image: registry.k8s.io/sig-storage/csi-provisioner:v3.1.0 + args: + - "-v=2" + - "--csi-address=$(ADDRESS)" + - "--leader-election" + - "--leader-election-namespace=kube-system" + env: + - name: ADDRESS + value: /csi/csi.sock + volumeMounts: + - mountPath: /csi + name: socket-dir + resources: + limits: + memory: 400Mi + requests: + cpu: 10m + memory: 20Mi + - name: liveness-probe + image: registry.k8s.io/sig-storage/livenessprobe:v2.6.0 + args: + - --csi-address=/csi/csi.sock + - --probe-timeout=3s + - --health-port=29652 + - --v=2 + volumeMounts: + - name: socket-dir + mountPath: /csi + resources: + limits: + memory: 100Mi + requests: + cpu: 10m + memory: 20Mi + - name: nfs + image: registry.k8s.io/sig-storage/nfsplugin:v4.0.0 + securityContext: + privileged: true + capabilities: + add: ["SYS_ADMIN"] + allowPrivilegeEscalation: true + imagePullPolicy: IfNotPresent + args: + - "-v=5" + - "--nodeid=$(NODE_ID)" + - "--endpoint=$(CSI_ENDPOINT)" + env: + - name: NODE_ID + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: CSI_ENDPOINT + value: unix:///csi/csi.sock + ports: + - containerPort: 29652 + name: healthz + protocol: TCP + livenessProbe: + failureThreshold: 5 + httpGet: + path: /healthz + port: healthz + initialDelaySeconds: 30 + timeoutSeconds: 10 + periodSeconds: 30 + volumeMounts: + - name: pods-mount-dir + mountPath: /var/lib/kubelet/pods + mountPropagation: "Bidirectional" + - mountPath: /csi + name: socket-dir + resources: + limits: + memory: 200Mi + requests: + cpu: 10m + memory: 20Mi + volumes: + - name: pods-mount-dir + hostPath: + path: /var/lib/kubelet/pods + type: Directory + - name: socket-dir + emptyDir: {} diff --git a/deploy/v4.0.0/csi-nfs-driverinfo.yaml b/deploy/v4.0.0/csi-nfs-driverinfo.yaml new file mode 100644 index 00000000..bb08dbc4 --- /dev/null +++ b/deploy/v4.0.0/csi-nfs-driverinfo.yaml @@ -0,0 +1,11 @@ +--- +apiVersion: storage.k8s.io/v1 +kind: CSIDriver +metadata: + name: nfs.csi.k8s.io +spec: + attachRequired: false + volumeLifecycleModes: + - Persistent + - Ephemeral + fsGroupPolicy: File diff --git a/deploy/v4.0.0/csi-nfs-node.yaml b/deploy/v4.0.0/csi-nfs-node.yaml new file mode 100644 index 00000000..686205a2 --- /dev/null +++ b/deploy/v4.0.0/csi-nfs-node.yaml @@ -0,0 +1,130 @@ +--- +kind: DaemonSet +apiVersion: apps/v1 +metadata: + name: csi-nfs-node + namespace: kube-system +spec: + updateStrategy: + rollingUpdate: + maxUnavailable: 1 + type: RollingUpdate + selector: + matchLabels: + app: csi-nfs-node + template: + metadata: + labels: + app: csi-nfs-node + spec: + hostNetwork: true # original nfs connection would be broken without hostNetwork setting + dnsPolicy: Default # available values: Default, ClusterFirstWithHostNet, ClusterFirst + nodeSelector: + kubernetes.io/os: linux + tolerations: + - operator: "Exists" + containers: + - name: liveness-probe + image: registry.k8s.io/sig-storage/livenessprobe:v2.6.0 + args: + - --csi-address=/csi/csi.sock + - --probe-timeout=3s + - --health-port=29653 + - --v=2 + volumeMounts: + - name: socket-dir + mountPath: /csi + resources: + limits: + memory: 100Mi + requests: + cpu: 10m + memory: 20Mi + - name: node-driver-registrar + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.0 + args: + - --v=2 + - --csi-address=/csi/csi.sock + - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) + livenessProbe: + exec: + command: + - /csi-node-driver-registrar + - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) + - --mode=kubelet-registration-probe + initialDelaySeconds: 30 + timeoutSeconds: 15 + env: + - name: DRIVER_REG_SOCK_PATH + value: /var/lib/kubelet/plugins/csi-nfsplugin/csi.sock + - name: KUBE_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + volumeMounts: + - name: socket-dir + mountPath: /csi + - name: registration-dir + mountPath: /registration + resources: + limits: + memory: 100Mi + requests: + cpu: 10m + memory: 20Mi + - name: nfs + securityContext: + privileged: true + capabilities: + add: ["SYS_ADMIN"] + allowPrivilegeEscalation: true + image: registry.k8s.io/sig-storage/nfsplugin:v4.0.0 + args: + - "-v=5" + - "--nodeid=$(NODE_ID)" + - "--endpoint=$(CSI_ENDPOINT)" + env: + - name: NODE_ID + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: CSI_ENDPOINT + value: unix:///csi/csi.sock + ports: + - containerPort: 29653 + name: healthz + protocol: TCP + livenessProbe: + failureThreshold: 5 + httpGet: + path: /healthz + port: healthz + initialDelaySeconds: 30 + timeoutSeconds: 10 + periodSeconds: 30 + imagePullPolicy: "IfNotPresent" + volumeMounts: + - name: socket-dir + mountPath: /csi + - name: pods-mount-dir + mountPath: /var/lib/kubelet/pods + mountPropagation: "Bidirectional" + resources: + limits: + memory: 300Mi + requests: + cpu: 10m + memory: 20Mi + volumes: + - name: socket-dir + hostPath: + path: /var/lib/kubelet/plugins/csi-nfsplugin + type: DirectoryOrCreate + - name: pods-mount-dir + hostPath: + path: /var/lib/kubelet/pods + type: Directory + - hostPath: + path: /var/lib/kubelet/plugins_registry + type: Directory + name: registration-dir diff --git a/deploy/v4.0.0/rbac-csi-nfs-controller.yaml b/deploy/v4.0.0/rbac-csi-nfs-controller.yaml new file mode 100644 index 00000000..2ac4a680 --- /dev/null +++ b/deploy/v4.0.0/rbac-csi-nfs-controller.yaml @@ -0,0 +1,52 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: csi-nfs-controller-sa + namespace: kube-system + +--- + +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: nfs-external-provisioner-role +rules: + - apiGroups: [""] + resources: ["persistentvolumes"] + verbs: ["get", "list", "watch", "create", "delete"] + - apiGroups: [""] + resources: ["persistentvolumeclaims"] + verbs: ["get", "list", "watch", "update"] + - apiGroups: ["storage.k8s.io"] + resources: ["storageclasses"] + verbs: ["get", "list", "watch"] + - apiGroups: [""] + resources: ["events"] + verbs: ["get", "list", "watch", "create", "update", "patch"] + - apiGroups: ["storage.k8s.io"] + resources: ["csinodes"] + verbs: ["get", "list", "watch"] + - apiGroups: [""] + resources: ["nodes"] + verbs: ["get", "list", "watch"] + - apiGroups: ["coordination.k8s.io"] + resources: ["leases"] + verbs: ["get", "list", "watch", "create", "update", "patch"] + - apiGroups: [""] + resources: ["secrets"] + verbs: ["get"] +--- + +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: nfs-csi-provisioner-binding +subjects: + - kind: ServiceAccount + name: csi-nfs-controller-sa + namespace: kube-system +roleRef: + kind: ClusterRole + name: nfs-external-provisioner-role + apiGroup: rbac.authorization.k8s.io diff --git a/docs/install-csi-driver-v4.0.0.md b/docs/install-csi-driver-v4.0.0.md new file mode 100644 index 00000000..209dd4c5 --- /dev/null +++ b/docs/install-csi-driver-v4.0.0.md @@ -0,0 +1,45 @@ +# Install NFS CSI driver v4.0.0 version on a kubernetes cluster + +If you have already installed Helm, you can also use it to install this driver. Please check [Installation with Helm](../charts/README.md). + +## Install with kubectl + - Option#1. remote install +```console +curl -skSL https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/v4.0.0/deploy/install-driver.sh | bash -s v4.0.0 -- +``` + + - Option#2. local install +```console +git clone https://github.com/kubernetes-csi/csi-driver-nfs.git +cd csi-driver-nfs +./deploy/install-driver.sh v4.0.0 local +``` + +- check pods status: +```console +kubectl -n kube-system get pod -o wide -l app=csi-nfs-controller +kubectl -n kube-system get pod -o wide -l app=csi-nfs-node +``` + +example output: + +```console +NAME READY STATUS RESTARTS AGE IP NODE +csi-nfs-controller-56bfddd689-dh5tk 4/4 Running 0 35s 10.240.0.19 k8s-agentpool-22533604-0 +csi-nfs-node-cvgbs 3/3 Running 0 35s 10.240.0.35 k8s-agentpool-22533604-1 +csi-nfs-node-dr4s4 3/3 Running 0 35s 10.240.0.4 k8s-agentpool-22533604-0 +``` + +### clean up NFS CSI driver + - Option#1. remote uninstall +```console +curl -skSL https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/v4.0.0/deploy/uninstall-driver.sh | bash -s v4.0.0 -- +``` + + - Option#2. local uninstall +```console +git clone https://github.com/kubernetes-csi/csi-driver-nfs.git +cd csi-driver-nfs +git checkout v4.0.0 +./deploy/uninstall-driver.sh v4.0.0 local +``` diff --git a/docs/install-nfs-csi-driver.md b/docs/install-nfs-csi-driver.md index 5e0c6e15..71c9dd93 100644 --- a/docs/install-nfs-csi-driver.md +++ b/docs/install-nfs-csi-driver.md @@ -1,5 +1,6 @@ ## Install NFS CSI driver on a Kubernetes cluster - [install CSI driver master version](./install-csi-driver-master.md) + - [install CSI driver v4.0.0 version](./install-csi-driver-v4.0.0.md) - [install CSI driver v3.1.0 version](./install-csi-driver-v3.1.0.md) - [install CSI driver v3.0.0 version](./install-csi-driver-v3.0.0.md)