diff --git a/Makefile b/Makefile index 04ae1b08..fceb5315 100644 --- a/Makefile +++ b/Makefile @@ -147,7 +147,6 @@ e2e-bootstrap: install-helm OUTPUT_TYPE=registry $(MAKE) container push helm install csi-driver-nfs ./charts/latest/csi-driver-nfs --namespace kube-system --wait --timeout=15m -v=5 --debug \ ${E2E_HELM_OPTIONS} \ - --set controller.dnsPolicy=ClusterFirstWithHostNet \ --set controller.logLevel=8 \ --set node.logLevel=8 diff --git a/charts/README.md b/charts/README.md index 40c0741e..34f19bb9 100644 --- a/charts/README.md +++ b/charts/README.md @@ -65,7 +65,7 @@ The following table lists the configurable parameters of the latest NFS CSI Driv | `controller.replicas` | replica number of csi-nfs-controller | `1` | | `controller.runOnMaster` | run controller on master node(deprecated on k8s 1.25+) |`false` | | `controller.runOnControlPlane` | run controller on control plane node |`false` | -| `controller.dnsPolicy` | dnsPolicy of controller driver, available values: `Default`, `ClusterFirstWithHostNet`, `ClusterFirst` | `Default` | +| `controller.dnsPolicy` | dnsPolicy of controller driver, available values: `Default`, `ClusterFirstWithHostNet`, `ClusterFirst` | `ClusterFirstWithHostNet` | | `controller.defaultOnDeletePolicy` | default policy for deleting subdirectory when deleting a volume, available values: `delete`, `retain` | `delete` | | `controller.logLevel` | controller driver log level |`5` | | `controller.workingMountDir` | working directory for provisioner to mount nfs shares temporarily | `/tmp` | @@ -82,7 +82,7 @@ The following table lists the configurable parameters of the latest NFS CSI Driv | `controller.resources.nfs.requests.cpu` | csi-driver-nfs cpu requests limits | 10m | | `controller.resources.nfs.requests.memory` | csi-driver-nfs memory requests limits | 20Mi | | `node.name` | driver node daemonset name | `csi-nfs-node` -| `node.dnsPolicy` | dnsPolicy of driver node daemonset, available values: `Default`, `ClusterFirstWithHostNet`, `ClusterFirst` | +| `node.dnsPolicy` | dnsPolicy of driver node daemonset, available values: `Default`, `ClusterFirstWithHostNet`, `ClusterFirst` |`ClusterFirstWithHostNet` | `node.maxUnavailable` | `maxUnavailable` value of driver node daemonset | `1` | `node.logLevel` | node driver log level |`5` | | `node.livenessProbe.healthPort ` | the health check port for liveness probe |`29653` | diff --git a/charts/latest/csi-driver-nfs-v0.0.0.tgz b/charts/latest/csi-driver-nfs-v0.0.0.tgz index e9dcd8dc..c3d83819 100644 Binary files a/charts/latest/csi-driver-nfs-v0.0.0.tgz and b/charts/latest/csi-driver-nfs-v0.0.0.tgz differ diff --git a/charts/latest/csi-driver-nfs/values.yaml b/charts/latest/csi-driver-nfs/values.yaml index c621a666..270bc5d0 100755 --- a/charts/latest/csi-driver-nfs/values.yaml +++ b/charts/latest/csi-driver-nfs/values.yaml @@ -53,7 +53,7 @@ controller: healthPort: 29652 logLevel: 5 workingMountDir: /tmp - dnsPolicy: Default # available values: Default, ClusterFirstWithHostNet, ClusterFirst + dnsPolicy: ClusterFirstWithHostNet # available values: Default, ClusterFirstWithHostNet, ClusterFirst defaultOnDeletePolicy: delete # available values: delete, retain affinity: {} nodeSelector: {} @@ -89,7 +89,7 @@ controller: node: name: csi-nfs-node - dnsPolicy: Default # available values: Default, ClusterFirstWithHostNet, ClusterFirst + dnsPolicy: ClusterFirstWithHostNet # available values: Default, ClusterFirstWithHostNet, ClusterFirst maxUnavailable: 1 logLevel: 5 livenessProbe: diff --git a/deploy/csi-nfs-controller.yaml b/deploy/csi-nfs-controller.yaml index 0903b39a..5212737b 100644 --- a/deploy/csi-nfs-controller.yaml +++ b/deploy/csi-nfs-controller.yaml @@ -15,7 +15,7 @@ spec: app: csi-nfs-controller spec: hostNetwork: true # controller also needs to mount nfs to create dir - dnsPolicy: Default # available values: Default, ClusterFirstWithHostNet, ClusterFirst + dnsPolicy: ClusterFirstWithHostNet # 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 diff --git a/deploy/csi-nfs-node.yaml b/deploy/csi-nfs-node.yaml index e8eb6f81..55e3b624 100644 --- a/deploy/csi-nfs-node.yaml +++ b/deploy/csi-nfs-node.yaml @@ -18,7 +18,7 @@ spec: app: csi-nfs-node spec: hostNetwork: true # original nfs connection would be broken without hostNetwork setting - dnsPolicy: Default # available values: Default, ClusterFirstWithHostNet, ClusterFirst + dnsPolicy: ClusterFirstWithHostNet # available values: Default, ClusterFirstWithHostNet, ClusterFirst serviceAccountName: csi-nfs-node-sa priorityClassName: system-node-critical securityContext: