kubernetes-csi/csi-driver-nfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #440 from andyzhangx/dnspolicy-fix

Browse Source 
fix: set ClusterFirstWithHostNet as default dnsPolicy
This commit is contained in:
Andy Zhang 2023-04-30 16:53:30 +08:00 committed by GitHub
commit d0bc147851
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -147,7 +147,6 @@ e2e-bootstrap: install-helm
OUTPUT_TYPE=registry $(MAKE) container push 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 \ helm install csi-driver-nfs ./charts/latest/csi-driver-nfs --namespace kube-system --wait --timeout=15m -v=5 --debug \
${E2E_HELM_OPTIONS} \ ${E2E_HELM_OPTIONS} \
--set controller.dnsPolicy=ClusterFirstWithHostNet \
--set controller.logLevel=8 \ --set controller.logLevel=8 \
--set node.logLevel=8 --set node.logLevel=8

4
charts/README.md
View File

@ -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.replicas` | replica number of csi-nfs-controller | `1` |
| `controller.runOnMaster` | run controller on master node(deprecated on k8s 1.25+) |`false` | | `controller.runOnMaster` | run controller on master node(deprecated on k8s 1.25+) |`false` |
| `controller.runOnControlPlane` | run controller on control plane node |`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.defaultOnDeletePolicy` | default policy for deleting subdirectory when deleting a volume, available values: `delete`, `retain` | `delete` |
| `controller.logLevel` | controller driver log level |`5` | | `controller.logLevel` | controller driver log level |`5` |
| `controller.workingMountDir` | working directory for provisioner to mount nfs shares temporarily | `/tmp` | | `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.cpu` | csi-driver-nfs cpu requests limits | 10m |
| `controller.resources.nfs.requests.memory` | csi-driver-nfs memory requests limits | 20Mi | | `controller.resources.nfs.requests.memory` | csi-driver-nfs memory requests limits | 20Mi |
| `node.name` | driver node daemonset name | `csi-nfs-node` | `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.maxUnavailable` | `maxUnavailable` value of driver node daemonset | `1`
| `node.logLevel` | node driver log level |`5` | | `node.logLevel` | node driver log level |`5` |
| `node.livenessProbe.healthPort ` | the health check port for liveness probe |`29653` | | `node.livenessProbe.healthPort ` | the health check port for liveness probe |`29653` |

BIN
charts/latest/csi-driver-nfs-v0.0.0.tgz
View File

Binary file not shown.

4
charts/latest/csi-driver-nfs/values.yaml
View File

@ -53,7 +53,7 @@ controller:
healthPort: 29652 healthPort: 29652
logLevel: 5 logLevel: 5
workingMountDir: /tmp workingMountDir: /tmp
dnsPolicy: Default # available values: Default, ClusterFirstWithHostNet, ClusterFirst dnsPolicy: ClusterFirstWithHostNet # available values: Default, ClusterFirstWithHostNet, ClusterFirst
defaultOnDeletePolicy: delete # available values: delete, retain defaultOnDeletePolicy: delete # available values: delete, retain
affinity: {} affinity: {}
nodeSelector: {} nodeSelector: {}
@ -89,7 +89,7 @@ controller:
node: node:
name: csi-nfs-node name: csi-nfs-node
dnsPolicy: Default # available values: Default, ClusterFirstWithHostNet, ClusterFirst dnsPolicy: ClusterFirstWithHostNet # available values: Default, ClusterFirstWithHostNet, ClusterFirst
maxUnavailable: 1 maxUnavailable: 1
logLevel: 5 logLevel: 5
livenessProbe: livenessProbe:

2
deploy/csi-nfs-controller.yaml
View File

@ -15,7 +15,7 @@ spec:
app: csi-nfs-controller app: csi-nfs-controller
spec: spec:
hostNetwork: true # controller also needs to mount nfs to create dir 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 serviceAccountName: csi-nfs-controller-sa
nodeSelector: nodeSelector:
kubernetes.io/os: linux # add "kubernetes.io/role: master" to run controller on master node kubernetes.io/os: linux # add "kubernetes.io/role: master" to run controller on master node

2
deploy/csi-nfs-node.yaml
View File

@ -18,7 +18,7 @@ spec:
app: csi-nfs-node app: csi-nfs-node
spec: spec:
hostNetwork: true # original nfs connection would be broken without hostNetwork setting 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 serviceAccountName: csi-nfs-node-sa
priorityClassName: system-node-critical priorityClassName: system-node-critical
securityContext: securityContext: