{AKS} az aks mesh: Revert #29096

This reverts commit 3abcc5f8b8.

src/azure-cli/azure/cli/command_modules/acs/_params.py

@@ -349,7 +349,8 @@ def load_arguments(self, _):
         c.argument('enable_vpa', action='store_true', help='enable vertical pod autoscaler for cluster')
         c.argument('enable_azure_service_mesh',
                    options_list=["--enable-azure-service-mesh", "--enable-asm"],
-                   action='store_true')
+                   action='store_true',
+                   is_preview=True)
         c.argument("revision", validator=validate_azure_service_mesh_revision)
         # addons
         c.argument('enable_addons', options_list=['--enable-addons', '-a'])

src/azure-cli/azure/cli/command_modules/acs/custom.py

@@ -65,7 +65,6 @@ from azure.cli.command_modules.acs._consts import (
     CONST_AZURE_SERVICE_MESH_UPGRADE_COMMAND_START,
     CONST_AZURE_SERVICE_MESH_UPGRADE_COMMAND_COMPLETE,
     CONST_AZURE_SERVICE_MESH_UPGRADE_COMMAND_ROLLBACK,
-    CONST_AZURE_SERVICE_MESH_MODE_ISTIO,
 )
 
 from azure.cli.command_modules.acs._helpers import get_snapshot_by_snapshot_id, check_is_private_link_cluster
@@ -2956,16 +2955,6 @@ def aks_mesh_upgrade_rollback(
         mesh_upgrade_command=CONST_AZURE_SERVICE_MESH_UPGRADE_COMMAND_ROLLBACK)
 
 
-def _aks_mesh_get_supported_revisions(
-        cmd,
-        client,
-        location):
-
-    revisions = aks_mesh_get_revisions(cmd, client, location)
-    supported_revisions = [r.revision for r in revisions.mesh_revisions]
-    return supported_revisions
-
-
 def _aks_mesh_update(
         cmd,
         client,
@@ -2999,28 +2988,6 @@ def _aks_mesh_update(
     try:
         mc = aks_update_decorator.fetch_mc()
         mc = aks_update_decorator.update_azure_service_mesh_profile(mc)
-
-        # check for unsupported asm revision once the smp in mc object has been updated
-        # skip the warning incase upgrade is in progress
-        service_mesh_profile = mc.service_mesh_profile
-        if (
-            service_mesh_profile and
-            service_mesh_profile.mode == CONST_AZURE_SERVICE_MESH_MODE_ISTIO and
-            service_mesh_profile.istio and
-            service_mesh_profile.istio.revisions and
-            len(service_mesh_profile.istio.revisions) == 1
-        ):
-            revision = service_mesh_profile.istio.revisions[0]
-            supported_revisions = _aks_mesh_get_supported_revisions(cmd, client, mc.location)
-            if revision not in supported_revisions:
-                msg = (
-                    f"Istio mesh revision {revision} currently in use in your cluster is no longer supported.\n"
-                    "Please upgrade for continued support. Use `az aks mesh get-upgrades` to check for available "
-                    "upgrades.\nMore information about mesh upgrades and version support can be found here:"
-                    " https://aka.ms/asm-aks-upgrade-docs"
-                )
-                logger.warning(msg)
-
     except DecoratorEarlyExitException:
         return None
 

src/azure-cli/azure/cli/command_modules/acs/managed_cluster_decorator.py

@@ -4369,14 +4369,6 @@ class AKSManagedClusterContext(BaseAKSContext):
         disable_ingress_gateway = self.raw_param.get("disable_ingress_gateway", False)
         ingress_gateway_type = self.raw_param.get("ingress_gateway_type", None)
 
-        # disallow disable ingress gateway on a cluser with no asm enabled
-        if disable_ingress_gateway:
-            if new_profile is None or new_profile.mode == CONST_AZURE_SERVICE_MESH_MODE_DISABLED:
-                raise ArgumentUsageError(
-                    "Istio has not been enabled for this cluster, please refer to https://aka.ms/asm-aks-addon-docs "
-                    "for more details on enabling Azure Service Mesh."
-                )
-
         if enable_ingress_gateway and disable_ingress_gateway:
             raise MutuallyExclusiveArgumentError(
                 "Cannot both enable and disable azure service mesh ingress gateway at the same time.",

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

@@ -1,35 +1,4 @@
 interactions:
-- request:
-    body: null
-    headers:
-      Accept:
-      - '*/*'
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      Metadata:
-      - 'true'
-      User-Agent:
-      - python/3.8.10 (Linux-6.5.0-1021-azure-x86_64-with-glibc2.29) msrest/0.7.1
-        msrest_azure/0.6.4
-    method: GET
-    uri: http://169.254.169.254/metadata/identity/oauth2/token?resource=https%3A%2F%2Fmanagement.core.windows.net%2F&api-version=2018-02-01&msi_res_id=%2Fsubscriptions%2F2b915285-1302-4a0f-8b54-f502a6b619a6%2FresourceGroups%2FInfrastructures%2Fproviders%2FMicrosoft.ManagedIdentity%2FuserAssignedIdentities%2Faksdevinfra1esagentpool
-  response:
-    body:
-      string: '{"access_token":"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6IkwxS2ZLRklfam5YYndXYzIyeFp4dzFzVUhIMCIsImtpZCI6IkwxS2ZLRklfam5YYndXYzIyeFp4dzFzVUhIMCJ9.eyJhdWQiOiJodHRwczovL21hbmFnZW1lbnQuY29yZS53aW5kb3dzLm5ldC8iLCJpc3MiOiJodHRwczovL3N0cy53aW5kb3dzLm5ldC83MmY5ODhiZi04NmYxLTQxYWYtOTFhYi0yZDdjZDAxMWRiNDcvIiwiaWF0IjoxNzE3NTQxNTA2LCJuYmYiOjE3MTc1NDE1MDYsImV4cCI6MTcxNzYyODIwNiwiYWlvIjoiRTJOZ1lNZzhHYmI4MDZlK3VLWFRhKy85c2Z1N0d3QT0iLCJhcHBpZCI6IjcwNWFjMDAwLWJmNjctNGVlZC05YmEwLTllZTcyM2RmMjgzYSIsImFwcGlkYWNyIjoiMiIsImlkcCI6Imh0dHBzOi8vc3RzLndpbmRvd3MubmV0LzcyZjk4OGJmLTg2ZjEtNDFhZi05MWFiLTJkN2NkMDExZGI0Ny8iLCJpZHR5cCI6ImFwcCIsIm9pZCI6IjVhZjA5YjVmLWFmOGYtNDkxMi1iOWZiLWRiNWMyMjdhZDgzNCIsInJoIjoiMC5BQm9BdjRqNWN2R0dyMEdScXkxODBCSGJSMFpJZjNrQXV0ZFB1a1Bhd2ZqMk1CTWFBQUEuIiwic3ViIjoiNWFmMDliNWYtYWY4Zi00OTEyLWI5ZmItZGI1YzIyN2FkODM0IiwidGlkIjoiNzJmOTg4YmYtODZmMS00MWFmLTkxYWItMmQ3Y2QwMTFkYjQ3IiwidXRpIjoiaDVacVE3Z2xrVVd2Mll4NGEyZ0RBZyIsInZlciI6IjEuMCIsInhtc19hel9yaWQiOiIvc3Vic2NyaXB0aW9ucy8yYjkxNTI4NS0xMzAyLTRhMGYtOGI1NC1mNTAyYTZiNjE5YTYvcmVzb3VyY2Vncm91cHMvMUVTSG9zdGVkUG9vbC1BS1MtRGV2SW5mcmEtR3JlZW4vcHJvdmlkZXJzL01pY3Jvc29mdC5DbG91ZFRlc3QvaG9zdGVkcG9vbHMvMUVTLUFLUy1EZXZJbmZyYS1BdXRvLVRlYXJEb3duLUdyZWVuIiwieG1zX21pcmlkIjoiL3N1YnNjcmlwdGlvbnMvMmI5MTUyODUtMTMwMi00YTBmLThiNTQtZjUwMmE2YjYxOWE2L3Jlc291cmNlZ3JvdXBzL0luZnJhc3RydWN0dXJlcy9wcm92aWRlcnMvTWljcm9zb2Z0Lk1hbmFnZWRJZGVudGl0eS91c2VyQXNzaWduZWRJZGVudGl0aWVzL2Frc2RldmluZnJhMWVzYWdlbnRwb29sIiwieG1zX3RjZHQiOjEyODkyNDE1NDd9.dqzdkyfkmQlEpfB_uD9GxQdY1AanDDsggKbYvo4iX4sT26npt_lmOIuNQ_72hAG9XoXR1eqAXXAcCXDIGLP5GqlOIupL8OeEXV4CRJql_07ADjXyQpnqdqlsUHELXaypKhhbeASne9_Yph6YsRWYoYx8YPJOX5hK72x-e0PRSXHAF1aci3aED4ibrbfFK5fScFgjAH8pjNxiJ2FtTrUeWFHo3jOKkgAcyNzF6adwaoQM1Ir0gUjjAqljTqf623xtuy1qDCoHkOVcqqrIM6OHwQj9f0gvXf7nJ-VF7fnPv4SE1IVinSehWcGrCs1gE0DjUZ2L5X64s-GTH6oi-R9aSw","client_id":"705ac000-bf67-4eed-9ba0-9ee723df283a","expires_in":"86380","expires_on":"1717628206","ext_expires_in":"86399","not_before":"1717541506","resource":"https://management.core.windows.net/","token_type":"Bearer"}'
-    headers:
-      content-length:
-      - '2036'
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Tue, 04 Jun 2024 22:57:06 GMT
-      server:
-      - IMDS/150.870.65.1305
-    status:
-      code: 200
-      message: OK
 - request:
     body: null
     headers:
@@ -44,7 +13,7 @@ interactions:
       ParameterSetName:
       - -l
       User-Agent:
-      - AZURECLI/2.61.0 azsdk-python-core/1.28.0 Python/3.8.10 (Linux-6.5.0-1021-azure-x86_64-with-glibc2.29)
+      - AZURECLI/2.58.0 azsdk-python-core/1.28.0 Python/3.8.10 (Linux-6.2.0-1019-azure-x86_64-with-glibc2.29)
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/meshRevisionProfiles?api-version=2024-02-01
   response:
@@ -52,23 +21,24 @@ interactions:
       string: "{\n  \"value\": [\n   {\n    \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/meshRevisionProfiles/istio\",\n
         \   \"name\": \"istio\",\n    \"type\": \"Microsoft.ContainerService/locations/meshRevisionProfiles\",\n
         \   \"properties\": {\n     \"meshRevisions\": [\n      {\n       \"revision\":
-        \"asm-1-20\",\n       \"upgrades\": [\n        \"asm-1-21\"\n       ],\n       \"compatibleWith\":
+        \"asm-1-18\",\n       \"upgrades\": [\n        \"asm-1-19\"\n       ],\n       \"compatibleWith\":
         [\n        {\n         \"name\": \"kubernetes\",\n         \"versions\": [\n
-        \         \"1.25\",\n          \"1.26\",\n          \"1.27\",\n          \"1.28\",\n
-        \         \"1.29\"\n         ]\n        }\n       ]\n      },\n      {\n       \"revision\":
-        \"asm-1-21\",\n       \"compatibleWith\": [\n        {\n         \"name\":
-        \"kubernetes\",\n         \"versions\": [\n          \"1.26\",\n          \"1.27\",\n
-        \         \"1.28\",\n          \"1.29\",\n          \"1.30\"\n         ]\n
-        \       }\n       ]\n      }\n     ]\n    }\n   }\n  ]\n }"
+        \         \"1.26.10\",\n          \"1.26.12\",\n          \"1.27.7\",\n          \"1.27.9\",\n
+        \         \"1.28.3\",\n          \"1.28.5\"\n         ]\n        }\n       ]\n
+        \     },\n      {\n       \"revision\": \"asm-1-19\",\n       \"compatibleWith\":
+        [\n        {\n         \"name\": \"kubernetes\",\n         \"versions\": [\n
+        \         \"1.26.10\",\n          \"1.26.12\",\n          \"1.27.7\",\n          \"1.27.9\",\n
+        \         \"1.28.3\",\n          \"1.28.5\"\n         ]\n        }\n       ]\n
+        \     }\n     ]\n    }\n   }\n  ]\n }"
     headers:
       cache-control:
       - no-cache
       content-length:
-      - '894'
+      - '958'
       content-type:
       - application/json
       date:
-      - Tue, 04 Jun 2024 22:57:06 GMT
+      - Wed, 28 Feb 2024 21:32:01 GMT
       expires:
       - '-1'
       pragma:
@@ -80,7 +50,7 @@ interactions:
       x-content-type-options:
       - nosniff
       x-msedge-ref:
-      - 'Ref A: 2C172B11D1A940F58E850499C3FF0F8F Ref B: MNZ221060608011 Ref C: 2024-06-04T22:57:07Z'
+      - 'Ref A: 87CD0824F2BC4F96B0BEE7926F9D39EC Ref B: MNZ221060610019 Ref C: 2024-02-28T21:31:59Z'
     status:
       code: 200
       message: OK