Skip to content

Commit 3f91119

Browse files
irenezhong2861irenezhong2861
authored
{AKS} az aks mesh: update test files to reflect istio lts support (#31810)
1 parent bce85bb commit 3f91119

6 files changed

+160
-53
lines changed

‎src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_azure_service_mesh_canary_upgrade.yaml‎

Lines changed: 40 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,24 @@ interactions:
2222
,\n \"name\": \"istio\",\n \"type\": \"Microsoft.ContainerService/locations/meshRevisionProfiles\"\
2323
,\n \"properties\": {\n \"meshRevisions\": [\n {\n \"revision\"\
2424
: \"asm-1-20\",\n \"upgrades\": [\n \"asm-1-21\"\n ],\n \
25-
\ \"compatibleWith\": [\n {\n \"name\": \"kubernetes\",\n\
25+
\ \"compatibleWith\": [\n {\n \"name\": \"KubernetesOfficial\",\n\
2626
\ \"versions\": [\n \"1.25\",\n \"1.26\",\n \
27-
\ \"1.27\",\n \"1.28\",\n \"1.29\"\n ]\n }\n\
27+
\ \"1.27\",\n \"1.28\",\n \"1.29\"\n ]\n },\n\
28+
\ {\n \"name\": \"AKSLongTermSupport\",\n \"versions\": [\n\
29+
\ \"1.25\",\n \"1.26\",\n \"1.27\",\n \"1.28\",\n\
30+
\ \"1.29\"\n ]\n }\n\
2831
\ ]\n },\n {\n \"revision\": \"asm-1-21\",\n \"upgrades\"\
2932
: [\n \"asm-1-22\"\n ],\n \"compatibleWith\": [\n {\n\
30-
\ \"name\": \"kubernetes\",\n \"versions\": [\n \"1.26\"\
33+
\ \"name\": \"KubernetesOfficial\",\n \"versions\": [\n \"1.26\"\
34+
,\n \"1.27\",\n \"1.28\",\n \"1.29\",\n \"\
35+
1.30\"\n ]\n },\n {\n\
36+
\ \"name\": \"AKSLongTermSupport\",\n \"versions\": [\n \"1.26\"\
3137
,\n \"1.27\",\n \"1.28\",\n \"1.29\",\n \"\
3238
1.30\"\n ]\n }\n ]\n },\n {\n \"revision\"\
3339
: \"asm-1-22\",\n \"compatibleWith\": [\n {\n \"name\":\
34-
\ \"kubernetes\",\n \"versions\": [\n \"1.27\",\n \"\
40+
\ \"KubernetesOfficial\",\n \"versions\": [\n \"1.27\",\n \"\
41+
1.28\",\n \"1.29\",\n \"1.30\"\n ]\n },\n {\n \"name\":\
42+
\ \"AKSLongTermSupport\",\n \"versions\": [\n \"1.27\",\n \"\
3543
1.28\",\n \"1.29\",\n \"1.30\"\n ]\n }\n \
3644
\ ]\n }\n ]\n }\n }\n ]\n}"
3745
headers:
@@ -890,7 +898,10 @@ interactions:
890898
,\n \"name\": \"istio\",\n \"type\": \"Microsoft.ContainerService/managedClusters/meshUpgradeProfiles\"\
891899
,\n \"properties\": {\n \"revision\": \"asm-1-20\",\n \"upgrades\"\
892900
: [\n \"asm-1-21\"\n ],\n \"compatibleWith\": [\n {\n \"\
893-
name\": \"kubernetes\",\n \"versions\": [\n \"1.25\",\n \"\
901+
name\": \"KubernetesOfficial\",\n \"versions\": [\n \"1.25\",\n \"\
902+
1.26\",\n \"1.27\",\n \"1.28\",\n \"1.29\"\n ]\n \
903+
\ },\n {\n \"\
904+
name\": \"AKSLongTermSupport\",\n \"versions\": [\n \"1.25\",\n \"\
894905
1.26\",\n \"1.27\",\n \"1.28\",\n \"1.29\"\n ]\n \
895906
\ }\n ]\n }\n }\n ]\n}"
896907
headers:
@@ -1616,16 +1627,24 @@ interactions:
16161627
,\n \"name\": \"istio\",\n \"type\": \"Microsoft.ContainerService/locations/meshRevisionProfiles\"\
16171628
,\n \"properties\": {\n \"meshRevisions\": [\n {\n \"revision\"\
16181629
: \"asm-1-20\",\n \"upgrades\": [\n \"asm-1-21\"\n ],\n \
1619-
\ \"compatibleWith\": [\n {\n \"name\": \"kubernetes\",\n\
1630+
\ \"compatibleWith\": [\n {\n \"name\": \"KubernetesOfficial\",\n\
16201631
\ \"versions\": [\n \"1.25\",\n \"1.26\",\n \
1621-
\ \"1.27\",\n \"1.28\",\n \"1.29\"\n ]\n }\n\
1632+
\ \"1.27\",\n \"1.28\",\n \"1.29\"\n ]\n },\n\
1633+
\ {\n \"name\": \"AKSLongTermSupport\",\n \"versions\": [\n\
1634+
\ \"1.25\",\n \"1.26\",\n \"1.27\",\n \"1.28\",\n\
1635+
\ \"1.29\"\n ]\n }\n\
16221636
\ ]\n },\n {\n \"revision\": \"asm-1-21\",\n \"upgrades\"\
16231637
: [\n \"asm-1-22\"\n ],\n \"compatibleWith\": [\n {\n\
1624-
\ \"name\": \"kubernetes\",\n \"versions\": [\n \"1.26\"\
1638+
\ \"name\": \"KubernetesOfficial\",\n \"versions\": [\n \"1.26\"\
1639+
,\n \"1.27\",\n \"1.28\",\n \"1.29\",\n \"\
1640+
1.30\"\n ]\n },\n {\n\
1641+
\ \"name\": \"AKSLongTermSupport\",\n \"versions\": [\n \"1.26\"\
16251642
,\n \"1.27\",\n \"1.28\",\n \"1.29\",\n \"\
16261643
1.30\"\n ]\n }\n ]\n },\n {\n \"revision\"\
16271644
: \"asm-1-22\",\n \"compatibleWith\": [\n {\n \"name\":\
1628-
\ \"kubernetes\",\n \"versions\": [\n \"1.27\",\n \"\
1645+
\ \"KubernetesOfficial\",\n \"versions\": [\n \"1.27\",\n \"\
1646+
1.28\",\n \"1.29\",\n \"1.30\"\n ]\n },\n {\n \"name\":\
1647+
\ \"AKSLongTermSupport\",\n \"versions\": [\n \"1.27\",\n \"\
16291648
1.28\",\n \"1.29\",\n \"1.30\"\n ]\n }\n \
16301649
\ ]\n }\n ]\n }\n }\n ]\n}"
16311650
headers:
@@ -2765,16 +2784,24 @@ interactions:
27652784
,\n \"name\": \"istio\",\n \"type\": \"Microsoft.ContainerService/locations/meshRevisionProfiles\"\
27662785
,\n \"properties\": {\n \"meshRevisions\": [\n {\n \"revision\"\
27672786
: \"asm-1-20\",\n \"upgrades\": [\n \"asm-1-21\"\n ],\n \
2768-
\ \"compatibleWith\": [\n {\n \"name\": \"kubernetes\",\n\
2787+
\ \"compatibleWith\": [\n {\n \"name\": \"KubernetesOfficial\",\n\
27692788
\ \"versions\": [\n \"1.25\",\n \"1.26\",\n \
2770-
\ \"1.27\",\n \"1.28\",\n \"1.29\"\n ]\n }\n\
2789+
\ \"1.27\",\n \"1.28\",\n \"1.29\"\n ]\n },\n\
2790+
\ {\n \"name\": \"AKSLongTermSupport\",\n \"versions\": [\n\
2791+
\ \"1.25\",\n \"1.26\",\n \"1.27\",\n \"1.28\",\n\
2792+
\ \"1.29\"\n ]\n }\n\
27712793
\ ]\n },\n {\n \"revision\": \"asm-1-21\",\n \"upgrades\"\
27722794
: [\n \"asm-1-22\"\n ],\n \"compatibleWith\": [\n {\n\
2773-
\ \"name\": \"kubernetes\",\n \"versions\": [\n \"1.26\"\
2795+
\ \"name\": \"KubernetesOfficial\",\n \"versions\": [\n \"1.26\"\
2796+
,\n \"1.27\",\n \"1.28\",\n \"1.29\",\n \"\
2797+
1.30\"\n ]\n },\n {\n\
2798+
\ \"name\": \"AKSLongTermSupport\",\n \"versions\": [\n \"1.26\"\
27742799
,\n \"1.27\",\n \"1.28\",\n \"1.29\",\n \"\
27752800
1.30\"\n ]\n }\n ]\n },\n {\n \"revision\"\
27762801
: \"asm-1-22\",\n \"compatibleWith\": [\n {\n \"name\":\
2777-
\ \"kubernetes\",\n \"versions\": [\n \"1.27\",\n \"\
2802+
\ \"KubernetesOfficial\",\n \"versions\": [\n \"1.27\",\n \"\
2803+
1.28\",\n \"1.29\",\n \"1.30\"\n ]\n },\n {\n \"name\":\
2804+
\ \"AKSLongTermSupport\",\n \"versions\": [\n \"1.27\",\n \"\
27782805
1.28\",\n \"1.29\",\n \"1.30\"\n ]\n }\n \
27792806
\ ]\n }\n ]\n }\n }\n ]\n}"
27802807
headers:

‎src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_azure_service_mesh_enable_disable.yaml‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,24 @@ interactions:
2222
,\n \"name\": \"istio\",\n \"type\": \"Microsoft.ContainerService/locations/meshRevisionProfiles\"\
2323
,\n \"properties\": {\n \"meshRevisions\": [\n {\n \"revision\"\
2424
: \"asm-1-20\",\n \"upgrades\": [\n \"asm-1-21\"\n ],\n \
25-
\ \"compatibleWith\": [\n {\n \"name\": \"kubernetes\",\n\
25+
\ \"compatibleWith\": [\n {\n \"name\": \"KubernetesOfficial\",\n\
2626
\ \"versions\": [\n \"1.25\",\n \"1.26\",\n \
27-
\ \"1.27\",\n \"1.28\",\n \"1.29\"\n ]\n }\n\
27+
\ \"1.27\",\n \"1.28\",\n \"1.29\"\n ]\n },\n\
28+
\ {\n \"name\": \"AKSLongTermSupport\",\n \"versions\": [\n\
29+
\ \"1.25\",\n \"1.26\",\n \"1.27\",\n \"1.28\",\n\
30+
\ \"1.29\"\n ]\n }\n\
2831
\ ]\n },\n {\n \"revision\": \"asm-1-21\",\n \"upgrades\"\
2932
: [\n \"asm-1-22\"\n ],\n \"compatibleWith\": [\n {\n\
30-
\ \"name\": \"kubernetes\",\n \"versions\": [\n \"1.26\"\
33+
\ \"name\": \"KubernetesOfficial\",\n \"versions\": [\n \"1.26\"\
34+
,\n \"1.27\",\n \"1.28\",\n \"1.29\",\n \"\
35+
1.30\"\n ]\n },\n {\n\
36+
\ \"name\": \"AKSLongTermSupport\",\n \"versions\": [\n \"1.26\"\
3137
,\n \"1.27\",\n \"1.28\",\n \"1.29\",\n \"\
3238
1.30\"\n ]\n }\n ]\n },\n {\n \"revision\"\
3339
: \"asm-1-22\",\n \"compatibleWith\": [\n {\n \"name\":\
34-
\ \"kubernetes\",\n \"versions\": [\n \"1.27\",\n \"\
40+
\ \"KubernetesOfficial\",\n \"versions\": [\n \"1.27\",\n \"\
41+
1.28\",\n \"1.29\",\n \"1.30\"\n ]\n },\n {\n \"name\":\
42+
\ \"AKSLongTermSupport\",\n \"versions\": [\n \"1.27\",\n \"\
3543
1.28\",\n \"1.29\",\n \"1.30\"\n ]\n }\n \
3644
\ ]\n }\n ]\n }\n }\n ]\n}"
3745
headers:
@@ -918,16 +926,24 @@ interactions:
918926
,\n \"name\": \"istio\",\n \"type\": \"Microsoft.ContainerService/locations/meshRevisionProfiles\"\
919927
,\n \"properties\": {\n \"meshRevisions\": [\n {\n \"revision\"\
920928
: \"asm-1-20\",\n \"upgrades\": [\n \"asm-1-21\"\n ],\n \
921-
\ \"compatibleWith\": [\n {\n \"name\": \"kubernetes\",\n\
929+
\ \"compatibleWith\": [\n {\n \"name\": \"KubernetesOfficial\",\n\
922930
\ \"versions\": [\n \"1.25\",\n \"1.26\",\n \
923-
\ \"1.27\",\n \"1.28\",\n \"1.29\"\n ]\n }\n\
931+
\ \"1.27\",\n \"1.28\",\n \"1.29\"\n ]\n },\n\
932+
\ {\n \"name\": \"AKSLongTermSupport\",\n \"versions\": [\n\
933+
\ \"1.25\",\n \"1.26\",\n \"1.27\",\n \"1.28\",\n\
934+
\ \"1.29\"\n ]\n }\n\
924935
\ ]\n },\n {\n \"revision\": \"asm-1-21\",\n \"upgrades\"\
925936
: [\n \"asm-1-22\"\n ],\n \"compatibleWith\": [\n {\n\
926-
\ \"name\": \"kubernetes\",\n \"versions\": [\n \"1.26\"\
937+
\ \"name\": \"KubernetesOfficial\",\n \"versions\": [\n \"1.26\"\
938+
,\n \"1.27\",\n \"1.28\",\n \"1.29\",\n \"\
939+
1.30\"\n ]\n },\n {\n\
940+
\ \"name\": \"AKSLongTermSupport\",\n \"versions\": [\n \"1.26\"\
927941
,\n \"1.27\",\n \"1.28\",\n \"1.29\",\n \"\
928942
1.30\"\n ]\n }\n ]\n },\n {\n \"revision\"\
929943
: \"asm-1-22\",\n \"compatibleWith\": [\n {\n \"name\":\
930-
\ \"kubernetes\",\n \"versions\": [\n \"1.27\",\n \"\
944+
\ \"KubernetesOfficial\",\n \"versions\": [\n \"1.27\",\n \"\
945+
1.28\",\n \"1.29\",\n \"1.30\"\n ]\n },\n {\n \"name\":\
946+
\ \"AKSLongTermSupport\",\n \"versions\": [\n \"1.27\",\n \"\
931947
1.28\",\n \"1.29\",\n \"1.30\"\n ]\n }\n \
932948
\ ]\n }\n ]\n }\n }\n ]\n}"
933949
headers:

‎src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_azure_service_mesh_get_revisions.yaml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,24 @@ interactions:
2222
,\n \"name\": \"istio\",\n \"type\": \"Microsoft.ContainerService/locations/meshRevisionProfiles\"\
2323
,\n \"properties\": {\n \"meshRevisions\": [\n {\n \"revision\"\
2424
: \"asm-1-20\",\n \"upgrades\": [\n \"asm-1-21\"\n ],\n \
25-
\ \"compatibleWith\": [\n {\n \"name\": \"kubernetes\",\n\
25+
\ \"compatibleWith\": [\n {\n \"name\": \"KubernetesOfficial\",\n\
2626
\ \"versions\": [\n \"1.25\",\n \"1.26\",\n \
27-
\ \"1.27\",\n \"1.28\",\n \"1.29\"\n ]\n }\n\
27+
\ \"1.27\",\n \"1.28\",\n \"1.29\"\n ]\n },\n\
28+
\ {\n \"name\": \"AKSLongTermSupport\",\n \"versions\": [\n\
29+
\ \"1.25\",\n \"1.26\",\n \"1.27\",\n \"1.28\",\n\
30+
\ \"1.29\"\n ]\n }\n\
2831
\ ]\n },\n {\n \"revision\": \"asm-1-21\",\n \"upgrades\"\
2932
: [\n \"asm-1-22\"\n ],\n \"compatibleWith\": [\n {\n\
30-
\ \"name\": \"kubernetes\",\n \"versions\": [\n \"1.26\"\
33+
\ \"name\": \"KubernetesOfficial\",\n \"versions\": [\n \"1.26\"\
34+
,\n \"1.27\",\n \"1.28\",\n \"1.29\",\n \"\
35+
1.30\"\n ]\n },\n {\n\
36+
\ \"name\": \"AKSLongTermSupport\",\n \"versions\": [\n \"1.26\"\
3137
,\n \"1.27\",\n \"1.28\",\n \"1.29\",\n \"\
3238
1.30\"\n ]\n }\n ]\n },\n {\n \"revision\"\
3339
: \"asm-1-22\",\n \"compatibleWith\": [\n {\n \"name\":\
34-
\ \"kubernetes\",\n \"versions\": [\n \"1.27\",\n \"\
40+
\ \"KubernetesOfficial\",\n \"versions\": [\n \"1.27\",\n \"\
41+
1.28\",\n \"1.29\",\n \"1.30\"\n ]\n },\n {\n \"name\":\
42+
\ \"AKSLongTermSupport\",\n \"versions\": [\n \"1.27\",\n \"\
3543
1.28\",\n \"1.29\",\n \"1.30\"\n ]\n }\n \
3644
\ ]\n }\n ]\n }\n }\n ]\n}"
3745
headers:

‎src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_azure_service_mesh_get_upgrades.yaml‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,24 @@ interactions:
2222
,\n \"name\": \"istio\",\n \"type\": \"Microsoft.ContainerService/locations/meshRevisionProfiles\"\
2323
,\n \"properties\": {\n \"meshRevisions\": [\n {\n \"revision\"\
2424
: \"asm-1-20\",\n \"upgrades\": [\n \"asm-1-21\"\n ],\n \
25-
\ \"compatibleWith\": [\n {\n \"name\": \"kubernetes\",\n\
25+
\ \"compatibleWith\": [\n {\n \"name\": \"KubernetesOfficial\",\n\
2626
\ \"versions\": [\n \"1.25\",\n \"1.26\",\n \
27-
\ \"1.27\",\n \"1.28\",\n \"1.29\"\n ]\n }\n\
27+
\ \"1.27\",\n \"1.28\",\n \"1.29\"\n ]\n },\n\
28+
\ {\n \"name\": \"AKSLongTermSupport\",\n \"versions\": [\n\
29+
\ \"1.25\",\n \"1.26\",\n \"1.27\",\n \"1.28\",\n\
30+
\ \"1.29\"\n ]\n }\n\
2831
\ ]\n },\n {\n \"revision\": \"asm-1-21\",\n \"upgrades\"\
2932
: [\n \"asm-1-22\"\n ],\n \"compatibleWith\": [\n {\n\
30-
\ \"name\": \"kubernetes\",\n \"versions\": [\n \"1.26\"\
33+
\ \"name\": \"KubernetesOfficial\",\n \"versions\": [\n \"1.26\"\
34+
,\n \"1.27\",\n \"1.28\",\n \"1.29\",\n \"\
35+
1.30\"\n ]\n },\n {\n\
36+
\ \"name\": \"AKSLongTermSupport\",\n \"versions\": [\n \"1.26\"\
3137
,\n \"1.27\",\n \"1.28\",\n \"1.29\",\n \"\
3238
1.30\"\n ]\n }\n ]\n },\n {\n \"revision\"\
3339
: \"asm-1-22\",\n \"compatibleWith\": [\n {\n \"name\":\
34-
\ \"kubernetes\",\n \"versions\": [\n \"1.27\",\n \"\
40+
\ \"KubernetesOfficial\",\n \"versions\": [\n \"1.27\",\n \"\
41+
1.28\",\n \"1.29\",\n \"1.30\"\n ]\n },\n {\n \"name\":\
42+
\ \"AKSLongTermSupport\",\n \"versions\": [\n \"1.27\",\n \"\
3543
1.28\",\n \"1.29\",\n \"1.30\"\n ]\n }\n \
3644
\ ]\n }\n ]\n }\n }\n ]\n}"
3745
headers:
@@ -1008,16 +1016,24 @@ interactions:
10081016
,\n \"name\": \"istio\",\n \"type\": \"Microsoft.ContainerService/locations/meshRevisionProfiles\"\
10091017
,\n \"properties\": {\n \"meshRevisions\": [\n {\n \"revision\"\
10101018
: \"asm-1-20\",\n \"upgrades\": [\n \"asm-1-21\"\n ],\n \
1011-
\ \"compatibleWith\": [\n {\n \"name\": \"kubernetes\",\n\
1019+
\ \"compatibleWith\": [\n {\n \"name\": \"KubernetesOfficial\",\n\
10121020
\ \"versions\": [\n \"1.25\",\n \"1.26\",\n \
1013-
\ \"1.27\",\n \"1.28\",\n \"1.29\"\n ]\n }\n\
1021+
\ \"1.27\",\n \"1.28\",\n \"1.29\"\n ]\n },\n\
1022+
\ {\n \"name\": \"AKSLongTermSupport\",\n \"versions\": [\n\
1023+
\ \"1.25\",\n \"1.26\",\n \"1.27\",\n \"1.28\",\n\
1024+
\ \"1.29\"\n ]\n }\n\
10141025
\ ]\n },\n {\n \"revision\": \"asm-1-21\",\n \"upgrades\"\
10151026
: [\n \"asm-1-22\"\n ],\n \"compatibleWith\": [\n {\n\
1016-
\ \"name\": \"kubernetes\",\n \"versions\": [\n \"1.26\"\
1027+
\ \"name\": \"KubernetesOfficial\",\n \"versions\": [\n \"1.26\"\
1028+
,\n \"1.27\",\n \"1.28\",\n \"1.29\",\n \"\
1029+
1.30\"\n ]\n },\n {\n\
1030+
\ \"name\": \"AKSLongTermSupport\",\n \"versions\": [\n \"1.26\"\
10171031
,\n \"1.27\",\n \"1.28\",\n \"1.29\",\n \"\
10181032
1.30\"\n ]\n }\n ]\n },\n {\n \"revision\"\
10191033
: \"asm-1-22\",\n \"compatibleWith\": [\n {\n \"name\":\
1020-
\ \"kubernetes\",\n \"versions\": [\n \"1.27\",\n \"\
1034+
\ \"KubernetesOfficial\",\n \"versions\": [\n \"1.27\",\n \"\
1035+
1.28\",\n \"1.29\",\n \"1.30\"\n ]\n },\n {\n \"name\":\
1036+
\ \"AKSLongTermSupport\",\n \"versions\": [\n \"1.27\",\n \"\
10211037
1.28\",\n \"1.29\",\n \"1.30\"\n ]\n }\n \
10221038
\ ]\n }\n ]\n }\n }\n ]\n}"
10231039
headers:

0 commit comments

Comments
 (0)