addon: remove shared flag from AGIC addon (#1816)

Author: akshaysngupta

src/aks-preview/azext_aks_preview/_consts.py

@@ -19,7 +19,6 @@
 CONST_INGRESS_APPGW_SUBNET_ID = "subnetId"
 CONST_INGRESS_APPGW_SUBNET_PREFIX = "subnetPrefix"
 CONST_INGRESS_APPGW_WATCH_NAMESPACE = "watchNamespace"
-CONST_INGRESS_APPGW_SHARED = "shared"
 
 CONST_NODEPOOL_MODE_SYSTEM = "System"
 CONST_NODEPOOL_MODE_USER = "User"

src/aks-preview/azext_aks_preview/_help.py

@@ -220,22 +220,19 @@
           short-summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2
         - name: --appgw-name
           type: string
-          short-summary: Used along with IngressApplicationGateway addon. Name of the application gateway to create/use in the node resource group
+          short-summary: Name of the application gateway to create/use in the node resource group. Use with ingress-azure addon.
         - name: --appgw-subnet-prefix
           type: string
-          short-summary: Used along with IngressApplicationGateway addon. Subnet Prefix to use for a new subnet created to deploy the Application Gateway
+          short-summary: Subnet Prefix to use for a new subnet created to deploy the Application Gateway. Use with ingress-azure addon.
         - name: --appgw-id
           type: string
-          short-summary: Used along with IngressApplicationGateway addon. Resource Id of an existing Application Gateway to use with AGIC
+          short-summary: Resource Id of an existing Application Gateway to use with AGIC. Use with ingress-azure addon.
         - name: --appgw-subnet-id
           type: string
-          short-summary: Used along with IngressApplicationGateway addon. Resource Id of an existing Subnet used to deploy the Application Gateway.
-        - name: --appgw-shared
-          type: bool
-          short-summary: Used along with IngressApplicationGateway addon. Use shared flag if application gateway will be shared.
+          short-summary: Resource Id of an existing Subnet used to deploy the Application Gateway. Use with ingress-azure addon.
         - name: --appgw-watch-namespace
           type: string
-          short-summary: Used along with IngressApplicationGateway addon. Specify the namespace, which AGIC should watch. This could be a single string value, or a comma-separated list of namespaces.
+          short-summary: Specify the namespace, which AGIC should watch. This could be a single string value, or a comma-separated list of namespaces.
     examples:
         - name: Create a Kubernetes cluster with an existing SSH public key.
           text: az aks create -g MyResourceGroup -n MyManagedCluster --ssh-key-value /path/to/publickey
@@ -613,26 +610,26 @@
     short-summary: The subnet name for the virtual node to use.
   - name: --appgw-name
     type: string
-    short-summary: Used along with IngressApplicationGateway addon. Name of the application gateway to create/use in the node resource group
+    short-summary: Name of the application gateway to create/use in the node resource group. Use with ingress-azure addon.
   - name: --appgw-subnet-prefix
     type: string
-    short-summary: Used along with IngressApplicationGateway addon. Subnet Prefix to use for a new subnet created to deploy the Application Gateway
+    short-summary: Subnet Prefix to use for a new subnet created to deploy the Application Gateway. Use with ingress-azure addon.
   - name: --appgw-id
     type: string
-    short-summary: Used along with IngressApplicationGateway addon. Resource Id of an existing Application Gateway to use with AGIC
+    short-summary: Resource Id of an existing Application Gateway to use with AGIC. Use with ingress-azure addon.
   - name: --appgw-subnet-id
     type: string
-    short-summary: Used along with IngressApplicationGateway addon. Resource Id of an existing Subnet used to deploy the Application Gateway
-  - name: --appgw-shared
-    type: bool
-    short-summary: Used along with IngressApplicationGateway addon. Use shared flag if application gateway will be shared
+    short-summary: Resource Id of an existing Subnet used to deploy the Application Gateway. Use with ingress-azure addon.
   - name: --appgw-watch-namespace
     type: string
-    short-summary: Used along with IngressApplicationGateway addon. Specify the namespace, which AGIC should watch. This could be a single string value, or a comma-separated list of namespaces.
+    short-summary: Specify the namespace, which AGIC should watch. This could be a single string value, or a comma-separated list of namespaces. Use with ingress-azure addon.
 examples:
   - name: Enable Kubernetes addons. (autogenerated)
     text: az aks enable-addons --addons virtual-node --name MyManagedCluster --resource-group MyResourceGroup --subnet-name VirtualNodeSubnet
     crafted: true
+  - name: Enable ingress-appgw addon with subnet prefix.
+    text: az aks enable-addons --name MyManagedCluster --resource-group MyResourceGroup --addons ingress-appgw --appgw-subnet-prefix 10.2.0.0/16 --appgw-name gateway
+    crafted: true
 """
 
 helps['aks get-versions'] = """

src/aks-preview/azext_aks_preview/custom.py

@@ -83,7 +83,7 @@
 from ._consts import CONST_INGRESS_APPGW_ADDON_NAME
 from ._consts import CONST_INGRESS_APPGW_APPLICATION_GATEWAY_ID, CONST_INGRESS_APPGW_APPLICATION_GATEWAY_NAME
 from ._consts import CONST_INGRESS_APPGW_SUBNET_PREFIX, CONST_INGRESS_APPGW_SUBNET_ID
-from ._consts import CONST_INGRESS_APPGW_SHARED, CONST_INGRESS_APPGW_WATCH_NAMESPACE
+from ._consts import CONST_INGRESS_APPGW_WATCH_NAMESPACE
 from ._consts import CONST_SCALE_SET_PRIORITY_REGULAR, CONST_SCALE_SET_PRIORITY_SPOT, CONST_SPOT_EVICTION_POLICY_DELETE
 
 logger = get_logger(__name__)
@@ -806,7 +806,6 @@ def aks_create(cmd,     # pylint: disable=too-many-locals,too-many-statements,to
                appgw_subnet_prefix=None,
                appgw_id=None,
                appgw_subnet_id=None,
-               appgw_shared=None,
                appgw_watch_namespace=None,
                enable_aad=False,
                aad_admin_group_object_ids=None,
@@ -962,7 +961,6 @@ def aks_create(cmd,     # pylint: disable=too-many-locals,too-many-statements,to
         appgw_subnet_prefix,
         appgw_id,
         appgw_subnet_id,
-        appgw_shared,
         appgw_watch_namespace
     )
     monitoring = False
@@ -1663,7 +1661,7 @@ def _upgrade_single_agent_pool_node_image(client, resource_group_name, cluster_n
 
 
 def _handle_addons_args(cmd, addons_str, subscription_id, resource_group_name, addon_profiles=None,
-                        workspace_resource_id=None, appgw_name=None, appgw_subnet_prefix=None, appgw_id=None, appgw_subnet_id=None, appgw_shared=False, appgw_watch_namespace=None):
+                        workspace_resource_id=None, appgw_name=None, appgw_subnet_prefix=None, appgw_id=None, appgw_subnet_id=None, appgw_watch_namespace=None):
     if not addon_profiles:
         addon_profiles = {}
     addons = addons_str.split(',') if addons_str else []
@@ -1704,8 +1702,6 @@ def _handle_addons_args(cmd, addons_str, subscription_id, resource_group_name, a
             addon_profile.config[CONST_INGRESS_APPGW_APPLICATION_GATEWAY_ID] = appgw_id
         if appgw_subnet_id is not None:
             addon_profile.config[CONST_INGRESS_APPGW_SUBNET_ID] = appgw_subnet_id
-        if appgw_shared:
-            addon_profile.config[CONST_INGRESS_APPGW_SHARED] = "true"
         if appgw_watch_namespace is not None:
             addon_profile.config[CONST_INGRESS_APPGW_WATCH_NAMESPACE] = appgw_watch_namespace
         addon_profiles[CONST_INGRESS_APPGW_ADDON_NAME] = addon_profile
@@ -2360,12 +2356,12 @@ def aks_disable_addons(cmd, client, resource_group_name, name, addons, no_wait=F
 
 
 def aks_enable_addons(cmd, client, resource_group_name, name, addons, workspace_resource_id=None,
-                      subnet_name=None, appgw_name=None, appgw_subnet_prefix=None, appgw_id=None, appgw_subnet_id=None, appgw_shared=False, appgw_watch_namespace=None, no_wait=False):
+                      subnet_name=None, appgw_name=None, appgw_subnet_prefix=None, appgw_id=None, appgw_subnet_id=None, appgw_watch_namespace=None, no_wait=False):
     instance = client.get(resource_group_name, name)
     subscription_id = get_subscription_id(cmd.cli_ctx)
     instance = _update_addons(cmd, instance, subscription_id, resource_group_name, name, addons, enable=True,
                               workspace_resource_id=workspace_resource_id, subnet_name=subnet_name,
-                              appgw_name=appgw_name, appgw_subnet_prefix=appgw_subnet_prefix, appgw_id=appgw_id, appgw_subnet_id=appgw_subnet_id, appgw_shared=appgw_shared, appgw_watch_namespace=appgw_watch_namespace, no_wait=no_wait)
+                              appgw_name=appgw_name, appgw_subnet_prefix=appgw_subnet_prefix, appgw_id=appgw_id, appgw_subnet_id=appgw_subnet_id, appgw_watch_namespace=appgw_watch_namespace, no_wait=no_wait)
 
     if 'omsagent' in instance.addon_profiles and instance.addon_profiles['omsagent'].enabled:
         _ensure_container_insights_for_monitoring(cmd, instance.addon_profiles['omsagent'])
@@ -2414,7 +2410,6 @@ def _update_addons(cmd,  # pylint: disable=too-many-branches,too-many-statements
                    appgw_subnet_prefix=None,
                    appgw_id=None,
                    appgw_subnet_id=None,
-                   appgw_shared=False,
                    appgw_watch_namespace=None,
                    no_wait=False):  # pylint: disable=unused-argument
 
@@ -2479,8 +2474,6 @@ def _update_addons(cmd,  # pylint: disable=too-many-branches,too-many-statements
                     addon_profile.config[CONST_INGRESS_APPGW_APPLICATION_GATEWAY_ID] = appgw_id
                 if appgw_subnet_id is not None:
                     addon_profile.config[CONST_INGRESS_APPGW_SUBNET_ID] = appgw_subnet_id
-                if appgw_shared:
-                    addon_profile.config[CONST_INGRESS_APPGW_SHARED] = "true"
                 if appgw_watch_namespace is not None:
                     addon_profile.config[CONST_INGRESS_APPGW_WATCH_NAMESPACE] = appgw_watch_namespace
             addon_profiles[addon] = addon_profile