feat: add reservedDataDiskSlotNum to helm chart

Signed-off-by: ClementLachaussee <clement_lachaussee@ext.carrefour.com>
kubernetes-sigs · Jun 28, 2024 · f8a3db2 · f8a3db2
1 parent 2f8b1d3
commit f8a3db2
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/charts/README.md b/charts/README.md
@@ -184,6 +184,7 @@ The following table lists the configurable parameters of the latest Azure Disk C
 | `controller.resources.azuredisk.requests.memory`      | azuredisk memory requests                | 20Mi                                                           |
 | `node.cloudConfigSecretName`                      | cloud config secret name of node driver                    | `azure-cloud-provider`
 | `node.cloudConfigSecretNamespace`                 | cloud config secret namespace of node driver               | `kube-system`
+| `node.reservedDataDiskSlotNum`                  | reserved data disk slot number per node by default(`0`)    | `0` |
 | `node.supportZone`                                | Whether getting zone info in NodeGetInfo on the node (requires instance metadata support)               | `true`
 | `node.getNodeIDFromIMDS`                          | Whether getting NodeID from IMDS on the node (requires instance metadata support)               | `false`
 | `node.allowEmptyCloudConfig`                      | Whether allow running node driver without cloud config               | `true`

diff --git a/charts/latest/azuredisk-csi-driver-v0.0.0.tgz b/charts/latest/azuredisk-csi-driver-v0.0.0.tgz
diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node-windows-hostprocess.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node-windows-hostprocess.yaml
@@ -118,7 +118,7 @@ spec:
             - "--nodeid=$(KUBE_NODE_NAME)"
             - "--drivername={{ .Values.driver.name }}"
             - "--volume-attach-limit={{ .Values.driver.volumeAttachLimit }}"
-            - "--reserved-data-disk-slot-num={{ .Values.driver.reservedDataDiskSlotNum }}"
+            - "--reserved-data-disk-slot-num={{ .Values.node.reservedDataDiskSlotNum }}"
             - "--cloud-config-secret-name={{ .Values.node.cloudConfigSecretName }}"
             - "--cloud-config-secret-namespace={{ .Values.node.cloudConfigSecretNamespace }}"
             - "--custom-user-agent={{ .Values.driver.customUserAgent }}"

diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
@@ -131,7 +131,7 @@ spec:
             - "--nodeid=$(KUBE_NODE_NAME)"
             - "--drivername={{ .Values.driver.name }}"
             - "--volume-attach-limit={{ .Values.driver.volumeAttachLimit }}"
-            - "--reserved-data-disk-slot-num={{ .Values.driver.reservedDataDiskSlotNum }}"
+            - "--reserved-data-disk-slot-num={{ .Values.node.reservedDataDiskSlotNum }}"
             - "--cloud-config-secret-name={{ .Values.node.cloudConfigSecretName }}"
             - "--cloud-config-secret-namespace={{ .Values.node.cloudConfigSecretNamespace }}"
             - "--custom-user-agent={{ .Values.driver.customUserAgent }}"

diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
@@ -130,7 +130,7 @@ spec:
             - "--enable-perf-optimization={{ .Values.linux.enablePerfOptimization }}"
             - "--drivername={{ .Values.driver.name }}"
             - "--volume-attach-limit={{ .Values.driver.volumeAttachLimit }}"
-            - "--reserved-data-disk-slot-num={{ .Values.driver.reservedDataDiskSlotNum }}"
+            - "--reserved-data-disk-slot-num={{ .Values.node.reservedDataDiskSlotNum }}"
             - "--cloud-config-secret-name={{ .Values.node.cloudConfigSecretName }}"
             - "--cloud-config-secret-namespace={{ .Values.node.cloudConfigSecretNamespace }}"
             - "--custom-user-agent={{ .Values.driver.customUserAgent }}"

diff --git a/charts/latest/azuredisk-csi-driver/values.yaml b/charts/latest/azuredisk-csi-driver/values.yaml
@@ -117,6 +117,8 @@ controller:
 node:
   cloudConfigSecretName: azure-cloud-provider
   cloudConfigSecretNamespace: kube-system
+  # reserved data disk slot number per node, driver.volumeAttachLimit must be < 0
+  reservedDataDiskSlotNum: 0
   supportZone: true
   allowEmptyCloudConfig: true
   getNodeIDFromIMDS: false
@@ -168,8 +170,6 @@ driver:
   # maximum number of attachable volumes per node,
   # maximum number is defined according to node instance type by default(-1)
   volumeAttachLimit: -1
-  # reserved data disk slot number per node
-  reservedDataDiskSlotNum: 0
   customUserAgent: ""
   userAgentSuffix: "OSS-helm"
   azureGoSDKLogLevel: "" # available values: ""(no logs), DEBUG, INFO, WARNING, ERROR