Skip to content

Commit 3041f6a

Browse files
FumingZhangFumingZhang
authored
Merge branch 'main' into juanbe/feature-localdns-none-input-handling
2 parents 56f1932 + dfd42d4 commit 3041f6a

File tree

626 files changed

+39976
-54776
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

626 files changed

+39976
-54776
lines changed

‎src/aks-agent/HISTORY.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ To release a new version, please select a new version number (usually plus 1 to
1212
Pending
1313
+++++++
1414

15+
1.0.0b4
16+
+++++++
17+
* Fix the --aks-mcp flag to allow true/false values.
18+
* Bump aks-mcp version to v0.0.9
19+
1520
1.0.0b3
1621
+++++++
1722
* Disable aks-mcp by default, offer --aks-mcp flag to enable it.

‎src/aks-agent/azext_aks_agent/_consts.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
CONST_MCP_BINARY_NAME = "aks-mcp"
1414
CONST_MCP_DEFAULT_PORT = 8003
1515
CONST_MCP_DEFAULT_URL = "http://localhost:8003/sse"
16-
CONST_MCP_MIN_VERSION = "0.0.7"
16+
CONST_MCP_MIN_VERSION = "0.0.9"
1717
CONST_MCP_GITHUB_REPO = "Azure/aks-mcp"
1818
CONST_MCP_BINARY_DIR = "bin"

‎src/aks-agent/azext_aks_agent/_params.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,7 @@ def load_arguments(self, _):
9090
"use_aks_mcp",
9191
options_list=["--aks-mcp"],
9292
default=False,
93-
arg_type=get_three_state_flag(
94-
positive_label="Enable AKS MCP integration",
95-
negative_label="Disable AKS MCP integration",
96-
),
93+
arg_type=get_three_state_flag(),
9794
help=(
9895
"Enable AKS MCP integration for enhanced capabilities. "
9996
"Traditional mode is the default. Use --aks-mcp to enable MCP mode, or "

‎src/aks-agent/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
from setuptools import find_packages, setup
1111

12-
VERSION = "1.0.0b3"
12+
VERSION = "1.0.0b4"
1313

1414
CLASSIFIERS = [
1515
"Development Status :: 4 - Beta",

‎src/aks-preview/HISTORY.rst‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,16 @@ To release a new version, please select a new version number (usually plus 1 to
1111

1212
Pending
1313
+++++++
14+
* Fix `--localdns-config` parameter to handle null values in JSON configuration files gracefully, preventing crashes when DNS override sections are null.
1415

1516
18.0.0b40
1617
++++++
17-
* Fix `--localdns-config` parameter to handle null values in JSON configuration files gracefully, preventing crashes when DNS override sections are null.
18+
* Add option `Windows2025` to `--os-sku` for `az aks nodepool add`.
19+
* `az aks create`: Add new parameter `--container-storage-version` to enable the given version of Azure Container Storage.
20+
* `az aks update`: Add new parameter `--container-storage-version` to enable the given version of Azure Container Storage.
21+
* `az aks create`: Change behavior of `--enable-azure-container-storage` to enable latest Azure Container Storage by default.
22+
* `az aks update`: Change behavior of `--enable-azure-container-storage` to enable latest Azure Container Storage by default.
23+
* `az aks update`: Change behavior of `--disable-azure-container-storage` to handle disable based on the installed version.
1824

1925
18.0.0b39
2026
+++++++

‎src/aks-preview/azext_aks_preview/_consts.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
CONST_OS_SKU_MARINER = "Mariner"
3737
CONST_OS_SKU_WINDOWS2019 = "Windows2019"
3838
CONST_OS_SKU_WINDOWS2022 = "Windows2022"
39+
CONST_OS_SKU_WINDOWS2025 = "Windows2025"
3940
CONST_OS_SKU_WINDOWSANNUAL = "WindowsAnnual"
4041
CONST_OS_SKU_AZURELINUX = "AzureLinux"
4142
CONST_OS_SKU_AZURELINUX3 = "AzureLinux3"

‎src/aks-preview/azext_aks_preview/_help.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1928,7 +1928,7 @@
19281928
short-summary: The OS Type. Linux or Windows. Windows not supported yet for "VirtualMachines" VM set type.
19291929
- name: --os-sku
19301930
type: string
1931-
short-summary: The os-sku of the agent node pool. Ubuntu, Ubuntu2204, Ubuntu2404, CBLMariner, AzureLinux, AzureLinux3, AzureLinuxOSGuard, or AzureLinux3OSGuard when os-type is Linux, default is Ubuntu if not set; Windows2019, Windows2022 or WindowsAnnual when os-type is Windows, the current default is Windows2022 if not set.
1931+
short-summary: The os-sku of the agent node pool. Ubuntu, Ubuntu2204, Ubuntu2404, CBLMariner, AzureLinux， AzureLinux3, AzureLinuxOSGuard, or AzureLinux3OSGuard when os-type is Linux, default is Ubuntu if not set; Windows2019, Windows2022, Windows2025, or WindowsAnnual when os-type is Windows, the current default is Windows2022 if not set.
19321932
- name: --enable-fips-image
19331933
type: bool
19341934
short-summary: Use FIPS-enabled OS on agent nodes.

‎src/aks-preview/azext_aks_preview/_params.py‎

Lines changed: 93 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102
CONST_OS_SKU_UBUNTU2404,
103103
CONST_OS_SKU_WINDOWS2019,
104104
CONST_OS_SKU_WINDOWS2022,
105+
CONST_OS_SKU_WINDOWS2025,
105106
CONST_OS_SKU_WINDOWSANNUAL,
106107
CONST_PATCH_UPGRADE_CHANNEL,
107108
CONST_RAPID_UPGRADE_CHANNEL,
@@ -287,9 +288,10 @@
287288
CONST_OS_SKU_AZURELINUXOSGUARD,
288289
CONST_OS_SKU_AZURELINUX3OSGUARD,
289290
]
290-
node_os_skus = node_os_skus_create + [
291+
node_os_skus_add = node_os_skus_create + [
291292
CONST_OS_SKU_WINDOWS2019,
292293
CONST_OS_SKU_WINDOWS2022,
294+
CONST_OS_SKU_WINDOWS2025,
293295
CONST_OS_SKU_WINDOWSANNUAL,
294296
]
295297
node_os_skus_update = [
@@ -439,6 +441,12 @@
439441
]
440442

441443
# azure container storage
444+
# azure container storage
445+
container_storage_versions = [
446+
"1",
447+
"2"
448+
]
449+
442450
storage_pool_types = [
443451
CONST_STORAGE_POOL_TYPE_AZURE_DISK,
444452
CONST_STORAGE_POOL_TYPE_EPHEMERAL_DISK,
@@ -1026,8 +1034,14 @@ def load_arguments(self, _):
10261034
# azure container storage
10271035
c.argument(
10281036
"enable_azure_container_storage",
1029-
arg_type=get_enum_type(storage_pool_types),
1030-
help="enable azure container storage and define storage pool type",
1037+
arg_type=_get_enable_azure_container_storage_type(),
1038+
help="enable azure container storage. Can be used as a flag (defaults to True) or with a"
1039+
" storage pool type value: (azureDisk, ephemeralDisk, elasticSan)",
1040+
)
1041+
c.argument(
1042+
"container_storage_version",
1043+
arg_type=get_enum_type(container_storage_versions),
1044+
help="set azure container storage version, the latest version will be installed by default",
10311045
)
10321046
c.argument(
10331047
"storage_pool_name",
@@ -1486,13 +1500,21 @@ def load_arguments(self, _):
14861500
# azure container storage
14871501
c.argument(
14881502
"enable_azure_container_storage",
1489-
arg_type=get_enum_type(storage_pool_types),
1490-
help="enable azure container storage and define storage pool type",
1503+
arg_type=_get_enable_azure_container_storage_type(),
1504+
help="enable azure container storage. Can be used as a flag (defaults to True) or with a"
1505+
" storage pool type value: (azureDisk, ephemeralDisk, elasticSan)",
14911506
)
14921507
c.argument(
14931508
"disable_azure_container_storage",
1494-
arg_type=get_enum_type(disable_storage_pool_types),
1495-
help="disable azure container storage or any one of the storage pool types",
1509+
arg_type=_get_disable_azure_container_storage_type(),
1510+
help="disable azure container storage or any one of the storage pool types."
1511+
" Can be used as a flag (defaults to True) or with a storagepool type value:"
1512+
" azureDisk, ephemeralDisk, elasticSan, all (to disable all storage pools).",
1513+
)
1514+
c.argument(
1515+
"container_storage_version",
1516+
arg_type=get_enum_type(container_storage_versions),
1517+
help="set azure container storage version, the latest version will be installed by default",
14961518
)
14971519
c.argument(
14981520
"storage_pool_name",
@@ -1675,7 +1697,7 @@ def load_arguments(self, _):
16751697
)
16761698
c.argument("os_type")
16771699
c.argument(
1678-
"os_sku", arg_type=get_enum_type(node_os_skus), validator=validate_os_sku
1700+
"os_sku", arg_type=get_enum_type(node_os_skus_add), validator=validate_os_sku
16791701
)
16801702
c.argument("snapshot_id", validator=validate_snapshot_id)
16811703
c.argument("vnet_subnet_id", validator=validate_vnet_subnet_id)
@@ -2026,7 +2048,7 @@ def load_arguments(self, _):
20262048
"machine_name", help="The machine name."
20272049
)
20282050
c.argument(
2029-
"os_sku", arg_type=get_enum_type(node_os_skus), validator=validate_os_sku
2051+
"os_sku", arg_type=get_enum_type(node_os_skus_add), validator=validate_os_sku
20302052
)
20312053
c.argument(
20322054
"zones",
@@ -2920,3 +2942,65 @@ def _get_default_install_location(exe_name):
29202942
else:
29212943
install_location = None
29222944
return install_location
2945+
2946+
2947+
def _get_enable_azure_container_storage_type():
2948+
"""Custom argument type that accepts both None and enum values"""
2949+
import argparse
2950+
from azure.cli.core.azclierror import InvalidArgumentValueError
2951+
2952+
class AzureContainerStorageAction(argparse.Action):
2953+
def __call__(self, parser, namespace, values, option_string=None):
2954+
if values is None:
2955+
# When used as a flag without value, set as True
2956+
setattr(namespace, self.dest, True)
2957+
return
2958+
2959+
if isinstance(values, str):
2960+
# Handle enum values (case insensitive)
2961+
for storage_type in storage_pool_types:
2962+
if values.lower() == storage_type.lower():
2963+
setattr(namespace, self.dest, storage_type)
2964+
return
2965+
2966+
# Invalid value
2967+
valid_values = storage_pool_types
2968+
raise InvalidArgumentValueError(
2969+
f"Invalid value '{values}'. Valid values are: {', '.join(valid_values)}"
2970+
)
2971+
2972+
return CLIArgumentType(
2973+
nargs='?', # Optional argument
2974+
action=AzureContainerStorageAction,
2975+
)
2976+
2977+
2978+
def _get_disable_azure_container_storage_type():
2979+
"""Custom argument type that accepts both None and enum values"""
2980+
import argparse
2981+
from azure.cli.core.azclierror import InvalidArgumentValueError
2982+
2983+
class AzureContainerStorageAction(argparse.Action):
2984+
def __call__(self, parser, namespace, values, option_string=None):
2985+
if values is None:
2986+
# When used as a flag without value, set as True
2987+
setattr(namespace, self.dest, True)
2988+
return
2989+
2990+
if isinstance(values, str):
2991+
# Handle enum values (case insensitive)
2992+
for storage_type in disable_storage_pool_types:
2993+
if values.lower() == storage_type.lower():
2994+
setattr(namespace, self.dest, storage_type)
2995+
return
2996+
2997+
# Invalid value
2998+
valid_values = disable_storage_pool_types
2999+
raise InvalidArgumentValueError(
3000+
f"Invalid value '{values}'. Valid values are: {', '.join(valid_values)}"
3001+
)
3002+
3003+
return CLIArgumentType(
3004+
nargs='?', # Optional argument
3005+
action=AzureContainerStorageAction,
3006+
)

‎src/aks-preview/azext_aks_preview/azurecontainerstorage/_consts.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,17 @@
66
CONST_ACSTOR_ALL = "all"
77
CONST_ACSTOR_IO_ENGINE_LABEL_KEY = "acstor.azure.com/io-engine"
88
CONST_ACSTOR_IO_ENGINE_LABEL_VAL = "acstor"
9-
CONST_ACSTOR_K8S_EXTENSION_NAME = "microsoft.azurecontainerstorage"
9+
CONST_ACSTOR_V1_K8S_EXTENSION_NAME = "microsoft.azurecontainerstorage"
10+
CONST_ACSTOR_V1_EXT_INSTALLATION_NAME = "azurecontainerstorage"
11+
CONST_ACSTOR_VERSION_V1 = "1"
1012
CONST_DISK_TYPE_EPHEMERAL_VOLUME_ONLY = "EphemeralVolumeOnly"
1113
CONST_DISK_TYPE_PV_WITH_ANNOTATION = "PersistentVolumeWithAnnotation"
1214
CONST_EPHEMERAL_NVME_PERF_TIER_BASIC = "Basic"
1315
CONST_EPHEMERAL_NVME_PERF_TIER_PREMIUM = "Premium"
1416
CONST_EPHEMERAL_NVME_PERF_TIER_STANDARD = "Standard"
15-
CONST_EXT_INSTALLATION_NAME = "azurecontainerstorage"
17+
CONST_ACSTOR_EXT_INSTALLATION_NAME = "acstor"
18+
CONST_ACSTOR_EXT_INSTALLATION_NAMESPACE = "kube-system"
19+
CONST_ACSTOR_K8S_EXTENSION_NAME = "microsoft.azurecontainerstoragev2"
1620
CONST_K8S_EXTENSION_CLIENT_FACTORY_MOD_NAME = "azext_k8s_extension._client_factory"
1721
CONST_K8S_EXTENSION_CUSTOM_MOD_NAME = "azext_k8s_extension.custom"
1822
CONST_K8S_EXTENSION_NAME = "k8s-extension"

‎src/aks-preview/azext_aks_preview/azurecontainerstorage/_helpers.py‎

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@
88
from azext_aks_preview.azurecontainerstorage._consts import (
99
CONST_ACSTOR_ALL,
1010
CONST_ACSTOR_IO_ENGINE_LABEL_KEY,
11-
CONST_ACSTOR_K8S_EXTENSION_NAME,
1211
CONST_DISK_TYPE_EPHEMERAL_VOLUME_ONLY,
1312
CONST_DISK_TYPE_PV_WITH_ANNOTATION,
1413
CONST_EPHEMERAL_NVME_PERF_TIER_BASIC,
1514
CONST_EPHEMERAL_NVME_PERF_TIER_PREMIUM,
1615
CONST_EPHEMERAL_NVME_PERF_TIER_STANDARD,
17-
CONST_EXT_INSTALLATION_NAME,
1816
CONST_K8S_EXTENSION_CLIENT_FACTORY_MOD_NAME,
1917
CONST_K8S_EXTENSION_CUSTOM_MOD_NAME,
2018
CONST_K8S_EXTENSION_NAME,
@@ -23,13 +21,15 @@
2321
CONST_STORAGE_POOL_TYPE_AZURE_DISK,
2422
CONST_STORAGE_POOL_TYPE_ELASTIC_SAN,
2523
CONST_STORAGE_POOL_TYPE_EPHEMERAL_DISK,
24+
CONST_ACSTOR_V1_K8S_EXTENSION_NAME,
25+
CONST_ACSTOR_V1_EXT_INSTALLATION_NAME,
2626
)
2727
from azure.cli.command_modules.acs._roleassignments import (
2828
add_role_assignment,
2929
build_role_scope,
3030
delete_role_assignments,
3131
)
32-
from azure.cli.core.azclierror import UnknownError
32+
from azure.cli.core.azclierror import ResourceNotFoundError, UnknownError
3333
from knack.log import get_logger
3434

3535
logger = get_logger(__name__)
@@ -133,12 +133,12 @@ def check_if_extension_is_installed(cmd, resource_group, cluster_name) -> bool:
133133
client,
134134
resource_group,
135135
cluster_name,
136-
CONST_EXT_INSTALLATION_NAME,
136+
CONST_ACSTOR_V1_EXT_INSTALLATION_NAME,
137137
"managedClusters",
138138
)
139139

140140
extension_type = extension.extension_type.lower()
141-
if extension_type != CONST_ACSTOR_K8S_EXTENSION_NAME:
141+
if extension_type != CONST_ACSTOR_V1_K8S_EXTENSION_NAME:
142142
return_val = False
143143
except: # pylint: disable=bare-except
144144
return_val = False
@@ -177,11 +177,11 @@ def get_extension_installed_and_cluster_configs(
177177
client,
178178
resource_group,
179179
cluster_name,
180-
CONST_EXT_INSTALLATION_NAME,
180+
CONST_ACSTOR_V1_EXT_INSTALLATION_NAME,
181181
"managedClusters",
182182
)
183183

184-
is_extension_installed = extension.extension_type.lower() == CONST_ACSTOR_K8S_EXTENSION_NAME
184+
is_extension_installed = extension.extension_type.lower() == CONST_ACSTOR_V1_K8S_EXTENSION_NAME
185185
config_settings = extension.configuration_settings
186186

187187
if is_extension_installed and config_settings is not None:
@@ -252,6 +252,35 @@ def get_extension_installed_and_cluster_configs(
252252
)
253253

254254

255+
def get_container_storage_extension_installed(
256+
cmd,
257+
resource_group,
258+
cluster_name,
259+
extension_name,
260+
) -> Tuple[bool, str]:
261+
262+
client_factory = get_k8s_extension_module(CONST_K8S_EXTENSION_CLIENT_FACTORY_MOD_NAME)
263+
client = client_factory.cf_k8s_extension_operation(cmd.cli_ctx)
264+
k8s_extension_custom_mod = get_k8s_extension_module(CONST_K8S_EXTENSION_CUSTOM_MOD_NAME)
265+
is_extension_installed = False
266+
extension_version = ""
267+
268+
try:
269+
extension = k8s_extension_custom_mod.show_k8s_extension(
270+
client,
271+
resource_group,
272+
cluster_name,
273+
extension_name,
274+
"managedClusters",
275+
)
276+
is_extension_installed = True
277+
extension_version = extension.current_version
278+
except ResourceNotFoundError:
279+
# Extension not found, which is expected if not installed.
280+
is_extension_installed = False
281+
return is_extension_installed, extension_version
282+
283+
255284
def get_initial_resource_value_args(
256285
storage_pool_type,
257286
storage_pool_option,

0 commit comments

Comments
 (0)