Skip to content

chore: remove disk driver version #9809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hccheng72 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chore: remove disk driver version #9809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0cd20e
chore: remove disk driver version
Apr 21, 2026
9746a78
chore: update release version
Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/aks-preview/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ Pending
+++++++
* `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`.

20.0.0b4
Copy link
Copy Markdown
Member

@FumingZhang FumingZhang Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a breaking change, please update the major version to 21, for example, use a version number such as 21.0.0b1.

Copy link
Copy Markdown
Member

@FumingZhang FumingZhang Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @hccheng72

+++++++
* `az aks create/update`: Remove `--disk-driver-version` option for AzureDisk CSI Driver.

20.0.0b3
++++++
* Vendor new SDK and bump API version to 2026-02-02-preview.
Expand Down
4 changes: 0 additions & 4 deletions src/aks-preview/azext_aks_preview/_consts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,6 @@
CONST_NETWORK_POD_IP_ALLOCATION_MODE_DYNAMIC_INDIVIDUAL = "DynamicIndividual"
CONST_NETWORK_POD_IP_ALLOCATION_MODE_STATIC_BLOCK = "StaticBlock"

# disk driver versions
CONST_DISK_DRIVER_V1 = "v1"
CONST_DISK_DRIVER_V2 = "v2"

# consts for addons
# application load balancer (Application Gateway for Containers)
CONST_APPLICATION_LOAD_BALANCER_ADDON_NAME = "applicationLoadBalancer"
Expand Down
6 changes: 0 additions & 6 deletions src/aks-preview/azext_aks_preview/_help.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,9 +421,6 @@
- name: --disable-disk-driver
type: bool
short-summary: Disable AzureDisk CSI Driver.
- name: --disk-driver-version
type: string
short-summary: Specify AzureDisk CSI Driver version.
- name: --disable-file-driver
type: bool
short-summary: Disable AzureFile CSI Driver.
Expand Down Expand Up @@ -1116,9 +1113,6 @@
long-summary: |
Network dataplane used in the Kubernetes cluster.
Specify "azure" to use the Azure dataplane (default) or "cilium" to enable Cilium dataplane.
- name: --disk-driver-version
type: string
short-summary: Specify AzureDisk CSI Driver version.
- name: --disable-disk-driver
type: bool
short-summary: Disable AzureDisk CSI Driver.
Expand Down
6 changes: 1 addition & 5 deletions src/aks-preview/azext_aks_preview/_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@
CONST_CREDENTIAL_FORMAT_AZURE,
CONST_CREDENTIAL_FORMAT_EXEC,
CONST_DAILY_MAINTENANCE_SCHEDULE,
CONST_DISK_DRIVER_V1,
CONST_DISK_DRIVER_V2,

CONST_GPU_DRIVER_INSTALL,
CONST_GPU_DRIVER_NONE,
CONST_GPU_INSTANCE_PROFILE_MIG1_G,
Expand Down Expand Up @@ -378,7 +377,6 @@
CONST_ACNS_DATAPATH_ACCELERATION_MODE_BPFVETH,
]
network_dataplanes = [CONST_NETWORK_DATAPLANE_AZURE, CONST_NETWORK_DATAPLANE_CILIUM]
disk_driver_versions = [CONST_DISK_DRIVER_V1, CONST_DISK_DRIVER_V2]
outbound_types = [
CONST_OUTBOUND_TYPE_LOAD_BALANCER,
CONST_OUTBOUND_TYPE_USER_DEFINED_ROUTING,
Expand Down Expand Up @@ -766,7 +764,6 @@ def load_arguments(self, _):
c.argument("k8s_support_plan", arg_type=get_enum_type(k8s_support_plans))
c.argument("enable_defender", action="store_true")
c.argument("defender_config", validator=validate_defender_config_parameter)
c.argument("disk_driver_version", arg_type=get_enum_type(disk_driver_versions))
c.argument("disable_disk_driver", action="store_true")
c.argument("disable_file_driver", action="store_true")
c.argument("enable_blob_driver", action="store_true")
Expand Down Expand Up @@ -1410,7 +1407,6 @@ def load_arguments(self, _):
c.argument("enable_defender", action="store_true")
c.argument("defender_config", validator=validate_defender_config_parameter)
c.argument("enable_disk_driver", action="store_true")
c.argument("disk_driver_version", arg_type=get_enum_type(disk_driver_versions))
c.argument("disable_disk_driver", action="store_true")
c.argument("enable_file_driver", action="store_true")
c.argument("disable_file_driver", action="store_true")
Expand Down
2 changes: 0 additions & 2 deletions src/aks-preview/azext_aks_preview/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,7 +1008,6 @@ def aks_create(
nrg_lockdown_restriction_level=None,
enable_defender=False,
defender_config=None,
disk_driver_version=None,
disable_disk_driver=False,
disable_file_driver=False,
enable_blob_driver=None,
Expand Down Expand Up @@ -1275,7 +1274,6 @@ def aks_update(
disable_defender=False,
defender_config=None,
enable_disk_driver=False,
disk_driver_version=None,
disable_disk_driver=False,
enable_file_driver=False,
disable_file_driver=False,
Expand Down
17 changes: 1 addition & 16 deletions src/aks-preview/azext_aks_preview/managed_cluster_decorator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1802,9 +1802,8 @@ def get_disk_driver(self) -> Optional[ManagedClusterStorageProfileDiskCSIDriver]
"""
enable_disk_driver = self.raw_param.get("enable_disk_driver")
disable_disk_driver = self.raw_param.get("disable_disk_driver")
disk_driver_version = self.raw_param.get("disk_driver_version")

if not enable_disk_driver and not disable_disk_driver and not disk_driver_version:
if not enable_disk_driver and not disable_disk_driver:
return None
profile = self.models.ManagedClusterStorageProfileDiskCSIDriver() # pylint: disable=no-member

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

if disable_disk_driver and disk_driver_version:
raise ArgumentUsageError(
"The parameter --disable-disk-driver cannot be used "
"when --disk-driver-version is specified.")

if self.decorator_mode == DecoratorMode.UPDATE and disk_driver_version and not enable_disk_driver:
raise ArgumentUsageError(
"Parameter --enable-disk-driver is required "
"when --disk-driver-version is specified during update.")

if self.decorator_mode == DecoratorMode.CREATE:
if disable_disk_driver:
profile.enabled = False
else:
profile.enabled = True
if disk_driver_version:
profile.version = disk_driver_version

if self.decorator_mode == DecoratorMode.UPDATE:
if enable_disk_driver:
profile.enabled = True
if disk_driver_version:
profile.version = disk_driver_version
elif disable_disk_driver:
msg = (
"Please make sure there are no existing PVs and PVCs "
Expand Down
Loading
Loading