Skip to content

Commit d0cd20e

Browse files
author
Huichan Cheng
committed
chore: remove disk driver version
1 parent f5c2368 commit d0cd20e

10 files changed

Lines changed: 4 additions & 1938 deletions

src/aks-preview/HISTORY.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ Pending
1313
+++++++
1414
* `az aks nodepool update`: Support `--node-vm-size` to resize VM size of an existing VMSS-based agent pool (preview). Requires AFEC registration `Microsoft.ContainerService/AgentPoolVMSSResize`.
1515

16+
* `az aks create/update`: Remove `--disk-driver-version` option for AzureDisk CSI Driver.
17+
1618
20.0.0b3
1719
++++++
1820
* Vendor new SDK and bump API version to 2026-02-02-preview.

src/aks-preview/azext_aks_preview/_consts.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,6 @@
169169
CONST_NETWORK_POD_IP_ALLOCATION_MODE_DYNAMIC_INDIVIDUAL = "DynamicIndividual"
170170
CONST_NETWORK_POD_IP_ALLOCATION_MODE_STATIC_BLOCK = "StaticBlock"
171171

172-
# disk driver versions
173-
CONST_DISK_DRIVER_V1 = "v1"
174-
CONST_DISK_DRIVER_V2 = "v2"
175-
176172
# consts for addons
177173
# application load balancer (Application Gateway for Containers)
178174
CONST_APPLICATION_LOAD_BALANCER_ADDON_NAME = "applicationLoadBalancer"

src/aks-preview/azext_aks_preview/_help.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -421,9 +421,6 @@
421421
- name: --disable-disk-driver
422422
type: bool
423423
short-summary: Disable AzureDisk CSI Driver.
424-
- name: --disk-driver-version
425-
type: string
426-
short-summary: Specify AzureDisk CSI Driver version.
427424
- name: --disable-file-driver
428425
type: bool
429426
short-summary: Disable AzureFile CSI Driver.
@@ -1116,9 +1113,6 @@
11161113
long-summary: |
11171114
Network dataplane used in the Kubernetes cluster.
11181115
Specify "azure" to use the Azure dataplane (default) or "cilium" to enable Cilium dataplane.
1119-
- name: --disk-driver-version
1120-
type: string
1121-
short-summary: Specify AzureDisk CSI Driver version.
11221116
- name: --disable-disk-driver
11231117
type: bool
11241118
short-summary: Disable AzureDisk CSI Driver.

src/aks-preview/azext_aks_preview/_params.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@
5858
CONST_CREDENTIAL_FORMAT_AZURE,
5959
CONST_CREDENTIAL_FORMAT_EXEC,
6060
CONST_DAILY_MAINTENANCE_SCHEDULE,
61-
CONST_DISK_DRIVER_V1,
62-
CONST_DISK_DRIVER_V2,
61+
6362
CONST_GPU_DRIVER_INSTALL,
6463
CONST_GPU_DRIVER_NONE,
6564
CONST_GPU_INSTANCE_PROFILE_MIG1_G,
@@ -378,7 +377,6 @@
378377
CONST_ACNS_DATAPATH_ACCELERATION_MODE_BPFVETH,
379378
]
380379
network_dataplanes = [CONST_NETWORK_DATAPLANE_AZURE, CONST_NETWORK_DATAPLANE_CILIUM]
381-
disk_driver_versions = [CONST_DISK_DRIVER_V1, CONST_DISK_DRIVER_V2]
382380
outbound_types = [
383381
CONST_OUTBOUND_TYPE_LOAD_BALANCER,
384382
CONST_OUTBOUND_TYPE_USER_DEFINED_ROUTING,
@@ -766,7 +764,6 @@ def load_arguments(self, _):
766764
c.argument("k8s_support_plan", arg_type=get_enum_type(k8s_support_plans))
767765
c.argument("enable_defender", action="store_true")
768766
c.argument("defender_config", validator=validate_defender_config_parameter)
769-
c.argument("disk_driver_version", arg_type=get_enum_type(disk_driver_versions))
770767
c.argument("disable_disk_driver", action="store_true")
771768
c.argument("disable_file_driver", action="store_true")
772769
c.argument("enable_blob_driver", action="store_true")
@@ -1410,7 +1407,6 @@ def load_arguments(self, _):
14101407
c.argument("enable_defender", action="store_true")
14111408
c.argument("defender_config", validator=validate_defender_config_parameter)
14121409
c.argument("enable_disk_driver", action="store_true")
1413-
c.argument("disk_driver_version", arg_type=get_enum_type(disk_driver_versions))
14141410
c.argument("disable_disk_driver", action="store_true")
14151411
c.argument("enable_file_driver", action="store_true")
14161412
c.argument("disable_file_driver", action="store_true")

src/aks-preview/azext_aks_preview/custom.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,6 @@ def aks_create(
10081008
nrg_lockdown_restriction_level=None,
10091009
enable_defender=False,
10101010
defender_config=None,
1011-
disk_driver_version=None,
10121011
disable_disk_driver=False,
10131012
disable_file_driver=False,
10141013
enable_blob_driver=None,
@@ -1275,7 +1274,6 @@ def aks_update(
12751274
disable_defender=False,
12761275
defender_config=None,
12771276
enable_disk_driver=False,
1278-
disk_driver_version=None,
12791277
disable_disk_driver=False,
12801278
enable_file_driver=False,
12811279
disable_file_driver=False,

src/aks-preview/azext_aks_preview/managed_cluster_decorator.py

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1802,9 +1802,8 @@ def get_disk_driver(self) -> Optional[ManagedClusterStorageProfileDiskCSIDriver]
18021802
"""
18031803
enable_disk_driver = self.raw_param.get("enable_disk_driver")
18041804
disable_disk_driver = self.raw_param.get("disable_disk_driver")
1805-
disk_driver_version = self.raw_param.get("disk_driver_version")
18061805

1807-
if not enable_disk_driver and not disable_disk_driver and not disk_driver_version:
1806+
if not enable_disk_driver and not disable_disk_driver:
18081807
return None
18091808
profile = self.models.ManagedClusterStorageProfileDiskCSIDriver() # pylint: disable=no-member
18101809

@@ -1814,29 +1813,15 @@ def get_disk_driver(self) -> Optional[ManagedClusterStorageProfileDiskCSIDriver]
18141813
"--disable-disk-driver at the same time."
18151814
)
18161815

1817-
if disable_disk_driver and disk_driver_version:
1818-
raise ArgumentUsageError(
1819-
"The parameter --disable-disk-driver cannot be used "
1820-
"when --disk-driver-version is specified.")
1821-
1822-
if self.decorator_mode == DecoratorMode.UPDATE and disk_driver_version and not enable_disk_driver:
1823-
raise ArgumentUsageError(
1824-
"Parameter --enable-disk-driver is required "
1825-
"when --disk-driver-version is specified during update.")
1826-
18271816
if self.decorator_mode == DecoratorMode.CREATE:
18281817
if disable_disk_driver:
18291818
profile.enabled = False
18301819
else:
18311820
profile.enabled = True
1832-
if disk_driver_version:
1833-
profile.version = disk_driver_version
18341821

18351822
if self.decorator_mode == DecoratorMode.UPDATE:
18361823
if enable_disk_driver:
18371824
profile.enabled = True
1838-
if disk_driver_version:
1839-
profile.version = disk_driver_version
18401825
elif disable_disk_driver:
18411826
msg = (
18421827
"Please make sure there are no existing PVs and PVCs "

0 commit comments

Comments
 (0)