From 78263c7999c9579f03e69c25dc7bee25d5fd41ed Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Sun, 27 Feb 2022 02:59:53 +0000 Subject: [PATCH 1/2] feat: change dnsPolicy to Default and add dnsPolicy setting in chart fix --- Makefile | 19 +----------------- charts/README.md | 2 ++ charts/latest/csi-driver-nfs-v3.2.0.tgz | Bin 3645 -> 3602 bytes .../templates/csi-nfs-controller.yaml | 2 +- .../templates/csi-nfs-driverinfo.yaml | 1 + .../templates/csi-nfs-node.yaml | 5 ++--- charts/latest/csi-driver-nfs/values.yaml | 2 ++ deploy/csi-nfs-controller.yaml | 2 +- deploy/csi-nfs-node.yaml | 4 +--- 9 files changed, 11 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index 607d902cd..0c3d677cf 100644 --- a/Makefile +++ b/Makefile @@ -76,24 +76,6 @@ local-build-push: nfs docker build -t $(LOCAL_USER)/nfsplugin:latest . docker push $(LOCAL_USER)/nfsplugin -.PHONY: local-k8s-install -local-k8s-install: - echo "Instlling locally" - kubectl apply -f $(DEPLOY_FOLDER)/rbac-csi-nfs-controller.yaml - kubectl apply -f $(DEPLOY_FOLDER)/csi-nfs-driverinfo.yaml - kubectl apply -f $(DEPLOY_FOLDER)/csi-nfs-controller.yaml - kubectl apply -f $(DEPLOY_FOLDER)/csi-nfs-node.yaml - echo "Successfully installed" - -.PHONY: local-k8s-uninstall -local-k8s-uninstall: - echo "Uninstalling driver" - kubectl delete -f $(DEPLOY_FOLDER)/csi-nfs-controller.yaml --ignore-not-found - kubectl delete -f $(DEPLOY_FOLDER)/csi-nfs-node.yaml --ignore-not-found - kubectl delete -f $(DEPLOY_FOLDER)/csi-nfs-driverinfo.yaml --ignore-not-found - kubectl delete -f $(DEPLOY_FOLDER)/rbac-csi-nfs-controller.yaml --ignore-not-found - echo "Uninstalled NFS driver" - .PHONY: nfs nfs: CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -a -ldflags "${LDFLAGS} ${EXT_LDFLAGS}" -mod vendor -o bin/${ARCH}/nfsplugin ./cmd/nfsplugin @@ -163,6 +145,7 @@ 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 6ed4022c3..4e29ec4dc 100644 --- a/charts/README.md +++ b/charts/README.md @@ -58,6 +58,7 @@ The following table lists the configurable parameters of the latest NFS CSI Driv | `rbac.create` | whether create rbac of csi-nfs-controller | `true` | | `controller.replicas` | replica number of csi-nfs-controller | `1` | | `controller.runOnMaster` | run controller on master node | `false` | +| `controller.dnsPolicy` | dnsPolicy of controller driver, available values: `Default`, `ClusterFirstWithHostNet`, `ClusterFirst` | `Default` | | `controller.logLevel` | controller driver log level |`5` | | `controller.workingMountDir` | working directory for provisioner to mount nfs shares temporarily | `/tmp` | | `controller.tolerations` | controller pod tolerations | | @@ -71,6 +72,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.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-v3.2.0.tgz b/charts/latest/csi-driver-nfs-v3.2.0.tgz index 6aaf3f0720cebd5b86798c3174bf7abe4b2bacc0..7c24d1c4fa8d24c5b2a3dfc379d61b35683e1c01 100644 GIT binary patch delta 3576 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 Date: Wed, 2 Mar 2022 17:29:23 +0800 Subject: [PATCH 2/2] Update install-csi-driver-master.md --- docs/install-csi-driver-master.md | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/docs/install-csi-driver-master.md b/docs/install-csi-driver-master.md index 259411778..fd59b6075 100644 --- a/docs/install-csi-driver-master.md +++ b/docs/install-csi-driver-master.md @@ -1,14 +1,14 @@ # Install NFS CSI driver master version on a kubernetes cluster -If you have already installed Helm, you can also use it to install NFS CSI driver. Please see [Installation with Helm](../charts/README.md). +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 - - remote install + - Option#1. remote install ```console curl -skSL https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/deploy/install-driver.sh | bash -s master -- ``` - - local install + - Option#2. local install ```console git clone https://github.com/kubernetes-csi/csi-driver-nfs.git cd csi-driver-nfs @@ -26,12 +26,20 @@ 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-controller-56bfddd689-8pgr4 4/4 Running 0 35s 10.240.0.35 k8s-agentpool-22533604-1 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 +### clean up NFS CSI driver + - Option#1. remote uninstall ```console curl -skSL https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/deploy/uninstall-driver.sh | bash -s master -- -``` \ No newline at end of file +``` + + - Option#2. local uninstall +```console +git clone https://github.com/kubernetes-csi/csi-driver-nfs.git +cd csi-driver-nfs +git checkout master +./deploy/uninstall-driver.sh master local +```