Skip to content

Commit 055522a

Browse files
authored
update (#8882)
1 parent 9870d7d commit 055522a

File tree

4 files changed

+10
-59
lines changed

4 files changed

+10
-59
lines changed

src/aks-preview/azcli_aks_live_test/configs/cli_matrix_default.json

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,11 @@
1212
"test_aks_create_enable_encryption"
1313
],
1414
"gpu, no quota": [
15-
"test_aks_nodepool_add_with_gpu_instance_profile"
16-
],
17-
"monitoring addon, missing namespace registration": [
18-
"test_aks_create_with_monitoring_aad_auth_msi",
19-
"test_aks_create_with_monitoring_aad_auth_uai",
20-
"test_aks_enable_monitoring_with_aad_auth_msi",
21-
"test_aks_enable_monitoring_with_aad_auth_uai"
22-
],
23-
"overlay migration, missing toggle": [
24-
"test_aks_azure_cni_overlay_migration"
25-
],
26-
"v2 monitoring addon, missing namespace registration": [
27-
"test_aks_create_with_azuremonitormetrics",
28-
"test_aks_update_with_azuremonitormetrics"
15+
"test_aks_nodepool_add_with_gpu_instance_profile",
16+
"test_aks_create_gpu_driver_flow"
2917
],
3018
"capacity reservation group, no permission": [
3119
"test_aks_create_with_crg_id"
32-
],
33-
"service mesh, missing feature registration for new resource type": [
34-
"test_aks_azure_service_mesh_get_revisions"
3520
]
3621
}
3722
}

src/aks-preview/azcli_aks_live_test/configs/ext_matrix_default.json

Lines changed: 4 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -24,53 +24,17 @@
2424
"test_aks_nodepool_add_with_gpu_instance_profile",
2525
"test_aks_gpu_driver_type"
2626
],
27-
"overlay migration, missing toggle": [
28-
"test_aks_azure_cni_overlay_migration"
29-
],
3027
"pod ip allocation mode static block, missing feature registration": [
3128
"test_aks_create_with_pod_ip_allocation_mode_static_block"
3229
],
33-
"slb to nat gateway": [
34-
"test_aks_update_outbound_from_slb_to_natgateway"
35-
],
36-
"v2 monitoring addon, missing namespace registration": [
37-
"test_aks_create_with_azuremonitormetrics",
38-
"test_aks_update_with_azuremonitormetrics"
39-
],
40-
"workload runtime, missing feature registration": [
30+
"[deprecated] workload runtime, missing feature registration": [
4131
"test_aks_nodepool_add_with_workload_runtime"
4232
],
43-
"artifact streaming, missing feature registration & toggle": [
44-
"test_aks_nodepool_add_with_artifact_streaming",
45-
"test_aks_nodepool_update_with_artifact_streaming"
46-
],
47-
"ai toolchain operator, enabled in staging only": [
48-
"test_aks_create_with_enable_ai_toolchain_operator",
49-
"test_aks_update_with_enable_ai_toolchain_operator"
50-
],
51-
"trusted launch, missing feature registration & toggle": [
52-
"test_aks_create_update_secure_boot_flow",
53-
"test_aks_create_update_vtpm_flow"
54-
],
55-
"nodepool permanent and initialization taints, missing feature registration": [
56-
"test_aks_create_cluster_with_taints"
57-
],
58-
"automatic, missing feature registration & toggle": [
33+
"automatic, no quota": [
5934
"test_aks_automatic_sku"
6035
],
61-
"windows annual, missing feature registration & toggle": [
62-
"test_aks_nodepool_add_with_ossku_windowsannual"
63-
],
64-
"mixed sku, enabled in staging only": [
65-
"test_vms_agentpool_type"
66-
],
67-
"fqdn policy, enabled in staging only": [
68-
"test_aks_update_enable_fqdn_policy",
69-
"test_aks_create_with_enable_fqdn_policy",
70-
"test_aks_create_with_enable_fqdn_policy_observability",
71-
"test_aks_create_with_enable_acns",
72-
"test_aks_create_with_enable_acns_complex",
73-
"test_aks_update_enable_acns"
36+
"maxBlockedNodes, missing feature registration & toggle": [
37+
"test_aks_nodepool_max_blocked_nodes"
7438
]
7539
}
7640
}

src/aks-preview/azcli_aks_live_test/scripts/setup_venv.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ setupAZ(){
4747
azdev setup -c "${cli_repo}" -r "${ext_repo}"
4848
fi
4949

50-
# fix the issue that vcrpy>=4.3.0 is not compatible with urllib3
51-
pip install vcrpy==4.2.1
50+
# need the fix in commit #69621c6 to adapt to the HTTPSHandler in urllib in python3.12
51+
pip install vcrpy==6.0.2
5252

5353
# fix the issue "Cannot import name 'AccessTokenInfo' from 'azure.core.credentials'"
5454
pip install azure-identity==1.17.1

src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -847,6 +847,7 @@ def test_aks_byo_subnet_with_ingress_appgw_addon(
847847
"aks create --resource-group={resource_group} --name={aks_name} --enable-managed-identity "
848848
"--vnet-subnet-id {vnet_id}/subnets/aks-subnet -a ingress-appgw "
849849
"--appgw-name gateway --appgw-subnet-id {vnet_id}/subnets/appgw-subnet "
850+
"--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AppGatewayWithOverlayPreview "
850851
"--yes --ssh-key-value={ssh_key_value} -o json"
851852
)
852853
aks_cluster = self.cmd(
@@ -967,6 +968,7 @@ def test_aks_byo_appgw_with_ingress_appgw_addon(
967968
"aks create -n {aks_name} -g {resource_group} --enable-managed-identity "
968969
"--vnet-subnet-id {vnet_id}/subnets/aks-subnet "
969970
"-a ingress-appgw --appgw-id {appgw_id} --yes "
971+
"--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AppGatewayWithOverlayPreview "
970972
"--ssh-key-value={ssh_key_value} -o json"
971973
)
972974
aks_cluster = self.cmd(

0 commit comments

Comments
 (0)