Skip to content

Commit 8558e0f

Browse files
[AutoRelease] t2-containerservice-2025-08-20-99056(can only be merged by SDK owner) (#42602)
* code and test * update changelog --------- Co-authored-by: azure-sdk <PythonSdkPipelines> Co-authored-by: ChenxiJiang333 <[email protected]>
1 parent 947a9b3 commit 8558e0f

File tree

157 files changed

+696
-323
lines changed

Some content is hidden

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

157 files changed

+696
-323
lines changed

sdk/containerservice/azure-mgmt-containerservice/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Release History
22

3+
## 39.1.0 (2025-08-20)
4+
5+
### Features Added
6+
7+
- Model `ManagedCluster` added property `kind`
8+
- Enum `ManagedClusterSKUName` added member `AUTOMATIC`
9+
- Enum `OSSKU` added member `AZURE_LINUX3`
10+
311
## 39.0.0 (2025-07-21)
412

513
### Features Added
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "05cfd9ee0ccb1825b042a0da182944d9630cfc55",
2+
"commit": "ca2020cf5a4953c007f54135db73652bb94dd408",
33
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
44
"autorest": "3.10.2",
55
"use": [
6-
"@autorest/python@6.35.0",
6+
"@autorest/python@6.38.2",
77
"@autorest/[email protected]"
88
],
9-
"autorest_command": "autorest specification/containerservice/resource-manager/Microsoft.ContainerService/aks/readme.md --generate-sample=True --generate-test=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.35.0 --use=@autorest/[email protected] --version=3.10.2 --version-tolerant=False",
9+
"autorest_command": "autorest specification/containerservice/resource-manager/Microsoft.ContainerService/aks/readme.md --generate-sample=True --generate-test=True --include-x-ms-examples-original-file=True --keep-setup-py=True --python --python-sdks-folder=/mnt/vss/_work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.38.2 --use=@autorest/[email protected] --version=3.10.2 --version-tolerant=False",
1010
"readme": "specification/containerservice/resource-manager/Microsoft.ContainerService/aks/readme.md"
1111
}

sdk/containerservice/azure-mgmt-containerservice/apiview-properties.json

Lines changed: 343 additions & 0 deletions
Large diffs are not rendered by default.

sdk/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/_configuration.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ class ContainerServiceClientConfiguration: # pylint: disable=too-many-instance-
2727
:type credential: ~azure.core.credentials.TokenCredential
2828
:param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
2929
:type subscription_id: str
30-
:keyword api_version: Api Version. Default value is "2025-05-01". Note that overriding this
30+
:keyword api_version: Api Version. Default value is "2025-07-01". Note that overriding this
3131
default value may result in unsupported behavior.
3232
:paramtype api_version: str
3333
"""
3434

3535
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
36-
api_version: str = kwargs.pop("api_version", "2025-05-01")
36+
api_version: str = kwargs.pop("api_version", "2025-07-01")
3737

3838
if credential is None:
3939
raise ValueError("Parameter 'credential' must not be None.")

sdk/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/_container_service_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class ContainerServiceClient: # pylint: disable=too-many-instance-attributes
7575
:type subscription_id: str
7676
:param base_url: Service URL. Default value is None.
7777
:type base_url: str
78-
:keyword api_version: Api Version. Default value is "2025-05-01". Note that overriding this
78+
:keyword api_version: Api Version. Default value is "2025-07-01". Note that overriding this
7979
default value may result in unsupported behavior.
8080
:paramtype api_version: str
8181
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no

sdk/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# license information.
66
# --------------------------------------------------------------------------
77

8-
VERSION = "39.0.0"
8+
VERSION = "39.1.0"

sdk/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/aio/_configuration.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ class ContainerServiceClientConfiguration: # pylint: disable=too-many-instance-
2727
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
2828
:param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
2929
:type subscription_id: str
30-
:keyword api_version: Api Version. Default value is "2025-05-01". Note that overriding this
30+
:keyword api_version: Api Version. Default value is "2025-07-01". Note that overriding this
3131
default value may result in unsupported behavior.
3232
:paramtype api_version: str
3333
"""
3434

3535
def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
36-
api_version: str = kwargs.pop("api_version", "2025-05-01")
36+
api_version: str = kwargs.pop("api_version", "2025-07-01")
3737

3838
if credential is None:
3939
raise ValueError("Parameter 'credential' must not be None.")

sdk/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/aio/_container_service_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class ContainerServiceClient: # pylint: disable=too-many-instance-attributes
7575
:type subscription_id: str
7676
:param base_url: Service URL. Default value is None.
7777
:type base_url: str
78-
:keyword api_version: Api Version. Default value is "2025-05-01". Note that overriding this
78+
:keyword api_version: Api Version. Default value is "2025-07-01". Note that overriding this
7979
default value may result in unsupported behavior.
8080
:paramtype api_version: str
8181
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no

sdk/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/models/_container_service_client_enums.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,10 @@ class ManagedClusterSKUName(str, Enum, metaclass=CaseInsensitiveEnumMeta):
237237

238238
BASE = "Base"
239239
"""Base option for the AKS control plane."""
240+
AUTOMATIC = "Automatic"
241+
"""Automatic clusters are optimized to run most production workloads with configuration that
242+
follows AKS best practices and recommendations for cluster and workload setup, scalability, and
243+
security. For more details about Automatic clusters see aka.ms/aks/automatic."""
240244

241245

242246
class ManagedClusterSKUTier(str, Enum, metaclass=CaseInsensitiveEnumMeta):
@@ -428,6 +432,11 @@ class OSSKU(str, Enum, metaclass=CaseInsensitiveEnumMeta):
428432
AZURE_LINUX = "AzureLinux"
429433
"""Use AzureLinux as the OS for node images. Azure Linux is a container-optimized Linux distro
430434
built by Microsoft, visit https://aka.ms/azurelinux for more information."""
435+
AZURE_LINUX3 = "AzureLinux3"
436+
"""Use AzureLinux3 as the OS for node images. Azure Linux is a container-optimized Linux distro
437+
built by Microsoft, visit https://aka.ms/azurelinux for more information. For limitations,
438+
visit https://aka.ms/aks/node-images. For OS migration guidance, see
439+
https://aka.ms/aks/upgrade-os-version."""
431440
CBL_MARINER = "CBLMariner"
432441
"""Deprecated OSSKU. Microsoft recommends that new deployments choose 'AzureLinux' instead."""
433442
WINDOWS2019 = "Windows2019"
@@ -438,7 +447,7 @@ class OSSKU(str, Enum, metaclass=CaseInsensitiveEnumMeta):
438447
supports Windows2022 containers; it cannot run Windows2019 containers and vice versa."""
439448
UBUNTU2204 = "Ubuntu2204"
440449
"""Use Ubuntu2204 as the OS for node images, however, Ubuntu 22.04 may not be supported for all
441-
nodepools. For limitations and supported kubernetes versions, see see
450+
nodepools. For limitations and supported kubernetes versions, see
442451
https://aka.ms/aks/supported-ubuntu-versions"""
443452

444453

sdk/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/models/_models_py3.py

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ class AgentPool(SubResource):
246246
:vartype os_type: str or ~azure.mgmt.containerservice.models.OSType
247247
:ivar os_sku: Specifies the OS SKU used by the agent pool. The default is Ubuntu if OSType is
248248
Linux. The default is Windows2019 when Kubernetes <= 1.24 or Windows2022 when Kubernetes >=
249-
1.25 if OSType is Windows. Known values are: "Ubuntu", "AzureLinux", "CBLMariner",
250-
"Windows2019", "Windows2022", and "Ubuntu2204".
249+
1.25 if OSType is Windows. Known values are: "Ubuntu", "AzureLinux", "AzureLinux3",
250+
"CBLMariner", "Windows2019", "Windows2022", and "Ubuntu2204".
251251
:vartype os_sku: str or ~azure.mgmt.containerservice.models.OSSKU
252252
:ivar max_count: The maximum number of nodes for auto-scaling.
253253
:vartype max_count: int
@@ -563,8 +563,8 @@ def __init__( # pylint: disable=too-many-locals
563563
:paramtype os_type: str or ~azure.mgmt.containerservice.models.OSType
564564
:keyword os_sku: Specifies the OS SKU used by the agent pool. The default is Ubuntu if OSType
565565
is Linux. The default is Windows2019 when Kubernetes <= 1.24 or Windows2022 when Kubernetes >=
566-
1.25 if OSType is Windows. Known values are: "Ubuntu", "AzureLinux", "CBLMariner",
567-
"Windows2019", "Windows2022", and "Ubuntu2204".
566+
1.25 if OSType is Windows. Known values are: "Ubuntu", "AzureLinux", "AzureLinux3",
567+
"CBLMariner", "Windows2019", "Windows2022", and "Ubuntu2204".
568568
:paramtype os_sku: str or ~azure.mgmt.containerservice.models.OSSKU
569569
:keyword max_count: The maximum number of nodes for auto-scaling.
570570
:paramtype max_count: int
@@ -3127,6 +3127,9 @@ class ManagedCluster(TrackedResource):
31273127
:vartype extended_location: ~azure.mgmt.containerservice.models.ExtendedLocation
31283128
:ivar identity: The identity of the managed cluster, if configured.
31293129
:vartype identity: ~azure.mgmt.containerservice.models.ManagedClusterIdentity
3130+
:ivar kind: This is primarily used to expose different UI experiences in the portal for
3131+
different kinds.
3132+
:vartype kind: str
31303133
:ivar provisioning_state: The current provisioning state.
31313134
:vartype provisioning_state: str
31323135
:ivar power_state: The Power State of the cluster.
@@ -3292,6 +3295,7 @@ class ManagedCluster(TrackedResource):
32923295
"sku": {"key": "sku", "type": "ManagedClusterSKU"},
32933296
"extended_location": {"key": "extendedLocation", "type": "ExtendedLocation"},
32943297
"identity": {"key": "identity", "type": "ManagedClusterIdentity"},
3298+
"kind": {"key": "kind", "type": "str"},
32953299
"provisioning_state": {"key": "properties.provisioningState", "type": "str"},
32963300
"power_state": {"key": "properties.powerState", "type": "PowerState"},
32973301
"max_agent_pools": {"key": "properties.maxAgentPools", "type": "int"},
@@ -3368,6 +3372,7 @@ def __init__( # pylint: disable=too-many-locals
33683372
sku: Optional["_models.ManagedClusterSKU"] = None,
33693373
extended_location: Optional["_models.ExtendedLocation"] = None,
33703374
identity: Optional["_models.ManagedClusterIdentity"] = None,
3375+
kind: Optional[str] = None,
33713376
kubernetes_version: Optional[str] = None,
33723377
dns_prefix: Optional[str] = None,
33733378
fqdn_subdomain: Optional[str] = None,
@@ -3418,6 +3423,9 @@ def __init__( # pylint: disable=too-many-locals
34183423
:paramtype extended_location: ~azure.mgmt.containerservice.models.ExtendedLocation
34193424
:keyword identity: The identity of the managed cluster, if configured.
34203425
:paramtype identity: ~azure.mgmt.containerservice.models.ManagedClusterIdentity
3426+
:keyword kind: This is primarily used to expose different UI experiences in the portal for
3427+
different kinds.
3428+
:paramtype kind: str
34213429
:keyword kubernetes_version: The version of Kubernetes specified by the user. Both patch
34223430
version <major.minor.patch> (e.g. 1.20.13) and <major.minor> (e.g. 1.20) are supported. When
34233431
<major.minor> is specified, the latest supported GA patch version is chosen automatically.
@@ -3541,6 +3549,7 @@ def __init__( # pylint: disable=too-many-locals
35413549
self.sku = sku
35423550
self.extended_location = extended_location
35433551
self.identity = identity
3552+
self.kind = kind
35443553
self.provisioning_state: Optional[str] = None
35453554
self.power_state: Optional["_models.PowerState"] = None
35463555
self.max_agent_pools: Optional[int] = None
@@ -3882,8 +3891,8 @@ class ManagedClusterAgentPoolProfileProperties(_serialization.Model):
38823891
:vartype os_type: str or ~azure.mgmt.containerservice.models.OSType
38833892
:ivar os_sku: Specifies the OS SKU used by the agent pool. The default is Ubuntu if OSType is
38843893
Linux. The default is Windows2019 when Kubernetes <= 1.24 or Windows2022 when Kubernetes >=
3885-
1.25 if OSType is Windows. Known values are: "Ubuntu", "AzureLinux", "CBLMariner",
3886-
"Windows2019", "Windows2022", and "Ubuntu2204".
3894+
1.25 if OSType is Windows. Known values are: "Ubuntu", "AzureLinux", "AzureLinux3",
3895+
"CBLMariner", "Windows2019", "Windows2022", and "Ubuntu2204".
38873896
:vartype os_sku: str or ~azure.mgmt.containerservice.models.OSSKU
38883897
:ivar max_count: The maximum number of nodes for auto-scaling.
38893898
:vartype max_count: int
@@ -4190,8 +4199,8 @@ def __init__( # pylint: disable=too-many-locals
41904199
:paramtype os_type: str or ~azure.mgmt.containerservice.models.OSType
41914200
:keyword os_sku: Specifies the OS SKU used by the agent pool. The default is Ubuntu if OSType
41924201
is Linux. The default is Windows2019 when Kubernetes <= 1.24 or Windows2022 when Kubernetes >=
4193-
1.25 if OSType is Windows. Known values are: "Ubuntu", "AzureLinux", "CBLMariner",
4194-
"Windows2019", "Windows2022", and "Ubuntu2204".
4202+
1.25 if OSType is Windows. Known values are: "Ubuntu", "AzureLinux", "AzureLinux3",
4203+
"CBLMariner", "Windows2019", "Windows2022", and "Ubuntu2204".
41954204
:paramtype os_sku: str or ~azure.mgmt.containerservice.models.OSSKU
41964205
:keyword max_count: The maximum number of nodes for auto-scaling.
41974206
:paramtype max_count: int
@@ -4438,8 +4447,8 @@ class ManagedClusterAgentPoolProfile(ManagedClusterAgentPoolProfileProperties):
44384447
:vartype os_type: str or ~azure.mgmt.containerservice.models.OSType
44394448
:ivar os_sku: Specifies the OS SKU used by the agent pool. The default is Ubuntu if OSType is
44404449
Linux. The default is Windows2019 when Kubernetes <= 1.24 or Windows2022 when Kubernetes >=
4441-
1.25 if OSType is Windows. Known values are: "Ubuntu", "AzureLinux", "CBLMariner",
4442-
"Windows2019", "Windows2022", and "Ubuntu2204".
4450+
1.25 if OSType is Windows. Known values are: "Ubuntu", "AzureLinux", "AzureLinux3",
4451+
"CBLMariner", "Windows2019", "Windows2022", and "Ubuntu2204".
44434452
:vartype os_sku: str or ~azure.mgmt.containerservice.models.OSSKU
44444453
:ivar max_count: The maximum number of nodes for auto-scaling.
44454454
:vartype max_count: int
@@ -4752,8 +4761,8 @@ def __init__( # pylint: disable=too-many-locals
47524761
:paramtype os_type: str or ~azure.mgmt.containerservice.models.OSType
47534762
:keyword os_sku: Specifies the OS SKU used by the agent pool. The default is Ubuntu if OSType
47544763
is Linux. The default is Windows2019 when Kubernetes <= 1.24 or Windows2022 when Kubernetes >=
4755-
1.25 if OSType is Windows. Known values are: "Ubuntu", "AzureLinux", "CBLMariner",
4756-
"Windows2019", "Windows2022", and "Ubuntu2204".
4764+
1.25 if OSType is Windows. Known values are: "Ubuntu", "AzureLinux", "AzureLinux3",
4765+
"CBLMariner", "Windows2019", "Windows2022", and "Ubuntu2204".
47574766
:paramtype os_sku: str or ~azure.mgmt.containerservice.models.OSSKU
47584767
:keyword max_count: The maximum number of nodes for auto-scaling.
47594768
:paramtype max_count: int
@@ -6768,7 +6777,7 @@ def __init__(self, *, client_id: str, secret: Optional[str] = None, **kwargs: An
67686777
class ManagedClusterSKU(_serialization.Model):
67696778
"""The SKU of a Managed Cluster.
67706779
6771-
:ivar name: The name of a managed cluster SKU. "Base"
6780+
:ivar name: The name of a managed cluster SKU. Known values are: "Base" and "Automatic".
67726781
:vartype name: str or ~azure.mgmt.containerservice.models.ManagedClusterSKUName
67736782
:ivar tier: The tier of a managed cluster SKU. If not specified, the default is 'Free'. See
67746783
`AKS Pricing Tier <https://learn.microsoft.com/azure/aks/free-standard-pricing-tiers>`_ for
@@ -6789,7 +6798,7 @@ def __init__(
67896798
**kwargs: Any
67906799
) -> None:
67916800
"""
6792-
:keyword name: The name of a managed cluster SKU. "Base"
6801+
:keyword name: The name of a managed cluster SKU. Known values are: "Base" and "Automatic".
67936802
:paramtype name: str or ~azure.mgmt.containerservice.models.ManagedClusterSKUName
67946803
:keyword tier: The tier of a managed cluster SKU. If not specified, the default is 'Free'. See
67956804
`AKS Pricing Tier <https://learn.microsoft.com/azure/aks/free-standard-pricing-tiers>`_ for
@@ -8274,8 +8283,8 @@ class Snapshot(TrackedResource):
82748283
:vartype os_type: str or ~azure.mgmt.containerservice.models.OSType
82758284
:ivar os_sku: Specifies the OS SKU used by the agent pool. The default is Ubuntu if OSType is
82768285
Linux. The default is Windows2019 when Kubernetes <= 1.24 or Windows2022 when Kubernetes >=
8277-
1.25 if OSType is Windows. Known values are: "Ubuntu", "AzureLinux", "CBLMariner",
8278-
"Windows2019", "Windows2022", and "Ubuntu2204".
8286+
1.25 if OSType is Windows. Known values are: "Ubuntu", "AzureLinux", "AzureLinux3",
8287+
"CBLMariner", "Windows2019", "Windows2022", and "Ubuntu2204".
82798288
:vartype os_sku: str or ~azure.mgmt.containerservice.models.OSSKU
82808289
:ivar vm_size: The size of the VM.
82818290
:vartype vm_size: str

0 commit comments

Comments
 (0)