Merge pull request #939 from andyzhangx/hostNetwork

feat: customize hostNetwork setting in helm install
kubernetes-sigs · Jul 16, 2021 · 2911104 · 2911104
2 parents c8f7537 + 8ef83c9
commit 2911104
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/charts/README.md b/charts/README.md
@@ -88,6 +88,7 @@ The following table lists the configurable parameters of the latest Azure Disk C
 | `controller.runOnMaster`                          | run csi-azuredisk-controller on master node                | `false`                                                        |
 | `controller.logLevel`                             | controller driver log level                                                          |`5`                                                           |
 | `controller.tolerations`                          | controller pod tolerations                            |                                                              |
+| `controller.hostNetwork`                          | `hostNetwork` setting on controller driver(could be disabled if controller does not depend on MSI setting)                            | `true`                                                            | `true`, `false`
 | `node.metricsPort`                                | metrics port of csi-azuredisk-node                         |`29605`                                                        |
 | `node.livenessProbe.healthPort `                  | health check port for liveness probe                   | `29603` |
 | `node.logLevel`                                   | node driver log level                                                          |`5`                                                           |
@@ -105,6 +106,7 @@ The following table lists the configurable parameters of the latest Azure Disk C
 | `linux.kubelet`                                   | configure kubelet directory path on Linux agent node                  | `/var/lib/kubelet`                                                |
 | `linux.distro`                                    | configure ssl certificates for different Linux distribution(available values: `debian`, `fedora`)                  | `debian`                                                |
 | `linux.tolerations`                               | linux node driver tolerations                            |                                                              |
+| `linux.hostNetwork`                               | `hostNetwork` setting on linux node driver(could be disabled if perfProfile is `none`)                            | `true`                                                            | `true`, `false`
 | `windows.enabled`                                 | whether enable windows feature                             | `true`                                                        |
 | `windows.dsName`                                  | name of driver daemonset on windows                             |`csi-azuredisk-node-win`                                                         |
 | `windows.kubelet`                                 | configure kubelet directory path on Windows agent node                | `'C:\var\lib\kubelet'`                                            |

diff --git a/charts/latest/azuredisk-csi-driver-v1.5.0.tgz b/charts/latest/azuredisk-csi-driver-v1.5.0.tgz
diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
@@ -21,7 +21,7 @@ spec:
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 8 }}
       {{- end }}
-      hostNetwork: true
+      hostNetwork: {{ .Values.controller.hostNetwork }}
       serviceAccountName: {{ .Values.serviceAccount.controller }}
       nodeSelector:
         kubernetes.io/os: linux

diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
@@ -21,7 +21,7 @@ spec:
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 8 }}
       {{- end }}
-      hostNetwork: true
+      hostNetwork: {{ .Values.linux.hostNetwork }}
       dnsPolicy: ClusterFirstWithHostNet
       serviceAccountName: {{ .Values.serviceAccount.node }}
       nodeSelector:

diff --git a/charts/latest/azuredisk-csi-driver/values.yaml b/charts/latest/azuredisk-csi-driver/values.yaml
@@ -52,6 +52,7 @@ controller:
     - key: "node-role.kubernetes.io/controlplane"
       operator: "Exists"
       effect: "NoSchedule"
+  hostNetwork: true # this setting could be disabled if controller does not depend on MSI setting
   podLabels: {}
 
 node:
@@ -95,6 +96,7 @@ linux:
   enablePerfOptimization: true
   tolerations:
     - operator: "Exists"
+  hostNetwork: true # this setting could be disabled if perfProfile is `none`
   podLabels: {}
 
 windows: