Skip to content

Commit 718c878

Browse files
FumingZhangFumingZhang
authored
{AKS} Vendor new SDK and bump API version to 2025-04-02-preview (#8837)
1 parent 22a6ce5 commit 718c878

263 files changed

Lines changed: 4888 additions & 5970 deletions

File tree

Some content is hidden

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

‎src/aks-preview/HISTORY.rst‎

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

15+
18.0.0b11
16+
+++++++
17+
* Vendor new SDK and bump API version to 2025-04-02-preview.
18+
1519
18.0.0b10
1620
+++++++
1721
* Wrap the ARG call in the managed namespace list command

‎src/aks-preview/README.rst‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,9 @@ Released version and adopted API version
197197
* - 14.0.0b4 ~ 18.0.0b1
198198
- 2025-02-02-preview
199199
-
200-
* - 18.0.0b2 ~ latest
200+
* - 18.0.0b2 ~ 18.0.0b10
201+
- 2025-03-02-preview
202+
-
203+
* - 18.0.0b11 ~ latest
201204
- 2025-03-02-preview
202205
-

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def register_aks_preview_resource_type():
1616
register_resource_type(
1717
"latest",
1818
CUSTOM_MGMT_AKS_PREVIEW,
19-
SDKProfile("2025-03-02-preview", {"container_services": "2017-07-01"}),
19+
SDKProfile("2025-04-02-preview", {"container_services": "2017-07-01"}),
2020
)
2121

2222

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,11 @@ def load_arguments(self, _):
934934
help="The deployment safeguards version",
935935
is_preview=True,
936936
)
937-
c.argument("safeguards_excluded_ns", type=str, is_preview=True)
937+
c.argument(
938+
"safeguards_excluded_ns",
939+
type=str,
940+
is_preview=True
941+
)
938942
# azure monitor profile
939943
c.argument(
940944
"enable_azuremonitormetrics",
@@ -1345,8 +1349,15 @@ def load_arguments(self, _):
13451349
arg_type=get_enum_type(safeguards_levels),
13461350
is_preview=True,
13471351
)
1348-
c.argument("safeguards_version", help="The deployment safeguards version", is_preview=True)
1349-
c.argument("safeguards_excluded_ns", is_preview=True)
1352+
c.argument(
1353+
"safeguards_version",
1354+
help="The deployment safeguards version",
1355+
is_preview=True
1356+
)
1357+
c.argument(
1358+
"safeguards_excluded_ns",
1359+
is_preview=True
1360+
)
13501361
c.argument(
13511362
"enable_acns",
13521363
action="store_true",

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

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
check_is_azure_cli_core_editable_installed,
4949
check_is_private_cluster,
5050
get_cluster_snapshot_by_snapshot_id,
51-
setup_common_safeguards_profile,
5251
filter_hard_taints,
5352
)
5453
from azext_aks_preview._loadbalancer import create_load_balancer_profile
@@ -3433,14 +3432,6 @@ def set_up_auto_upgrade_profile(self, mc: ManagedCluster) -> ManagedCluster:
34333432
mc.auto_upgrade_profile.node_os_upgrade_channel = node_os_upgrade_channel
34343433
return mc
34353434

3436-
def set_up_safeguards_profile(self, mc: ManagedCluster) -> ManagedCluster:
3437-
excludedNamespaces = self.context.get_safeguards_excluded_namespaces()
3438-
version = self.context.get_safeguards_version()
3439-
level = self.context.get_safeguards_level()
3440-
# provided any value?
3441-
mc = setup_common_safeguards_profile(level, version, excludedNamespaces, mc, self.models)
3442-
return mc
3443-
34443435
def set_up_azure_service_mesh_profile(self, mc: ManagedCluster) -> ManagedCluster:
34453436
"""Set up azure service mesh for the ManagedCluster object.
34463437
@@ -3629,8 +3620,6 @@ def construct_mc_profile_preview(self, bypass_restore_defaults: bool = False) ->
36293620
mc = self.set_up_node_resource_group_profile(mc)
36303621
# set up auto upgrade profile
36313622
mc = self.set_up_auto_upgrade_profile(mc)
3632-
# set up safeguards profile
3633-
mc = self.set_up_safeguards_profile(mc)
36343623
# set up azure service mesh profile
36353624
mc = self.set_up_azure_service_mesh_profile(mc)
36363625
# setup k8s support plan
@@ -4889,26 +4878,6 @@ def update_auto_upgrade_profile(self, mc: ManagedCluster) -> ManagedCluster:
48894878
mc.auto_upgrade_profile.node_os_upgrade_channel = node_os_upgrade_channel
48904879
return mc
48914880

4892-
def update_safeguards_profile(self, mc: ManagedCluster) -> ManagedCluster:
4893-
"""Update safeguards profile for the ManagedCluster object
4894-
:return: the ManagedCluster object
4895-
"""
4896-
4897-
self._ensure_mc(mc)
4898-
4899-
excludedNamespaces = self.context.get_safeguards_excluded_namespaces()
4900-
version = self.context.get_safeguards_version()
4901-
level = self.context.get_safeguards_level()
4902-
4903-
mc = setup_common_safeguards_profile(level, version, excludedNamespaces, mc, self.models)
4904-
4905-
if level is not None:
4906-
mc.safeguards_profile.level = level
4907-
if version is not None:
4908-
mc.safeguards_profile.version = version
4909-
4910-
return mc
4911-
49124881
def update_azure_service_mesh_profile(self, mc: ManagedCluster) -> ManagedCluster:
49134882
"""Update azure service mesh profile for the ManagedCluster object.
49144883
"""
@@ -5395,8 +5364,6 @@ def update_mc_profile_preview(self) -> ManagedCluster:
53955364
mc = self.update_node_resource_group_profile(mc)
53965365
# update auto upgrade profile
53975366
mc = self.update_auto_upgrade_profile(mc)
5398-
# update safeguards_profile
5399-
mc = self.update_safeguards_profile(mc)
54005367
# update cluster upgrade settings profile
54015368
mc = self.update_upgrade_settings(mc)
54025369
# update nodepool taints

‎src/aks-preview/azext_aks_preview/tests/latest/recordings/test_aks_abort.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ interactions:
1616
- AZURECLI/2.53.0 azsdk-python-azure-mgmt-containerservice/28.0.0b Python/3.8.10
1717
(Linux-5.15.0-1051-azure-x86_64-with-glibc2.29)
1818
method: GET
19-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-03-02-preview
19+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-04-02-preview
2020
response:
2121
body:
2222
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.ContainerService/managedClusters/cliakstest000002''
@@ -119,7 +119,7 @@ interactions:
119119
- AZURECLI/2.53.0 azsdk-python-azure-mgmt-containerservice/28.0.0b Python/3.8.10
120120
(Linux-5.15.0-1051-azure-x86_64-with-glibc2.29)
121121
method: PUT
122-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-03-02-preview
122+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-04-02-preview
123123
response:
124124
body:
125125
string: "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002\",\n
@@ -211,7 +211,7 @@ interactions:
211211
- AZURECLI/2.53.0 azsdk-python-azure-mgmt-containerservice/28.0.0b Python/3.8.10
212212
(Linux-5.15.0-1051-azure-x86_64-with-glibc2.29)
213213
method: GET
214-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-03-02-preview
214+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-04-02-preview
215215
response:
216216
body:
217217
string: "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002\",\n
@@ -301,7 +301,7 @@ interactions:
301301
- AZURECLI/2.53.0 azsdk-python-azure-mgmt-containerservice/28.0.0b Python/3.8.10
302302
(Linux-5.15.0-1051-azure-x86_64-with-glibc2.29)
303303
method: POST
304-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedclusters/cliakstest000002/abort?api-version=2025-03-02-preview
304+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedclusters/cliakstest000002/abort?api-version=2025-04-02-preview
305305
response:
306306
body:
307307
string: "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002\",\n
@@ -529,7 +529,7 @@ interactions:
529529
- AZURECLI/2.53.0 azsdk-python-azure-mgmt-containerservice/28.0.0b Python/3.8.10
530530
(Linux-5.15.0-1051-azure-x86_64-with-glibc2.29)
531531
method: GET
532-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-03-02-preview
532+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-04-02-preview
533533
response:
534534
body:
535535
string: "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002\",\n

‎src/aks-preview/azext_aks_preview/tests/latest/recordings/test_aks_addon_disable_confcom_addon.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ interactions:
1616
- AZURECLI/2.53.0 azsdk-python-azure-mgmt-containerservice/28.0.0b Python/3.8.10
1717
(Linux-5.15.0-1051-azure-x86_64-with-glibc2.29)
1818
method: GET
19-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-03-02-preview
19+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-04-02-preview
2020
response:
2121
body:
2222
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.ContainerService/managedClusters/cliakstest000002''
@@ -120,7 +120,7 @@ interactions:
120120
- AZURECLI/2.53.0 azsdk-python-azure-mgmt-containerservice/28.0.0b Python/3.8.10
121121
(Linux-5.15.0-1051-azure-x86_64-with-glibc2.29)
122122
method: PUT
123-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-03-02-preview
123+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-04-02-preview
124124
response:
125125
body:
126126
string: "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002\",\n
@@ -905,7 +905,7 @@ interactions:
905905
- AZURECLI/2.53.0 azsdk-python-azure-mgmt-containerservice/28.0.0b Python/3.8.10
906906
(Linux-5.15.0-1051-azure-x86_64-with-glibc2.29)
907907
method: GET
908-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-03-02-preview
908+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-04-02-preview
909909
response:
910910
body:
911911
string: "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002\",\n
@@ -1004,7 +1004,7 @@ interactions:
10041004
- AZURECLI/2.53.0 azsdk-python-azure-mgmt-containerservice/28.0.0b Python/3.8.10
10051005
(Linux-5.15.0-1051-azure-x86_64-with-glibc2.29)
10061006
method: GET
1007-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-03-02-preview
1007+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-04-02-preview
10081008
response:
10091009
body:
10101010
string: "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002\",\n
@@ -1130,7 +1130,7 @@ interactions:
11301130
- AZURECLI/2.53.0 azsdk-python-azure-mgmt-containerservice/28.0.0b Python/3.8.10
11311131
(Linux-5.15.0-1051-azure-x86_64-with-glibc2.29)
11321132
method: PUT
1133-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-03-02-preview
1133+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-04-02-preview
11341134
response:
11351135
body:
11361136
string: "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002\",\n
@@ -2363,7 +2363,7 @@ interactions:
23632363
- AZURECLI/2.53.0 azsdk-python-azure-mgmt-containerservice/28.0.0b Python/3.8.10
23642364
(Linux-5.15.0-1051-azure-x86_64-with-glibc2.29)
23652365
method: GET
2366-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-03-02-preview
2366+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-04-02-preview
23672367
response:
23682368
body:
23692369
string: "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002\",\n

‎src/aks-preview/azext_aks_preview/tests/latest/recordings/test_aks_addon_disable_openservicemesh.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ interactions:
1616
- AZURECLI/2.53.0 azsdk-python-azure-mgmt-containerservice/28.0.0b Python/3.8.10
1717
(Linux-5.15.0-1051-azure-x86_64-with-glibc2.29)
1818
method: GET
19-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-03-02-preview
19+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-04-02-preview
2020
response:
2121
body:
2222
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.ContainerService/managedClusters/cliakstest000002''
@@ -121,7 +121,7 @@ interactions:
121121
- AZURECLI/2.53.0 azsdk-python-azure-mgmt-containerservice/28.0.0b Python/3.8.10
122122
(Linux-5.15.0-1051-azure-x86_64-with-glibc2.29)
123123
method: PUT
124-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-03-02-preview
124+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-04-02-preview
125125
response:
126126
body:
127127
string: "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002\",\n
@@ -594,7 +594,7 @@ interactions:
594594
- AZURECLI/2.53.0 azsdk-python-azure-mgmt-containerservice/28.0.0b Python/3.8.10
595595
(Linux-5.15.0-1051-azure-x86_64-with-glibc2.29)
596596
method: GET
597-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-03-02-preview
597+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-04-02-preview
598598
response:
599599
body:
600600
string: "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002\",\n
@@ -688,7 +688,7 @@ interactions:
688688
- AZURECLI/2.53.0 azsdk-python-azure-mgmt-containerservice/28.0.0b Python/3.8.10
689689
(Linux-5.15.0-1051-azure-x86_64-with-glibc2.29)
690690
method: GET
691-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-03-02-preview
691+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-04-02-preview
692692
response:
693693
body:
694694
string: "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002\",\n
@@ -813,7 +813,7 @@ interactions:
813813
- AZURECLI/2.53.0 azsdk-python-azure-mgmt-containerservice/28.0.0b Python/3.8.10
814814
(Linux-5.15.0-1051-azure-x86_64-with-glibc2.29)
815815
method: PUT
816-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-03-02-preview
816+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-04-02-preview
817817
response:
818818
body:
819819
string: "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002\",\n
@@ -1122,7 +1122,7 @@ interactions:
11221122
- AZURECLI/2.53.0 azsdk-python-azure-mgmt-containerservice/28.0.0b Python/3.8.10
11231123
(Linux-5.15.0-1051-azure-x86_64-with-glibc2.29)
11241124
method: GET
1125-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-03-02-preview
1125+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002?api-version=2025-04-02-preview
11261126
response:
11271127
body:
11281128
string: "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002\",\n

0 commit comments

Comments
 (0)