Merge pull request openshift#125 from shiftstack/merge-bot-master

Merge https://github.com/kubernetes-csi/csi-driver-nfs:master into master

Author: openshift-merge-robot

Makefile

@@ -42,7 +42,7 @@ REGISTRY_NAME ?= $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g")
 IMAGE_TAG = $(REGISTRY)/$(IMAGENAME):$(IMAGE_VERSION)
 IMAGE_TAG_LATEST = $(REGISTRY)/$(IMAGENAME):latest
 
-E2E_HELM_OPTIONS ?= --set image.nfs.repository=$(REGISTRY)/$(IMAGENAME) --set image.nfs.tag=$(IMAGE_VERSION) --set image.nfs.pullPolicy=Always --set feature.enableInlineVolume=true
+E2E_HELM_OPTIONS ?= --set image.nfs.repository=$(REGISTRY)/$(IMAGENAME) --set image.nfs.tag=$(IMAGE_VERSION) --set image.nfs.pullPolicy=Always --set feature.enableInlineVolume=true --set externalSnapshotter.enabled=true
 E2E_HELM_OPTIONS += ${EXTRA_HELM_OPTIONS}
 
 # Output type of docker buildx build

charts/README.md

@@ -4,6 +4,7 @@
  - [install Helm](https://helm.sh/docs/intro/quickstart/#install-helm)
 
 ### Tips
+ - install csi snapshot controller: `--set externalSnapshotter.enabled=true`
  - run controller on control plane node: `--set controller.runOnControlPlane=true`
  - set replica of controller as `2`: `--set controller.replicas=2`
  - Microk8s based kubernetes recommended settings:
@@ -72,6 +73,7 @@ The following table lists the configurable parameters of the latest NFS CSI Driv
 | `controller.affinity`                                 | controller pod affinity                               | `{}`                                                             |
 | `controller.nodeSelector`                             | controller pod node selector                          | `{}`                                                             |
 | `controller.tolerations`                              | controller pod tolerations                            |                                                              |
+| `controller.priorityClassName`                        | controller pod priorityClassName                      | `system-cluster-critical`                                                             |
 | `controller.resources.csiProvisioner.limits.memory`   | csi-provisioner memory limits                         | 100Mi                                                          |
 | `controller.resources.csiProvisioner.requests.cpu`    | csi-provisioner cpu requests limits                   | 10m                                                            |
 | `controller.resources.csiProvisioner.requests.memory` | csi-provisioner memory requests limits                | 20Mi                                                           |
@@ -88,6 +90,7 @@ The following table lists the configurable parameters of the latest NFS CSI Driv
 | `node.livenessProbe.healthPort `                  | the health check port for liveness probe                    |`29653`                                                           |
 | `node.affinity`                                      | node pod affinity                                     | {}                                                             |
 | `node.nodeSelector`                                   | node pod node selector                                | `{}`                                                             |
+| `node.priorityClassName`                              | node pod priority class name                          | `system-cluster-critical`                                                             |
 | `node.tolerations`                              | node pod tolerations                            |                                                              |
 | `node.resources.livenessProbe.limits.memory`          | liveness-probe memory limits                          | 100Mi                                                          |
 | `node.resources.livenessProbe.requests.cpu`           | liveness-probe cpu requests limits                    | 10m                                                            |
@@ -98,6 +101,13 @@ The following table lists the configurable parameters of the latest NFS CSI Driv
 | `node.resources.nfs.limits.memory`                    | csi-driver-nfs memory limits                         | 300Mi                                                         |
 | `node.resources.nfs.requests.cpu`                     | csi-driver-nfs cpu requests limits                   | 10m                                                            |
 | `node.resources.nfs.requests.memory`                  | csi-driver-nfs memory requests limits                | 20Mi                                                           |
+| `externalSnapshotter.enabled`                         | enable snapshot-controller                         | `false`
+| `externalSnapshotter.name`                            | name of snapshot-controller                         | `snapshot-controller`
+| `externalSnapshotter.controller.replicas`             | replica number of snapshot-controller                         | 1
+| `externalSnapshotter.resources.limits.memory`         | snapshot-controller memory limits                          | 300Mi                                                          |
+| `externalSnapshotter.resources.requests.cpu`          | snapshot-controller cpu requests limits                    | 10m                                                            |
+| `externalSnapshotter.resources.requests.memory`       | snapshot-controller memory requests limits                 | 20Mi                                                           |
+
 
 ## troubleshooting
  - Add `--wait -v=5 --debug` in `helm install` command to get detailed error

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

@@ -1,11 +1,12 @@
-{{- if .Values.externalSnapshotter.enabled -}}
+{{- if and .Values.externalSnapshotter.enabled .Values.externalSnapshotter.customResourceDefinitions.enabled -}}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.8.0
     api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/665"
+    "helm.sh/resource-policy": keep
   creationTimestamp: null
   name: volumesnapshots.snapshot.storage.k8s.io
 spec:
@@ -314,6 +315,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.8.0
     api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/665"
+    "helm.sh/resource-policy": keep
   creationTimestamp: null
   name: volumesnapshotclasses.snapshot.storage.k8s.io
 spec:
@@ -448,6 +450,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.8.0
     api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/665"
+    "helm.sh/resource-policy": keep
   creationTimestamp: null
   name: volumesnapshotcontents.snapshot.storage.k8s.io
 spec:

charts/latest/csi-driver-nfs/templates/crd-csi-snapshot.yaml

@@ -39,7 +39,7 @@ spec:
 {{- with .Values.controller.nodeSelector }}
 {{ toYaml . | indent 8 }}
 {{- end }}
-      priorityClassName: system-cluster-critical
+      priorityClassName: {{ .Values.controller.priorityClassName }}
       securityContext:
         seccompProfile:
           type: RuntimeDefault
@@ -66,7 +66,6 @@ spec:
           resources: {{- toYaml .Values.controller.resources.csiProvisioner | nindent 12 }}
           securityContext:
             readOnlyRootFilesystem: true
-        {{- if .Values.externalSnapshotter.enabled }}
         - name: csi-snapshotter
           image: "{{ .Values.image.csiSnapshotter.repository }}:{{ .Values.image.csiSnapshotter.tag }}"
           args:
@@ -82,7 +81,6 @@ spec:
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
-        {{- end }}
         - name: liveness-probe
           image: "{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
           args:

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

@@ -25,7 +25,7 @@ spec:
       hostNetwork: true # original nfs connection would be broken without hostNetwork setting
       dnsPolicy: {{ .Values.controller.dnsPolicy }}
       serviceAccountName: csi-nfs-node-sa
-      priorityClassName: system-node-critical
+      priorityClassName: {{ .Values.node.priorityClassName }}
       securityContext:
         seccompProfile:
           type: RuntimeDefault

charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml

@@ -40,9 +40,13 @@ spec:
         app: {{ .Values.externalSnapshotter.name }}
     spec:
       serviceAccountName: {{ .Values.externalSnapshotter.name }}
+      {{- if .Values.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml .Values.imagePullSecrets | indent 8 }}
+      {{- end }}
       nodeSelector:
         kubernetes.io/os: linux
-      priorityClassName: system-cluster-critical
+      priorityClassName: {{ .Values.externalSnapshotter.priorityClassName }}
       securityContext:
         seccompProfile:
           type: RuntimeDefault

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

@@ -57,6 +57,7 @@ controller:
   defaultOnDeletePolicy: delete  # available values: delete, retain
   affinity: {}
   nodeSelector: {}
+  priorityClassName: system-cluster-critical
   tolerations:
     - key: "node-role.kubernetes.io/master"
       operator: "Exists"
@@ -102,6 +103,7 @@ node:
     healthPort: 29653
   affinity: {}
   nodeSelector: {}
+  priorityClassName: system-cluster-critical
   tolerations:
     - operator: "Exists"
   resources:
@@ -125,8 +127,9 @@ node:
         memory: 20Mi
 
 externalSnapshotter:
-  enabled: true
+  enabled: false
   name: snapshot-controller
+  priorityClassName: system-cluster-critical
   controller:
     replicas: 1
   resources:
@@ -135,6 +138,10 @@ externalSnapshotter:
     requests:
       cpu: 10m
       memory: 20Mi
+  # Create volume snapshot CRDs. 
+  customResourceDefinitions:
+    enabled: true   #if set true, VolumeSnapshot, VolumeSnapshotContent and VolumeSnapshotClass CRDs will be created. Set it false, If they already exist in cluster.
+
 ## 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/
 ##

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

@@ -39,7 +39,7 @@ spec:
 {{- with .Values.controller.nodeSelector }}
 {{ toYaml . | indent 8 }}
 {{- end }}
-      priorityClassName: system-cluster-critical
+      priorityClassName: {{ .Values.controller.priorityClassName }}
       securityContext:
         seccompProfile:
           type: RuntimeDefault