From 55eb56fbeab6e1aa1a5e6a1b8edfa748a4d3676e Mon Sep 17 00:00:00 2001 From: gtracer Date: Mon, 27 Jan 2020 09:59:58 -0800 Subject: [PATCH 01/14] fix merge conflicts, update containerservice version --- .../azure/cli/command_modules/acs/_helpers.py | 2 +- .../azure/cli/command_modules/acs/_params.py | 2 + .../azure/cli/command_modules/acs/commands.py | 2 +- .../azure/cli/command_modules/acs/custom.py | 59 ++++++++++++------- src/azure-cli/requirements.py2.Darwin.txt | 2 +- src/azure-cli/requirements.py2.Linux.txt | 2 +- src/azure-cli/requirements.py2.windows.txt | 2 +- src/azure-cli/requirements.py3.Darwin.txt | 2 +- src/azure-cli/requirements.py3.Linux.txt | 2 +- src/azure-cli/requirements.py3.windows.txt | 2 +- 10 files changed, 47 insertions(+), 30 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/acs/_helpers.py b/src/azure-cli/azure/cli/command_modules/acs/_helpers.py index a72099da3ad..7a9d61558d0 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/_helpers.py +++ b/src/azure-cli/azure/cli/command_modules/acs/_helpers.py @@ -5,7 +5,7 @@ from distutils.version import StrictVersion # pylint: disable=no-name-in-module,import-error # pylint: disable=no-name-in-module,import-error -from azure.mgmt.containerservice.v2019_08_01.models import ManagedClusterAPIServerAccessProfile +from azure.mgmt.containerservice.v2019_11_01.models import ManagedClusterAPIServerAccessProfile def _populate_api_server_access_profile(api_server_authorized_ip_ranges, instance=None): diff --git a/src/azure-cli/azure/cli/command_modules/acs/_params.py b/src/azure-cli/azure/cli/command_modules/acs/_params.py index 2938d184ce0..d77814af7d8 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/_params.py +++ b/src/azure-cli/azure/cli/command_modules/acs/_params.py @@ -209,6 +209,8 @@ def load_arguments(self, _): c.argument('load_balancer_managed_outbound_ip_count', type=int) c.argument('load_balancer_outbound_ips', type=str, validator=validate_load_balancer_outbound_ips) c.argument('load_balancer_outbound_ip_prefixes', type=str, validator=validate_load_balancer_outbound_ip_prefixes) + c.argument('load_balancer_allocated_outbound_ports', type=int) + c.argument('load_balancer_idle_timeout', type=int) c.argument('api_server_authorized_ip_ranges', type=str, validator=validate_ip_ranges) with self.argument_context('aks disable-addons') as c: diff --git a/src/azure-cli/azure/cli/command_modules/acs/commands.py b/src/azure-cli/azure/cli/command_modules/acs/commands.py index 1436b0055cc..44807ef3ea2 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/commands.py +++ b/src/azure-cli/azure/cli/command_modules/acs/commands.py @@ -30,7 +30,7 @@ def load_command_table(self, _): ) managed_clusters_sdk = CliCommandType( - operations_tmpl='azure.mgmt.containerservice.v2019_08_01.operations.' + operations_tmpl='azure.mgmt.containerservice.v2019_11_01.operations.' '_managed_clusters_operations#ManagedClustersOperations.{}', client_factory=cf_managed_clusters ) diff --git a/src/azure-cli/azure/cli/command_modules/acs/custom.py b/src/azure-cli/azure/cli/command_modules/acs/custom.py index 9436decc5eb..910d58b900e 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/custom.py +++ b/src/azure-cli/azure/cli/command_modules/acs/custom.py @@ -26,8 +26,6 @@ from six.moves.urllib.request import urlopen # pylint: disable=import-error from six.moves.urllib.error import URLError # pylint: disable=import-error -from ._helpers import _populate_api_server_access_profile, _set_load_balancer_sku, _set_vm_set_type - # pylint: disable=import-error import yaml import dateutil.parser @@ -56,22 +54,22 @@ from azure.mgmt.containerservice.models import ContainerServiceOrchestratorTypes -from azure.mgmt.containerservice.v2019_08_01.models import ContainerServiceNetworkProfile -from azure.mgmt.containerservice.v2019_08_01.models import ContainerServiceLinuxProfile -from azure.mgmt.containerservice.v2019_08_01.models import ManagedClusterServicePrincipalProfile -from azure.mgmt.containerservice.v2019_08_01.models import ContainerServiceSshConfiguration -from azure.mgmt.containerservice.v2019_08_01.models import ContainerServiceSshPublicKey -from azure.mgmt.containerservice.v2019_08_01.models import ContainerServiceStorageProfileTypes -from azure.mgmt.containerservice.v2019_08_01.models import ManagedCluster -from azure.mgmt.containerservice.v2019_08_01.models import ManagedClusterAADProfile -from azure.mgmt.containerservice.v2019_08_01.models import ManagedClusterAddonProfile -from azure.mgmt.containerservice.v2019_08_01.models import ManagedClusterAgentPoolProfile -from azure.mgmt.containerservice.v2019_08_01.models import ManagedClusterLoadBalancerProfile -from azure.mgmt.containerservice.v2019_08_01.models import ManagedClusterLoadBalancerProfileManagedOutboundIPs -from azure.mgmt.containerservice.v2019_08_01.models import ManagedClusterLoadBalancerProfileOutboundIPPrefixes -from azure.mgmt.containerservice.v2019_08_01.models import ManagedClusterLoadBalancerProfileOutboundIPs -from azure.mgmt.containerservice.v2019_08_01.models import AgentPool -from azure.mgmt.containerservice.v2019_08_01.models import ResourceReference +from azure.mgmt.containerservice.v2019_11_01.models import ContainerServiceNetworkProfile +from azure.mgmt.containerservice.v2019_11_01.models import ContainerServiceLinuxProfile +from azure.mgmt.containerservice.v2019_11_01.models import ManagedClusterServicePrincipalProfile +from azure.mgmt.containerservice.v2019_11_01.models import ContainerServiceSshConfiguration +from azure.mgmt.containerservice.v2019_11_01.models import ContainerServiceSshPublicKey +from azure.mgmt.containerservice.v2019_11_01.models import ContainerServiceStorageProfileTypes +from azure.mgmt.containerservice.v2019_11_01.models import ManagedCluster +from azure.mgmt.containerservice.v2019_11_01.models import ManagedClusterAADProfile +from azure.mgmt.containerservice.v2019_11_01.models import ManagedClusterAddonProfile +from azure.mgmt.containerservice.v2019_11_01.models import ManagedClusterAgentPoolProfile +from azure.mgmt.containerservice.v2019_11_01.models import ManagedClusterLoadBalancerProfile +from azure.mgmt.containerservice.v2019_11_01.models import ManagedClusterLoadBalancerProfileManagedOutboundIPs +from azure.mgmt.containerservice.v2019_11_01.models import ManagedClusterLoadBalancerProfileOutboundIPPrefixes +from azure.mgmt.containerservice.v2019_11_01.models import ManagedClusterLoadBalancerProfileOutboundIPs +from azure.mgmt.containerservice.v2019_11_01.models import AgentPool +from azure.mgmt.containerservice.v2019_11_01.models import ResourceReference from azure.mgmt.containerservice.v2019_09_30_preview.models import OpenShiftManagedClusterAgentPoolProfile from azure.mgmt.containerservice.v2019_09_30_preview.models import OpenShiftAgentPoolProfileRole @@ -91,6 +89,8 @@ from ._client_factory import get_resource_by_name from ._client_factory import cf_container_registry_service +from ._helpers import _populate_api_server_access_profile, _set_load_balancer_sku, _set_vm_set_type + logger = get_logger(__name__) @@ -1640,6 +1640,8 @@ def aks_create(cmd, client, resource_group_name, name, ssh_key_value, # pylint: api_server_authorized_ip_ranges=None, attach_acr=None, no_wait=False): + print("hello ganesha we have made it!!!") + raise CLIError("let's get") _validate_ssh_key(no_ssh_key, ssh_key_value) subscription_id = get_subscription_id(cmd.cli_ctx) @@ -1699,7 +1701,7 @@ def aks_create(cmd, client, resource_group_name, name, ssh_key_value, # pylint: load_balancer_profile = _get_load_balancer_profile( load_balancer_managed_outbound_ip_count, load_balancer_outbound_ips, - load_balancer_outbound_ip_prefixes) + load_balancer_outbound_ip_prefixes, None, None) if attach_acr: _ensure_aks_acr(cmd.cli_ctx, @@ -1966,6 +1968,8 @@ def aks_update(cmd, client, resource_group_name, name, load_balancer_managed_outbound_ip_count=None, load_balancer_outbound_ips=None, load_balancer_outbound_ip_prefixes=None, + load_balancer_allocated_outbound_ports=None, + load_balancer_idle_timeout=None, attach_acr=None, detach_acr=None, api_server_authorized_ip_ranges=None, @@ -2046,7 +2050,9 @@ def aks_update(cmd, client, resource_group_name, name, load_balancer_profile = _get_load_balancer_profile( load_balancer_managed_outbound_ip_count, load_balancer_outbound_ips, - load_balancer_outbound_ip_prefixes) + load_balancer_outbound_ip_prefixes, + load_balancer_allocated_outbound_ports, + load_balancer_idle_timeout) if load_balancer_profile: instance.network_profile.load_balancer_profile = load_balancer_profile @@ -3280,7 +3286,9 @@ def _get_load_balancer_outbound_ip_prefixes(load_balancer_outbound_ip_prefixes): def _get_load_balancer_profile(load_balancer_managed_outbound_ip_count, load_balancer_outbound_ips, - load_balancer_outbound_ip_prefixes): + load_balancer_outbound_ip_prefixes, + load_balancer_allocated_outbound_ports, + load_balancer_idle_timeout): """parse and build load balancer profile""" load_balancer_outbound_ip_resources = _get_load_balancer_outbound_ips(load_balancer_outbound_ips) load_balancer_outbound_ip_prefix_resources = _get_load_balancer_outbound_ip_prefixes( @@ -3289,7 +3297,9 @@ def _get_load_balancer_profile(load_balancer_managed_outbound_ip_count, load_balancer_profile = None if any([load_balancer_managed_outbound_ip_count, load_balancer_outbound_ip_resources, - load_balancer_outbound_ip_prefix_resources]): + load_balancer_outbound_ip_prefix_resources, + load_balancer_allocated_outbound_ports, + load_balancer_idle_timeout]): load_balancer_profile = ManagedClusterLoadBalancerProfile() if load_balancer_managed_outbound_ip_count: load_balancer_profile.managed_outbound_ips = ManagedClusterLoadBalancerProfileManagedOutboundIPs( @@ -3303,4 +3313,9 @@ def _get_load_balancer_profile(load_balancer_managed_outbound_ip_count, load_balancer_profile.outbound_ip_prefixes = ManagedClusterLoadBalancerProfileOutboundIPPrefixes( public_ip_prefixes=load_balancer_outbound_ip_prefix_resources ) + if load_balancer_allocated_outbound_ports: + load_balancer_profile.allocated_outbound_ports = load_balancer_allocated_outbound_ports + if load_balancer_idle_timeout: + load_balancer_profile.idle_timeout_in_minutes = load_balancer_idle_timeout + print("Ganesha here is the profile", load_balancer_profile) return load_balancer_profile diff --git a/src/azure-cli/requirements.py2.Darwin.txt b/src/azure-cli/requirements.py2.Darwin.txt index 42168abf36f..5bf50845123 100644 --- a/src/azure-cli/requirements.py2.Darwin.txt +++ b/src/azure-cli/requirements.py2.Darwin.txt @@ -31,7 +31,7 @@ azure-mgmt-compute==10.0.0 azure-mgmt-consumption==2.0.0 azure-mgmt-containerinstance==1.5.0 azure-mgmt-containerregistry==3.0.0rc8 -azure-mgmt-containerservice==8.0.0 +azure-mgmt-containerservice==8.1.0 azure-mgmt-cosmosdb==0.11.0 azure-mgmt-datalake-analytics==0.2.1 azure-mgmt-datalake-nspkg==3.0.1 diff --git a/src/azure-cli/requirements.py2.Linux.txt b/src/azure-cli/requirements.py2.Linux.txt index 42168abf36f..5bf50845123 100644 --- a/src/azure-cli/requirements.py2.Linux.txt +++ b/src/azure-cli/requirements.py2.Linux.txt @@ -31,7 +31,7 @@ azure-mgmt-compute==10.0.0 azure-mgmt-consumption==2.0.0 azure-mgmt-containerinstance==1.5.0 azure-mgmt-containerregistry==3.0.0rc8 -azure-mgmt-containerservice==8.0.0 +azure-mgmt-containerservice==8.1.0 azure-mgmt-cosmosdb==0.11.0 azure-mgmt-datalake-analytics==0.2.1 azure-mgmt-datalake-nspkg==3.0.1 diff --git a/src/azure-cli/requirements.py2.windows.txt b/src/azure-cli/requirements.py2.windows.txt index 9a462ea65a0..1cc44eca675 100644 --- a/src/azure-cli/requirements.py2.windows.txt +++ b/src/azure-cli/requirements.py2.windows.txt @@ -30,7 +30,7 @@ azure-mgmt-compute==10.0.0 azure-mgmt-consumption==2.0.0 azure-mgmt-containerinstance==1.5.0 azure-mgmt-containerregistry==3.0.0rc8 -azure-mgmt-containerservice==8.0.0 +azure-mgmt-containerservice==8.1.0 azure-mgmt-cosmosdb==0.11.0 azure-mgmt-datalake-analytics==0.2.1 azure-mgmt-datalake-nspkg==3.0.1 diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt index 71a977ef4ca..5a5160676f0 100644 --- a/src/azure-cli/requirements.py3.Darwin.txt +++ b/src/azure-cli/requirements.py3.Darwin.txt @@ -31,7 +31,7 @@ azure-mgmt-compute==10.0.0 azure-mgmt-consumption==2.0.0 azure-mgmt-containerinstance==1.5.0 azure-mgmt-containerregistry==3.0.0rc8 -azure-mgmt-containerservice==8.0.0 +azure-mgmt-containerservice==8.1.0 azure-mgmt-cosmosdb==0.11.0 azure-mgmt-datalake-analytics==0.2.1 azure-mgmt-datalake-nspkg==3.0.1 diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt index 71a977ef4ca..5a5160676f0 100644 --- a/src/azure-cli/requirements.py3.Linux.txt +++ b/src/azure-cli/requirements.py3.Linux.txt @@ -31,7 +31,7 @@ azure-mgmt-compute==10.0.0 azure-mgmt-consumption==2.0.0 azure-mgmt-containerinstance==1.5.0 azure-mgmt-containerregistry==3.0.0rc8 -azure-mgmt-containerservice==8.0.0 +azure-mgmt-containerservice==8.1.0 azure-mgmt-cosmosdb==0.11.0 azure-mgmt-datalake-analytics==0.2.1 azure-mgmt-datalake-nspkg==3.0.1 diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt index f70745f65e1..668cdc5a5d8 100644 --- a/src/azure-cli/requirements.py3.windows.txt +++ b/src/azure-cli/requirements.py3.windows.txt @@ -30,7 +30,7 @@ azure-mgmt-compute==10.0.0 azure-mgmt-consumption==2.0.0 azure-mgmt-containerinstance==1.5.0 azure-mgmt-containerregistry==3.0.0rc8 -azure-mgmt-containerservice==8.0.0 +azure-mgmt-containerservice==8.1.0 azure-mgmt-cosmosdb==0.11.0 azure-mgmt-datalake-analytics==0.2.1 azure-mgmt-datalake-nspkg==3.0.1 From 7b858972d0c1e7590bbeb472d53f32161e1bf3f5 Mon Sep 17 00:00:00 2001 From: gtracer Date: Mon, 27 Jan 2020 14:10:52 -0800 Subject: [PATCH 02/14] enable allocated ports and idletimeouts --- .../azure/cli/command_modules/acs/_params.py | 5 +- .../cli/command_modules/acs/_validators.py | 15 +++ .../azure/cli/command_modules/acs/custom.py | 92 ++++--------------- .../acs/loadbalancer/__init__.py | 0 .../acs/loadbalancer/loadbalancer.py | 86 +++++++++++++++++ 5 files changed, 124 insertions(+), 74 deletions(-) create mode 100644 src/azure-cli/azure/cli/command_modules/acs/loadbalancer/__init__.py create mode 100644 src/azure-cli/azure/cli/command_modules/acs/loadbalancer/loadbalancer.py diff --git a/src/azure-cli/azure/cli/command_modules/acs/_params.py b/src/azure-cli/azure/cli/command_modules/acs/_params.py index d77814af7d8..e1e047960ce 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/_params.py +++ b/src/azure-cli/azure/cli/command_modules/acs/_params.py @@ -20,7 +20,8 @@ validate_create_parameters, validate_k8s_client_version, validate_k8s_version, validate_linux_host_name, validate_list_of_integers, validate_ssh_key, validate_connector_name, validate_max_pods, validate_nodes_count, validate_nodepool_name, validate_vm_set_type, validate_load_balancer_sku, validate_load_balancer_outbound_ips, - validate_load_balancer_outbound_ip_prefixes, validate_taints, validate_ip_ranges, validate_acr) + validate_load_balancer_outbound_ip_prefixes, validate_taints, validate_ip_ranges, validate_acr, + validate_load_balancer_allocated_ports, validate_load_balancer_idle_timeout) aci_connector_os_type = ['Windows', 'Linux', 'Both'] @@ -175,6 +176,8 @@ def load_arguments(self, _): c.argument('load_balancer_managed_outbound_ip_count', type=int) c.argument('load_balancer_outbound_ips', type=str, validator=validate_load_balancer_outbound_ips) c.argument('load_balancer_outbound_ip_prefixes', type=str, validator=validate_load_balancer_outbound_ip_prefixes) + c.argument('load_balancer_outbound_ports', type=int, validator=validate_load_balancer_allocated_ports) + c.argument('load_balancer_idle_timeout', type=int, validator=validate_load_balancer_idle_timeout) c.argument('enable_cluster_autoscaler', action='store_true') c.argument('min_count', type=int, validator=validate_nodes_count) c.argument('max_count', type=int, validator=validate_nodes_count) diff --git a/src/azure-cli/azure/cli/command_modules/acs/_validators.py b/src/azure-cli/azure/cli/command_modules/acs/_validators.py index 064672d5ef7..b244b81027b 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/_validators.py +++ b/src/azure-cli/azure/cli/command_modules/acs/_validators.py @@ -196,6 +196,21 @@ def validate_load_balancer_outbound_ip_prefixes(namespace): if not all(ip_prefix_id_list): raise CLIError("--load-balancer-outbound-ip-prefixes cannot contain whitespace") +def validate_load_balancer_allocated_ports(namespace): + """validate load balancer profile outbound allocated ports""" + if namespace.load_balancer_allocated_ports is not None: + if namespace.load_balancer_allocated_ports % 8 != 0: + raise CLIError("--load-balancer-allocated-ports must be a multiple of 8") + if namespace.load_balancer_allocated_ports < 0: + raise CLIError("--load-balancer-allocated-ports cannot be negative") + + +def validate_load_balancer_idle_timeout(namespace): + """validate load balancer profile idle timeout""" + if namespace.load_balancer_idle_timeout is not None: + if namespace.load_balancer_idle_timeout < 4 or namespace.load_balancer_idle_timeout > 120: + raise CLIError("--load-balancer-idle-timeout must be set between 4 and 120 minutes") + def validate_nodes_count(namespace): """Validates that min_count and max_count is set between 1-100""" diff --git a/src/azure-cli/azure/cli/command_modules/acs/custom.py b/src/azure-cli/azure/cli/command_modules/acs/custom.py index 910d58b900e..1990f3a6e6a 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/custom.py +++ b/src/azure-cli/azure/cli/command_modules/acs/custom.py @@ -64,12 +64,7 @@ from azure.mgmt.containerservice.v2019_11_01.models import ManagedClusterAADProfile from azure.mgmt.containerservice.v2019_11_01.models import ManagedClusterAddonProfile from azure.mgmt.containerservice.v2019_11_01.models import ManagedClusterAgentPoolProfile -from azure.mgmt.containerservice.v2019_11_01.models import ManagedClusterLoadBalancerProfile -from azure.mgmt.containerservice.v2019_11_01.models import ManagedClusterLoadBalancerProfileManagedOutboundIPs -from azure.mgmt.containerservice.v2019_11_01.models import ManagedClusterLoadBalancerProfileOutboundIPPrefixes -from azure.mgmt.containerservice.v2019_11_01.models import ManagedClusterLoadBalancerProfileOutboundIPs from azure.mgmt.containerservice.v2019_11_01.models import AgentPool -from azure.mgmt.containerservice.v2019_11_01.models import ResourceReference from azure.mgmt.containerservice.v2019_09_30_preview.models import OpenShiftManagedClusterAgentPoolProfile from azure.mgmt.containerservice.v2019_09_30_preview.models import OpenShiftAgentPoolProfileRole @@ -89,7 +84,9 @@ from ._client_factory import get_resource_by_name from ._client_factory import cf_container_registry_service -from ._helpers import _populate_api_server_access_profile, _set_load_balancer_sku, _set_vm_set_type +from ._helpers import _populate_api_server_access_profile, _set_vm_set_type + +from azure.cli.command_modules.acs.loadbalancer import set_load_balancer_sku, get_load_balancer_profile, is_load_balancer_provided logger = get_logger(__name__) @@ -1624,6 +1621,8 @@ def aks_create(cmd, client, resource_group_name, name, ssh_key_value, # pylint: load_balancer_managed_outbound_ip_count=None, load_balancer_outbound_ips=None, load_balancer_outbound_ip_prefixes=None, + load_balancer_allocated_ports=None, + load_balancer_idle_timeout=None, enable_addons=None, workspace_resource_id=None, vnet_subnet_id=None, @@ -1640,8 +1639,6 @@ def aks_create(cmd, client, resource_group_name, name, ssh_key_value, # pylint: api_server_authorized_ip_ranges=None, attach_acr=None, no_wait=False): - print("hello ganesha we have made it!!!") - raise CLIError("let's get") _validate_ssh_key(no_ssh_key, ssh_key_value) subscription_id = get_subscription_id(cmd.cli_ctx) @@ -1701,7 +1698,9 @@ def aks_create(cmd, client, resource_group_name, name, ssh_key_value, # pylint: load_balancer_profile = _get_load_balancer_profile( load_balancer_managed_outbound_ip_count, load_balancer_outbound_ips, - load_balancer_outbound_ip_prefixes, None, None) + load_balancer_outbound_ip_prefixes, + load_balancer_allocated_ports, + load_balancer_idle_timeout) if attach_acr: _ensure_aks_acr(cmd.cli_ctx, @@ -1968,7 +1967,7 @@ def aks_update(cmd, client, resource_group_name, name, load_balancer_managed_outbound_ip_count=None, load_balancer_outbound_ips=None, load_balancer_outbound_ip_prefixes=None, - load_balancer_allocated_outbound_ports=None, + load_balancer_outbound_ports=None, load_balancer_idle_timeout=None, attach_acr=None, detach_acr=None, @@ -1976,8 +1975,9 @@ def aks_update(cmd, client, resource_group_name, name, no_wait=False): update_autoscaler = enable_cluster_autoscaler + disable_cluster_autoscaler + update_cluster_autoscaler - update_lb_profile = load_balancer_managed_outbound_ip_count is not None or \ - load_balancer_outbound_ips is not None or load_balancer_outbound_ip_prefixes is not None + update_lb_profile = _is_load_balancer_provided(load_balancer_managed_outbound_ip_count, load_balancer_outbound_ips, + load_balancer_outbound_ip_prefixes, load_balancer_outbound_ports, + load_balancer_idle_timeout) if (update_autoscaler != 1 and not update_lb_profile and not attach_acr and @@ -1986,10 +1986,12 @@ def aks_update(cmd, client, resource_group_name, name, raise CLIError('Please specify one or more of "--enable-cluster-autoscaler" or ' '"--disable-cluster-autoscaler" or ' '"--update-cluster-autoscaler" or ' - '"--load-balancer-managed-outbound-ip-count",' - '"--load-balancer-outbound-ips",' - '"--load-balancer-outbound-ip-prefixes",' - '"--attach-acr" or "--dettach-acr",' + '"--load-balancer-managed-outbound-ip-count" or' + '"--load-balancer-outbound-ips" or ' + '"--load-balancer-outbound-ip-prefixes" or' + '"--load-balancer-outbound-ports" or' + '"--load-balancer-idle-timeout" or' + '"--attach-acr" or "--dettach-acr" or' '"--"api-server-authorized-ip-ranges') instance = client.get(resource_group_name, name) @@ -2051,7 +2053,7 @@ def aks_update(cmd, client, resource_group_name, name, load_balancer_managed_outbound_ip_count, load_balancer_outbound_ips, load_balancer_outbound_ip_prefixes, - load_balancer_allocated_outbound_ports, + load_balancer_outbound_ports, load_balancer_idle_timeout) if load_balancer_profile: @@ -3263,59 +3265,3 @@ def openshift_scale(cmd, client, resource_group_name, name, compute_count, no_wa instance.auth_profile = None return sdk_no_wait(no_wait, client.create_or_update, resource_group_name, name, instance) - - -def _get_load_balancer_outbound_ips(load_balancer_outbound_ips): - """parse load balancer profile outbound IP ids and return an array of references to the outbound IP resources""" - load_balancer_outbound_ip_resources = None - if load_balancer_outbound_ips: - load_balancer_outbound_ip_resources = \ - [ResourceReference(id=x.strip()) for x in load_balancer_outbound_ips.split(',')] - return load_balancer_outbound_ip_resources - - -def _get_load_balancer_outbound_ip_prefixes(load_balancer_outbound_ip_prefixes): - """parse load balancer profile outbound IP prefix ids and return an array \ - of references to the outbound IP prefix resources""" - load_balancer_outbound_ip_prefix_resources = None - if load_balancer_outbound_ip_prefixes: - load_balancer_outbound_ip_prefix_resources = \ - [ResourceReference(id=x.strip()) for x in load_balancer_outbound_ip_prefixes.split(',')] - return load_balancer_outbound_ip_prefix_resources - - -def _get_load_balancer_profile(load_balancer_managed_outbound_ip_count, - load_balancer_outbound_ips, - load_balancer_outbound_ip_prefixes, - load_balancer_allocated_outbound_ports, - load_balancer_idle_timeout): - """parse and build load balancer profile""" - load_balancer_outbound_ip_resources = _get_load_balancer_outbound_ips(load_balancer_outbound_ips) - load_balancer_outbound_ip_prefix_resources = _get_load_balancer_outbound_ip_prefixes( - load_balancer_outbound_ip_prefixes) - - load_balancer_profile = None - if any([load_balancer_managed_outbound_ip_count, - load_balancer_outbound_ip_resources, - load_balancer_outbound_ip_prefix_resources, - load_balancer_allocated_outbound_ports, - load_balancer_idle_timeout]): - load_balancer_profile = ManagedClusterLoadBalancerProfile() - if load_balancer_managed_outbound_ip_count: - load_balancer_profile.managed_outbound_ips = ManagedClusterLoadBalancerProfileManagedOutboundIPs( - count=load_balancer_managed_outbound_ip_count - ) - if load_balancer_outbound_ip_resources: - load_balancer_profile.outbound_ips = ManagedClusterLoadBalancerProfileOutboundIPs( - public_ips=load_balancer_outbound_ip_resources - ) - if load_balancer_outbound_ip_prefix_resources: - load_balancer_profile.outbound_ip_prefixes = ManagedClusterLoadBalancerProfileOutboundIPPrefixes( - public_ip_prefixes=load_balancer_outbound_ip_prefix_resources - ) - if load_balancer_allocated_outbound_ports: - load_balancer_profile.allocated_outbound_ports = load_balancer_allocated_outbound_ports - if load_balancer_idle_timeout: - load_balancer_profile.idle_timeout_in_minutes = load_balancer_idle_timeout - print("Ganesha here is the profile", load_balancer_profile) - return load_balancer_profile diff --git a/src/azure-cli/azure/cli/command_modules/acs/loadbalancer/__init__.py b/src/azure-cli/azure/cli/command_modules/acs/loadbalancer/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/azure-cli/azure/cli/command_modules/acs/loadbalancer/loadbalancer.py b/src/azure-cli/azure/cli/command_modules/acs/loadbalancer/loadbalancer.py new file mode 100644 index 00000000000..314b9a78283 --- /dev/null +++ b/src/azure-cli/azure/cli/command_modules/acs/loadbalancer/loadbalancer.py @@ -0,0 +1,86 @@ +# -------------------------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# -------------------------------------------------------------------------------------------- + +from distutils.version import StrictVersion # pylint: disable=no-name-in-module,import-error + +# pylint: disable=no-name-in-module,import-error +from azure.mgmt.containerservice.v2019_11_01.models import ManagedClusterLoadBalancerProfile +from azure.mgmt.containerservice.v2019_11_01.models import ManagedClusterLoadBalancerProfileManagedOutboundIPs +from azure.mgmt.containerservice.v2019_11_01.models import ManagedClusterLoadBalancerProfileOutboundIPPrefixes +from azure.mgmt.containerservice.v2019_11_01.models import ManagedClusterLoadBalancerProfileOutboundIPs +from azure.mgmt.containerservice.v2019_11_01.models import ResourceReference + + +def set_load_balancer_sku(sku, kubernetes_version): + if sku: + return sku + if kubernetes_version and StrictVersion(kubernetes_version) < StrictVersion("1.13.0"): + print('Setting load_balancer_sku to basic as it is not specified and kubernetes \ + version(%s) less than 1.13.0 only supports basic load balancer SKU\n' % (kubernetes_version)) + return "basic" + return "standard" + + +def _get_load_balancer_outbound_ips(load_balancer_outbound_ips): + """parse load balancer profile outbound IP ids and return an array of references to the outbound IP resources""" + load_balancer_outbound_ip_resources = None + if load_balancer_outbound_ips: + load_balancer_outbound_ip_resources = \ + [ResourceReference(id=x.strip()) for x in load_balancer_outbound_ips.split(',')] + return load_balancer_outbound_ip_resources + + +def _get_load_balancer_outbound_ip_prefixes(load_balancer_outbound_ip_prefixes): + """parse load balancer profile outbound IP prefix ids and return an array \ + of references to the outbound IP prefix resources""" + load_balancer_outbound_ip_prefix_resources = None + if load_balancer_outbound_ip_prefixes: + load_balancer_outbound_ip_prefix_resources = \ + [ResourceReference(id=x.strip()) for x in load_balancer_outbound_ip_prefixes.split(',')] + return load_balancer_outbound_ip_prefix_resources + + +def get_load_balancer_profile(managed_outbound_ip_count, + outbound_ips, + outbound_ip_prefixes, + outbound_ports, + load_balancer_idle_timeout): + """parse and build load balancer profile""" + load_balancer_outbound_ip_resources = _get_load_balancer_outbound_ips(outbound_ips) + load_balancer_outbound_ip_prefix_resources = _get_load_balancer_outbound_ip_prefixes( + outbound_ip_prefixes) + + load_balancer_profile = None + if is_load_balancer_provided(managed_outbound_ip_count, + load_balancer_outbound_ip_resources, + load_balancer_outbound_ip_prefix_resources, + outbound_ports, + load_balancer_idle_timeout): + load_balancer_profile = ManagedClusterLoadBalancerProfile() + if managed_outbound_ip_count: + load_balancer_profile.managed_outbound_ips = ManagedClusterLoadBalancerProfileManagedOutboundIPs( + count=managed_outbound_ip_count + ) + if load_balancer_outbound_ip_resources: + load_balancer_profile.outbound_ips = ManagedClusterLoadBalancerProfileOutboundIPs( + public_ips=load_balancer_outbound_ip_resources + ) + if load_balancer_outbound_ip_prefix_resources: + load_balancer_profile.outbound_ip_prefixes = ManagedClusterLoadBalancerProfileOutboundIPPrefixes( + public_ip_prefixes=load_balancer_outbound_ip_prefix_resources + ) + if outbound_ports: + load_balancer_profile.allocated_outbound_ports = outbound_ports + if load_balancer_idle_timeout: + load_balancer_profile.idle_timeout_in_minutes = load_balancer_idle_timeout + return load_balancer_profile + + +def is_load_balancer_provided(managed_outbound_ip_count, outbound_ips, ip_prefixes, outbound_ports, idle_timeout): + return any([managed_outbound_ip_count, + outbound_ips, + ip_prefixes, + outbound_ports, + idle_timeout]) From d98ed4babaf6c0c3b6925a550797180899731607 Mon Sep 17 00:00:00 2001 From: gtracer Date: Mon, 27 Jan 2020 14:33:20 -0800 Subject: [PATCH 03/14] add validation, help doc, fix linting --- .../azure/cli/command_modules/acs/_help.py | 20 +++++++++++++ .../azure/cli/command_modules/acs/_params.py | 4 +-- .../cli/command_modules/acs/_validators.py | 1 + .../azure/cli/command_modules/acs/custom.py | 15 +++++----- .../acs/loadbalancer/loadbalancer.py | 30 ++++++++----------- 5 files changed, 43 insertions(+), 27 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/acs/_help.py b/src/azure-cli/azure/cli/command_modules/acs/_help.py index db8a24447d1..7ff89acb059 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/_help.py +++ b/src/azure-cli/azure/cli/command_modules/acs/_help.py @@ -252,6 +252,14 @@ type: string short-summary: Load balancer outbound IP prefix resource IDs. long-summary: Comma-separated public IP prefix resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only. + - name: --load-balancer-allocated-ports + type: string + short-summary: Load balancer outbound allocated ports. + long-summary: Desired static number of outbound ports per VM in the load balancer backend pool. By default, azure dynamically configures allocated ports as VM count changes. + - name: --load-balancer-idle-timeout + type: string + short-summary: Load balancer idle timeout in minutes. + long-summary: Desired idle timeout for load balancer outbound flows, default is 30 minutes. Please specify a value in the range of [4, 120]. - name: --enable-cluster-autoscaler type: bool short-summary: Enable cluster autoscaler, default value is false. @@ -331,6 +339,8 @@ text: az aks create -g MyResourceGroup -n MyManagedCluster - name: Create a kubernetes cluster with standard SKU load balancer and two AKS created IPs for the load balancer outbound connection usage. text: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2 + - name: Create a kubernetes cluster with a standard SKU load balancer, with two outbound AKS managed IPs an idle flow timeout of 5 minutes and 8000 allocated ports per machine + text: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2 --load-balancer-idle-timeout 5 --load-balancer-allocated-ports 8000 - name: Create a kubernetes cluster with standard SKU load balancer and use the provided public IPs for the load balancer outbound connection usage. text: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ips - name: Create a kubernetes cluster with standard SKU load balancer and use the provided public IP prefixes for the load balancer outbound connection usage. @@ -372,6 +382,14 @@ type: string short-summary: Load balancer outbound IP prefix resource IDs. long-summary: Comma-separated public IP prefix resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only. + - name: --load-balancer-allocated-ports + type: string + short-summary: Load balancer outbound allocated ports. + long-summary: Desired static number of outbound ports per VM in the load balancer backend pool. By default, azure dynamically configures allocated ports as VM count changes. + - name: --load-balancer-idle-timeout + type: string + short-summary: Load balancer idle timeout in minutes. + long-summary: Desired idle timeout for load balancer outbound flows, default is 30 minutes. Please specify a value in the range of [4, 120]. - name: --attach-acr type: string short-summary: Grant the 'acrpull' role assignment to the ACR specified by name or resource ID. @@ -386,6 +404,8 @@ text: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2 - name: Update a kubernetes cluster with standard SKU load balancer to use the provided public IPs for the load balancer outbound connection usage. text: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ips + - name: Create a kubernetes cluster with a standard SKU load balancer, with two outbound AKS managed IPs an idle flow timeout of 5 minutes and 8000 allocated ports per machine + text: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2 --load-balancer-idle-timeout 5 --load-balancer-allocated-ports 8000 - name: Update a kubernetes cluster with standard SKU load balancer to use the provided public IP prefixes for the load balancer outbound connection usage. text: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ip-prefixes - name: Attach AKS cluster to ACR by name "acrName" diff --git a/src/azure-cli/azure/cli/command_modules/acs/_params.py b/src/azure-cli/azure/cli/command_modules/acs/_params.py index e1e047960ce..62720a7d0b2 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/_params.py +++ b/src/azure-cli/azure/cli/command_modules/acs/_params.py @@ -212,8 +212,8 @@ def load_arguments(self, _): c.argument('load_balancer_managed_outbound_ip_count', type=int) c.argument('load_balancer_outbound_ips', type=str, validator=validate_load_balancer_outbound_ips) c.argument('load_balancer_outbound_ip_prefixes', type=str, validator=validate_load_balancer_outbound_ip_prefixes) - c.argument('load_balancer_allocated_outbound_ports', type=int) - c.argument('load_balancer_idle_timeout', type=int) + c.argument('load_balancer_allocated_outbound_ports', type=int, validator=validate_load_balancer_allocated_ports) + c.argument('load_balancer_idle_timeout', type=int, validator=validate_load_balancer_idle_timeout) c.argument('api_server_authorized_ip_ranges', type=str, validator=validate_ip_ranges) with self.argument_context('aks disable-addons') as c: diff --git a/src/azure-cli/azure/cli/command_modules/acs/_validators.py b/src/azure-cli/azure/cli/command_modules/acs/_validators.py index b244b81027b..02aa5899605 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/_validators.py +++ b/src/azure-cli/azure/cli/command_modules/acs/_validators.py @@ -196,6 +196,7 @@ def validate_load_balancer_outbound_ip_prefixes(namespace): if not all(ip_prefix_id_list): raise CLIError("--load-balancer-outbound-ip-prefixes cannot contain whitespace") + def validate_load_balancer_allocated_ports(namespace): """validate load balancer profile outbound allocated ports""" if namespace.load_balancer_allocated_ports is not None: diff --git a/src/azure-cli/azure/cli/command_modules/acs/custom.py b/src/azure-cli/azure/cli/command_modules/acs/custom.py index 1990f3a6e6a..d4de0b145a1 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/custom.py +++ b/src/azure-cli/azure/cli/command_modules/acs/custom.py @@ -86,7 +86,8 @@ from ._helpers import _populate_api_server_access_profile, _set_vm_set_type -from azure.cli.command_modules.acs.loadbalancer import set_load_balancer_sku, get_load_balancer_profile, is_load_balancer_provided +from azure.cli.command_modules.acs.loadbalancer import (set_load_balancer_sku, + get_load_balancer_profile, is_load_balancer_provided) logger = get_logger(__name__) @@ -1650,7 +1651,7 @@ def aks_create(cmd, client, resource_group_name, name, ssh_key_value, # pylint: location = rg_location vm_set_type = _set_vm_set_type(vm_set_type, kubernetes_version) - load_balancer_sku = _set_load_balancer_sku(load_balancer_sku, kubernetes_version) + load_balancer_sku = set_load_balancer_sku(load_balancer_sku, kubernetes_version) if api_server_authorized_ip_ranges and load_balancer_sku == "basic": raise CLIError('--api-server-authorized-ip-ranges can only be used with standard load balancer') @@ -1695,7 +1696,7 @@ def aks_create(cmd, client, resource_group_name, name, ssh_key_value, # pylint: logger.warning('Could not create a role assignment for subnet. ' 'Are you an Owner on this subscription?') - load_balancer_profile = _get_load_balancer_profile( + load_balancer_profile = get_load_balancer_profile( load_balancer_managed_outbound_ip_count, load_balancer_outbound_ips, load_balancer_outbound_ip_prefixes, @@ -1975,9 +1976,9 @@ def aks_update(cmd, client, resource_group_name, name, no_wait=False): update_autoscaler = enable_cluster_autoscaler + disable_cluster_autoscaler + update_cluster_autoscaler - update_lb_profile = _is_load_balancer_provided(load_balancer_managed_outbound_ip_count, load_balancer_outbound_ips, - load_balancer_outbound_ip_prefixes, load_balancer_outbound_ports, - load_balancer_idle_timeout) + update_lb_profile = is_load_balancer_provided(load_balancer_managed_outbound_ip_count, load_balancer_outbound_ips, + load_balancer_outbound_ip_prefixes, load_balancer_outbound_ports, + load_balancer_idle_timeout) if (update_autoscaler != 1 and not update_lb_profile and not attach_acr and @@ -2049,7 +2050,7 @@ def aks_update(cmd, client, resource_group_name, name, subscription_id=subscription_id, detach=True) - load_balancer_profile = _get_load_balancer_profile( + load_balancer_profile = get_load_balancer_profile( load_balancer_managed_outbound_ip_count, load_balancer_outbound_ips, load_balancer_outbound_ip_prefixes, diff --git a/src/azure-cli/azure/cli/command_modules/acs/loadbalancer/loadbalancer.py b/src/azure-cli/azure/cli/command_modules/acs/loadbalancer/loadbalancer.py index 314b9a78283..6613a60a540 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/loadbalancer/loadbalancer.py +++ b/src/azure-cli/azure/cli/command_modules/acs/loadbalancer/loadbalancer.py @@ -42,39 +42,33 @@ def _get_load_balancer_outbound_ip_prefixes(load_balancer_outbound_ip_prefixes): return load_balancer_outbound_ip_prefix_resources -def get_load_balancer_profile(managed_outbound_ip_count, - outbound_ips, - outbound_ip_prefixes, - outbound_ports, - load_balancer_idle_timeout): +def get_load_balancer_profile(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, + outbound_ports, idle_timeout): """parse and build load balancer profile""" - load_balancer_outbound_ip_resources = _get_load_balancer_outbound_ips(outbound_ips) - load_balancer_outbound_ip_prefix_resources = _get_load_balancer_outbound_ip_prefixes( + outbound_ip_resources = _get_load_balancer_outbound_ips(outbound_ips) + outbound_ip_prefix_resources = _get_load_balancer_outbound_ip_prefixes( outbound_ip_prefixes) load_balancer_profile = None - if is_load_balancer_provided(managed_outbound_ip_count, - load_balancer_outbound_ip_resources, - load_balancer_outbound_ip_prefix_resources, - outbound_ports, - load_balancer_idle_timeout): + if is_load_balancer_provided(managed_outbound_ip_count, outbound_ip_resources, outbound_ip_prefix_resources, + outbound_ports, idle_timeout): load_balancer_profile = ManagedClusterLoadBalancerProfile() if managed_outbound_ip_count: load_balancer_profile.managed_outbound_ips = ManagedClusterLoadBalancerProfileManagedOutboundIPs( count=managed_outbound_ip_count ) - if load_balancer_outbound_ip_resources: + if outbound_ip_resources: load_balancer_profile.outbound_ips = ManagedClusterLoadBalancerProfileOutboundIPs( - public_ips=load_balancer_outbound_ip_resources + public_ips=outbound_ip_resources ) - if load_balancer_outbound_ip_prefix_resources: + if outbound_ip_prefix_resources: load_balancer_profile.outbound_ip_prefixes = ManagedClusterLoadBalancerProfileOutboundIPPrefixes( - public_ip_prefixes=load_balancer_outbound_ip_prefix_resources + public_ip_prefixes=outbound_ip_prefix_resources ) if outbound_ports: load_balancer_profile.allocated_outbound_ports = outbound_ports - if load_balancer_idle_timeout: - load_balancer_profile.idle_timeout_in_minutes = load_balancer_idle_timeout + if idle_timeout: + load_balancer_profile.idle_timeout_in_minutes = idle_timeout return load_balancer_profile From bb1caa3d907130f0ab6ae40e5be25d7da25441a7 Mon Sep 17 00:00:00 2001 From: gtracer Date: Mon, 27 Jan 2020 16:37:08 -0800 Subject: [PATCH 04/14] move lb to file --- .../loadbalancer.py => _loadbalancer.py} | 96 +++++++++++-------- .../acs/loadbalancer/__init__.py | 0 2 files changed, 58 insertions(+), 38 deletions(-) rename src/azure-cli/azure/cli/command_modules/acs/{loadbalancer/loadbalancer.py => _loadbalancer.py} (55%) delete mode 100644 src/azure-cli/azure/cli/command_modules/acs/loadbalancer/__init__.py diff --git a/src/azure-cli/azure/cli/command_modules/acs/loadbalancer/loadbalancer.py b/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py similarity index 55% rename from src/azure-cli/azure/cli/command_modules/acs/loadbalancer/loadbalancer.py rename to src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py index 6613a60a540..efebcb045bd 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/loadbalancer/loadbalancer.py +++ b/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py @@ -23,6 +23,64 @@ def set_load_balancer_sku(sku, kubernetes_version): return "standard" +def update_load_balancer_profile(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, + outbound_ports, idle_timeout, profile): + """parse and update an existing load balancer profile""" + if not is_load_balancer__profile_provided(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, outbound_ports, idle_timeout): + return profile + return configure_load_balancer_profile(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, outbound_ports, idle_timeout, profile) + + +def create_load_balancer_profile(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, + outbound_ports, idle_timeout): + """parse and build load balancer profile""" + if not is_load_balancer__profile_provided(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, + outbound_ports, idle_timeout): + return None + + profile = ManagedClusterLoadBalancerProfile() + return configure_load_balancer_profile(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, + outbound_ports, idle_timeout, profile) + + +def configure_load_balancer_profile(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, outbound_ports, + idle_timeout, profile): + """configure a load balancer with customer supplied values""" + if not profile: + return profile + + outbound_ip_resources = _get_load_balancer_outbound_ips(outbound_ips) + outbound_ip_prefix_resources = _get_load_balancer_outbound_ip_prefixes(outbound_ip_prefixes) + + if managed_outbound_ip_count: + profile.managed_outbound_ips = ManagedClusterLoadBalancerProfileManagedOutboundIPs( + count=managed_outbound_ip_count + ) + if outbound_ip_resources: + profile.outbound_ips = ManagedClusterLoadBalancerProfileOutboundIPs( + public_ips=outbound_ip_resources + ) + if outbound_ip_prefix_resources: + profile.outbound_ip_prefixes = ManagedClusterLoadBalancerProfileOutboundIPPrefixes( + public_ip_prefixes=outbound_ip_prefix_resources + ) + if outbound_ports: + profile.allocated_outbound_ports = outbound_ports + if idle_timeout: + profile.idle_timeout_in_minutes = idle_timeout + + return profile + + +def is_load_balancer__profile_provided(managed_outbound_ip_count, outbound_ips, ip_prefixes, + outbound_ports, idle_timeout): + return any([managed_outbound_ip_count, + outbound_ips, + ip_prefixes, + outbound_ports, + idle_timeout]) + + def _get_load_balancer_outbound_ips(load_balancer_outbound_ips): """parse load balancer profile outbound IP ids and return an array of references to the outbound IP resources""" load_balancer_outbound_ip_resources = None @@ -40,41 +98,3 @@ def _get_load_balancer_outbound_ip_prefixes(load_balancer_outbound_ip_prefixes): load_balancer_outbound_ip_prefix_resources = \ [ResourceReference(id=x.strip()) for x in load_balancer_outbound_ip_prefixes.split(',')] return load_balancer_outbound_ip_prefix_resources - - -def get_load_balancer_profile(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, - outbound_ports, idle_timeout): - """parse and build load balancer profile""" - outbound_ip_resources = _get_load_balancer_outbound_ips(outbound_ips) - outbound_ip_prefix_resources = _get_load_balancer_outbound_ip_prefixes( - outbound_ip_prefixes) - - load_balancer_profile = None - if is_load_balancer_provided(managed_outbound_ip_count, outbound_ip_resources, outbound_ip_prefix_resources, - outbound_ports, idle_timeout): - load_balancer_profile = ManagedClusterLoadBalancerProfile() - if managed_outbound_ip_count: - load_balancer_profile.managed_outbound_ips = ManagedClusterLoadBalancerProfileManagedOutboundIPs( - count=managed_outbound_ip_count - ) - if outbound_ip_resources: - load_balancer_profile.outbound_ips = ManagedClusterLoadBalancerProfileOutboundIPs( - public_ips=outbound_ip_resources - ) - if outbound_ip_prefix_resources: - load_balancer_profile.outbound_ip_prefixes = ManagedClusterLoadBalancerProfileOutboundIPPrefixes( - public_ip_prefixes=outbound_ip_prefix_resources - ) - if outbound_ports: - load_balancer_profile.allocated_outbound_ports = outbound_ports - if idle_timeout: - load_balancer_profile.idle_timeout_in_minutes = idle_timeout - return load_balancer_profile - - -def is_load_balancer_provided(managed_outbound_ip_count, outbound_ips, ip_prefixes, outbound_ports, idle_timeout): - return any([managed_outbound_ip_count, - outbound_ips, - ip_prefixes, - outbound_ports, - idle_timeout]) diff --git a/src/azure-cli/azure/cli/command_modules/acs/loadbalancer/__init__.py b/src/azure-cli/azure/cli/command_modules/acs/loadbalancer/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 From 3d7ddb16ef48cba9a8d9c2a4c2d73480522d21c2 Mon Sep 17 00:00:00 2001 From: gtracer Date: Mon, 27 Jan 2020 18:07:45 -0800 Subject: [PATCH 05/14] refactor for patch, update naming --- .../azure/cli/command_modules/acs/_help.py | 8 ++--- .../cli/command_modules/acs/_loadbalancer.py | 7 ++-- .../azure/cli/command_modules/acs/_params.py | 6 ++-- .../cli/command_modules/acs/_validators.py | 8 ++--- .../azure/cli/command_modules/acs/custom.py | 36 +++++++++---------- 5 files changed, 33 insertions(+), 32 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/acs/_help.py b/src/azure-cli/azure/cli/command_modules/acs/_help.py index 7ff89acb059..1090488e2d8 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/_help.py +++ b/src/azure-cli/azure/cli/command_modules/acs/_help.py @@ -252,7 +252,7 @@ type: string short-summary: Load balancer outbound IP prefix resource IDs. long-summary: Comma-separated public IP prefix resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only. - - name: --load-balancer-allocated-ports + - name: --load-balancer-outbound-ports type: string short-summary: Load balancer outbound allocated ports. long-summary: Desired static number of outbound ports per VM in the load balancer backend pool. By default, azure dynamically configures allocated ports as VM count changes. @@ -340,7 +340,7 @@ - name: Create a kubernetes cluster with standard SKU load balancer and two AKS created IPs for the load balancer outbound connection usage. text: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2 - name: Create a kubernetes cluster with a standard SKU load balancer, with two outbound AKS managed IPs an idle flow timeout of 5 minutes and 8000 allocated ports per machine - text: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2 --load-balancer-idle-timeout 5 --load-balancer-allocated-ports 8000 + text: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2 --load-balancer-idle-timeout 5 --load-balancer-outbound-ports 8000 - name: Create a kubernetes cluster with standard SKU load balancer and use the provided public IPs for the load balancer outbound connection usage. text: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ips - name: Create a kubernetes cluster with standard SKU load balancer and use the provided public IP prefixes for the load balancer outbound connection usage. @@ -382,7 +382,7 @@ type: string short-summary: Load balancer outbound IP prefix resource IDs. long-summary: Comma-separated public IP prefix resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only. - - name: --load-balancer-allocated-ports + - name: --load-balancer-outbound-ports type: string short-summary: Load balancer outbound allocated ports. long-summary: Desired static number of outbound ports per VM in the load balancer backend pool. By default, azure dynamically configures allocated ports as VM count changes. @@ -405,7 +405,7 @@ - name: Update a kubernetes cluster with standard SKU load balancer to use the provided public IPs for the load balancer outbound connection usage. text: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ips - name: Create a kubernetes cluster with a standard SKU load balancer, with two outbound AKS managed IPs an idle flow timeout of 5 minutes and 8000 allocated ports per machine - text: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2 --load-balancer-idle-timeout 5 --load-balancer-allocated-ports 8000 + text: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2 --load-balancer-idle-timeout 5 --load-balancer-outbound-ports 8000 - name: Update a kubernetes cluster with standard SKU load balancer to use the provided public IP prefixes for the load balancer outbound connection usage. text: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ip-prefixes - name: Attach AKS cluster to ACR by name "acrName" diff --git a/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py b/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py index efebcb045bd..a2c53059d55 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py +++ b/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py @@ -26,9 +26,11 @@ def set_load_balancer_sku(sku, kubernetes_version): def update_load_balancer_profile(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, outbound_ports, idle_timeout, profile): """parse and update an existing load balancer profile""" - if not is_load_balancer__profile_provided(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, outbound_ports, idle_timeout): + if not is_load_balancer__profile_provided(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, + outbound_ports, idle_timeout): return profile - return configure_load_balancer_profile(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, outbound_ports, idle_timeout, profile) + return configure_load_balancer_profile(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, + outbound_ports, idle_timeout, profile) def create_load_balancer_profile(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, @@ -68,7 +70,6 @@ def configure_load_balancer_profile(managed_outbound_ip_count, outbound_ips, out profile.allocated_outbound_ports = outbound_ports if idle_timeout: profile.idle_timeout_in_minutes = idle_timeout - return profile diff --git a/src/azure-cli/azure/cli/command_modules/acs/_params.py b/src/azure-cli/azure/cli/command_modules/acs/_params.py index 62720a7d0b2..7039b2d8de2 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/_params.py +++ b/src/azure-cli/azure/cli/command_modules/acs/_params.py @@ -21,7 +21,7 @@ validate_list_of_integers, validate_ssh_key, validate_connector_name, validate_max_pods, validate_nodes_count, validate_nodepool_name, validate_vm_set_type, validate_load_balancer_sku, validate_load_balancer_outbound_ips, validate_load_balancer_outbound_ip_prefixes, validate_taints, validate_ip_ranges, validate_acr, - validate_load_balancer_allocated_ports, validate_load_balancer_idle_timeout) + validate_load_balancer_outbound_ports, validate_load_balancer_idle_timeout) aci_connector_os_type = ['Windows', 'Linux', 'Both'] @@ -176,7 +176,7 @@ def load_arguments(self, _): c.argument('load_balancer_managed_outbound_ip_count', type=int) c.argument('load_balancer_outbound_ips', type=str, validator=validate_load_balancer_outbound_ips) c.argument('load_balancer_outbound_ip_prefixes', type=str, validator=validate_load_balancer_outbound_ip_prefixes) - c.argument('load_balancer_outbound_ports', type=int, validator=validate_load_balancer_allocated_ports) + c.argument('load_balancer_outbound_ports', type=int, validator=validate_load_balancer_outbound_ports) c.argument('load_balancer_idle_timeout', type=int, validator=validate_load_balancer_idle_timeout) c.argument('enable_cluster_autoscaler', action='store_true') c.argument('min_count', type=int, validator=validate_nodes_count) @@ -212,7 +212,7 @@ def load_arguments(self, _): c.argument('load_balancer_managed_outbound_ip_count', type=int) c.argument('load_balancer_outbound_ips', type=str, validator=validate_load_balancer_outbound_ips) c.argument('load_balancer_outbound_ip_prefixes', type=str, validator=validate_load_balancer_outbound_ip_prefixes) - c.argument('load_balancer_allocated_outbound_ports', type=int, validator=validate_load_balancer_allocated_ports) + c.argument('load_balancer_outbound_ports', type=int, validator=validate_load_balancer_outbound_ports) c.argument('load_balancer_idle_timeout', type=int, validator=validate_load_balancer_idle_timeout) c.argument('api_server_authorized_ip_ranges', type=str, validator=validate_ip_ranges) diff --git a/src/azure-cli/azure/cli/command_modules/acs/_validators.py b/src/azure-cli/azure/cli/command_modules/acs/_validators.py index 02aa5899605..4a0b8427661 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/_validators.py +++ b/src/azure-cli/azure/cli/command_modules/acs/_validators.py @@ -197,12 +197,12 @@ def validate_load_balancer_outbound_ip_prefixes(namespace): raise CLIError("--load-balancer-outbound-ip-prefixes cannot contain whitespace") -def validate_load_balancer_allocated_ports(namespace): +def validate_load_balancer_outbound_ports(namespace): """validate load balancer profile outbound allocated ports""" - if namespace.load_balancer_allocated_ports is not None: - if namespace.load_balancer_allocated_ports % 8 != 0: + if namespace.load_balancer_outbound_ports is not None: + if namespace.load_balancer_outbound_ports % 8 != 0: raise CLIError("--load-balancer-allocated-ports must be a multiple of 8") - if namespace.load_balancer_allocated_ports < 0: + if namespace.load_balancer_outbound_ports < 0: raise CLIError("--load-balancer-allocated-ports cannot be negative") diff --git a/src/azure-cli/azure/cli/command_modules/acs/custom.py b/src/azure-cli/azure/cli/command_modules/acs/custom.py index d4de0b145a1..9c952da0413 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/custom.py +++ b/src/azure-cli/azure/cli/command_modules/acs/custom.py @@ -86,8 +86,8 @@ from ._helpers import _populate_api_server_access_profile, _set_vm_set_type -from azure.cli.command_modules.acs.loadbalancer import (set_load_balancer_sku, - get_load_balancer_profile, is_load_balancer_provided) +from ._loadbalancer import (set_load_balancer_sku, is_load_balancer__profile_provided, + update_load_balancer_profile, create_load_balancer_profile) logger = get_logger(__name__) @@ -1622,7 +1622,7 @@ def aks_create(cmd, client, resource_group_name, name, ssh_key_value, # pylint: load_balancer_managed_outbound_ip_count=None, load_balancer_outbound_ips=None, load_balancer_outbound_ip_prefixes=None, - load_balancer_allocated_ports=None, + load_balancer_outbound_ports=None, load_balancer_idle_timeout=None, enable_addons=None, workspace_resource_id=None, @@ -1696,11 +1696,11 @@ def aks_create(cmd, client, resource_group_name, name, ssh_key_value, # pylint: logger.warning('Could not create a role assignment for subnet. ' 'Are you an Owner on this subscription?') - load_balancer_profile = get_load_balancer_profile( + load_balancer_profile = create_load_balancer_profile( load_balancer_managed_outbound_ip_count, load_balancer_outbound_ips, load_balancer_outbound_ip_prefixes, - load_balancer_allocated_ports, + load_balancer_outbound_ports, load_balancer_idle_timeout) if attach_acr: @@ -1975,10 +1975,11 @@ def aks_update(cmd, client, resource_group_name, name, api_server_authorized_ip_ranges=None, no_wait=False): update_autoscaler = enable_cluster_autoscaler + disable_cluster_autoscaler + update_cluster_autoscaler - - update_lb_profile = is_load_balancer_provided(load_balancer_managed_outbound_ip_count, load_balancer_outbound_ips, - load_balancer_outbound_ip_prefixes, load_balancer_outbound_ports, - load_balancer_idle_timeout) + update_lb_profile = is_load_balancer__profile_provided(load_balancer_managed_outbound_ip_count, + load_balancer_outbound_ips, + load_balancer_outbound_ip_prefixes, + load_balancer_outbound_ports, + load_balancer_idle_timeout) if (update_autoscaler != 1 and not update_lb_profile and not attach_acr and @@ -2050,15 +2051,14 @@ def aks_update(cmd, client, resource_group_name, name, subscription_id=subscription_id, detach=True) - load_balancer_profile = get_load_balancer_profile( - load_balancer_managed_outbound_ip_count, - load_balancer_outbound_ips, - load_balancer_outbound_ip_prefixes, - load_balancer_outbound_ports, - load_balancer_idle_timeout) - - if load_balancer_profile: - instance.network_profile.load_balancer_profile = load_balancer_profile + if update_lb_profile: + instance.network_profile.load_balancer_profile = update_load_balancer_profile( + load_balancer_managed_outbound_ip_count, + load_balancer_outbound_ips, + load_balancer_outbound_ip_prefixes, + load_balancer_outbound_ports, + load_balancer_idle_timeout, + instance.network_profile.load_balancer_profile) # empty string is valid as it disables ip whitelisting if api_server_authorized_ip_ranges is not None: From 62613d83012974c076085a6cc98cbe32153f73f5 Mon Sep 17 00:00:00 2001 From: gtracer Date: Mon, 27 Jan 2020 18:09:38 -0800 Subject: [PATCH 06/14] update history --- src/azure-cli/HISTORY.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst index 367061713f6..5683b23026a 100644 --- a/src/azure-cli/HISTORY.rst +++ b/src/azure-cli/HISTORY.rst @@ -3,6 +3,10 @@ Release History =============== +**ACS** + +* Added support to set outbound allocated ports and idle timeouts on standard load balancer + **ACR** * [BREAKING CHANGE] `az acr delete` will prompt From 28fcdd47304680203810584c1b2c6f47934092a9 Mon Sep 17 00:00:00 2001 From: gtracer Date: Mon, 27 Jan 2020 18:24:36 -0800 Subject: [PATCH 07/14] update setup file to latest acs version --- .../azure/cli/command_modules/acs/_help.py | 2 +- .../test_aks_availability_zones.yaml | 20 +++---- .../recordings/test_aks_create_blb_vmas.yaml | 54 ++++++++--------- .../test_aks_create_default_service.yaml | 26 ++++----- .../test_aks_create_default_setting.yaml | 58 +++++++++---------- ...h_default_mgd_outbound_ip_then_update.yaml | 58 +++++++++---------- ...with_outbound_ip_prefixes_then_update.yaml | 26 ++++----- ...slb_vmss_with_outbound_ip_then_update.yaml | 26 ++++----- ...test_aks_nodepool_create_scale_delete.yaml | 36 ++++++------ .../acs/tests/latest/test_aks_commands.py | 3 +- src/azure-cli/setup.py | 2 +- 11 files changed, 155 insertions(+), 156 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/acs/_help.py b/src/azure-cli/azure/cli/command_modules/acs/_help.py index 1090488e2d8..a4fa5cdc5f7 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/_help.py +++ b/src/azure-cli/azure/cli/command_modules/acs/_help.py @@ -405,7 +405,7 @@ - name: Update a kubernetes cluster with standard SKU load balancer to use the provided public IPs for the load balancer outbound connection usage. text: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ips - name: Create a kubernetes cluster with a standard SKU load balancer, with two outbound AKS managed IPs an idle flow timeout of 5 minutes and 8000 allocated ports per machine - text: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2 --load-balancer-idle-timeout 5 --load-balancer-outbound-ports 8000 + text: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2 --load-balancer-idle-timeout 5 --load-balancer-outbound-ports 8000 - name: Update a kubernetes cluster with standard SKU load balancer to use the provided public IP prefixes for the load balancer outbound connection usage. text: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ip-prefixes - name: Attach AKS cluster to ACR by name "acrName" diff --git a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_availability_zones.yaml b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_availability_zones.yaml index 34537607572..b7745c33936 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_availability_zones.yaml +++ b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_availability_zones.yaml @@ -79,7 +79,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -965,7 +965,7 @@ interactions: msrest_azure/0.6.2 azure-mgmt-containerservice/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.74 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1037,7 +1037,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1111,7 +1111,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1167,7 +1167,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1223,7 +1223,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1277,7 +1277,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"value\": [\n {\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool1\"\ @@ -1341,7 +1341,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2\"\ @@ -1695,7 +1695,7 @@ interactions: msrest_azure/0.6.2 azure-mgmt-containerservice/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.74 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2\"\ @@ -1754,7 +1754,7 @@ interactions: accept-language: - en-US method: DELETE - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode '' diff --git a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_blb_vmas.yaml b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_blb_vmas.yaml index c86590672d8..db872185b04 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_blb_vmas.yaml +++ b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_blb_vmas.yaml @@ -77,7 +77,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -146,7 +146,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -215,7 +215,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -284,7 +284,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -353,7 +353,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -422,7 +422,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -491,7 +491,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -560,7 +560,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -629,7 +629,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -698,7 +698,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -767,7 +767,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -836,7 +836,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -905,7 +905,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -974,7 +974,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1043,7 +1043,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1112,7 +1112,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1181,7 +1181,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1250,7 +1250,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1319,7 +1319,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1388,7 +1388,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1457,7 +1457,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"value\": [\n {\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1527,7 +1527,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"value\": [\n {\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1597,7 +1597,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1668,7 +1668,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1724,7 +1724,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1780,7 +1780,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1836,7 +1836,7 @@ interactions: accept-language: - en-US method: DELETE - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode '' diff --git a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_default_service.yaml b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_default_service.yaml index 9323a7d3641..0659a46077e 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_default_service.yaml +++ b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_default_service.yaml @@ -77,7 +77,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -961,7 +961,7 @@ interactions: msrest_azure/0.6.1 azure-mgmt-containerservice/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.73 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1030,7 +1030,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"value\": [\n {\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1100,7 +1100,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"value\": [\n {\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1170,7 +1170,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1241,7 +1241,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1297,7 +1297,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1353,7 +1353,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1407,7 +1407,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1488,7 +1488,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1909,7 +1909,7 @@ interactions: msrest_azure/0.6.1 azure-mgmt-containerservice/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.73 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1978,7 +1978,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -2049,7 +2049,7 @@ interactions: accept-language: - en-US method: DELETE - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode '' diff --git a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_default_setting.yaml b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_default_setting.yaml index c6f5e96c04c..689b5c81eb0 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_default_setting.yaml +++ b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_default_setting.yaml @@ -79,7 +79,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -149,7 +149,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -219,7 +219,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -290,7 +290,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -361,7 +361,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -432,7 +432,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -503,7 +503,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -574,7 +574,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -645,7 +645,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -716,7 +716,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -787,7 +787,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -858,7 +858,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -929,7 +929,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1000,7 +1000,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1071,7 +1071,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1142,7 +1142,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1213,7 +1213,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1284,7 +1284,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1355,7 +1355,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1426,7 +1426,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1497,7 +1497,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1568,7 +1568,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1639,7 +1639,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"value\": [\n {\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1712,7 +1712,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"value\": [\n {\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1785,7 +1785,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1858,7 +1858,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1914,7 +1914,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1970,7 +1970,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -2026,7 +2026,7 @@ interactions: accept-language: - en-US method: DELETE - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode '' diff --git a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_slb_vmss_with_default_mgd_outbound_ip_then_update.yaml b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_slb_vmss_with_default_mgd_outbound_ip_then_update.yaml index f8b7afb1e3c..cbcd0ee4c0a 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_slb_vmss_with_default_mgd_outbound_ip_then_update.yaml +++ b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_slb_vmss_with_default_mgd_outbound_ip_then_update.yaml @@ -79,7 +79,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -149,7 +149,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -219,7 +219,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -290,7 +290,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -361,7 +361,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -432,7 +432,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -503,7 +503,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -574,7 +574,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -645,7 +645,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -716,7 +716,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -787,7 +787,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -858,7 +858,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -929,7 +929,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1000,7 +1000,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1071,7 +1071,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"value\": [\n {\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1144,7 +1144,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"value\": [\n {\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1217,7 +1217,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1290,7 +1290,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1346,7 +1346,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1402,7 +1402,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1456,7 +1456,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1541,7 +1541,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1814,7 +1814,7 @@ interactions: msrest_azure/0.6.1 azure-mgmt-containerservice/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.73 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1886,7 +1886,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1958,7 +1958,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -2045,7 +2045,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -2419,7 +2419,7 @@ interactions: msrest_azure/0.6.1 azure-mgmt-containerservice/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.73 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -2491,7 +2491,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -2565,7 +2565,7 @@ interactions: accept-language: - en-US method: DELETE - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode '' diff --git a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_slb_vmss_with_outbound_ip_prefixes_then_update.yaml b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_slb_vmss_with_outbound_ip_prefixes_then_update.yaml index b49cf1fb21d..23ad6c3e985 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_slb_vmss_with_outbound_ip_prefixes_then_update.yaml +++ b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_slb_vmss_with_outbound_ip_prefixes_then_update.yaml @@ -433,7 +433,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1014,7 +1014,7 @@ interactions: msrest_azure/0.6.1 azure-mgmt-containerservice/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.73 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1087,7 +1087,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"value\": [\n {\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1162,7 +1162,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"value\": [\n {\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1237,7 +1237,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1312,7 +1312,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1368,7 +1368,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1424,7 +1424,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1478,7 +1478,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1567,7 +1567,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1743,7 +1743,7 @@ interactions: msrest_azure/0.6.1 azure-mgmt-containerservice/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.73 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1818,7 +1818,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1895,7 +1895,7 @@ interactions: accept-language: - en-US method: DELETE - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode '' diff --git a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_slb_vmss_with_outbound_ip_then_update.yaml b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_slb_vmss_with_outbound_ip_then_update.yaml index 689334b5a8a..6a353a32244 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_slb_vmss_with_outbound_ip_then_update.yaml +++ b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_create_slb_vmss_with_outbound_ip_then_update.yaml @@ -477,7 +477,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1313,7 +1313,7 @@ interactions: msrest_azure/0.6.1 azure-mgmt-containerservice/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.73 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1386,7 +1386,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"value\": [\n {\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1461,7 +1461,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"value\": [\n {\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1536,7 +1536,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1611,7 +1611,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1667,7 +1667,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1723,7 +1723,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1777,7 +1777,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1866,7 +1866,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -2142,7 +2142,7 @@ interactions: msrest_azure/0.6.1 azure-mgmt-containerservice/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.73 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -2217,7 +2217,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -2294,7 +2294,7 @@ interactions: accept-language: - en-US method: DELETE - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode '' diff --git a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_nodepool_create_scale_delete.yaml b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_nodepool_create_scale_delete.yaml index 82560c840fe..ef5fa3fcf01 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_nodepool_create_scale_delete.yaml +++ b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_nodepool_create_scale_delete.yaml @@ -79,7 +79,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -964,7 +964,7 @@ interactions: msrest_azure/0.6.2 azure-mgmt-containerservice/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.74 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1035,7 +1035,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\"\ @@ -1108,7 +1108,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1164,7 +1164,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1220,7 +1220,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/listClusterUserCredential?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"kubeconfigs\": [\n {\n \"name\": \"clusterUser\"\ @@ -1274,7 +1274,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"value\": [\n {\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool1\"\ @@ -1336,7 +1336,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2\"\ @@ -1689,7 +1689,7 @@ interactions: msrest_azure/0.6.2 azure-mgmt-containerservice/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.74 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2\"\ @@ -1745,7 +1745,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"value\": [\n {\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool1\"\ @@ -1807,7 +1807,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"value\": [\n {\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool1\"\ @@ -1869,7 +1869,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2\"\ @@ -1931,7 +1931,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2\"\ @@ -2289,7 +2289,7 @@ interactions: msrest_azure/0.6.2 azure-mgmt-containerservice/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.74 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2\"\ @@ -2345,7 +2345,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2\"\ @@ -2401,7 +2401,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools?api-version=2019-11-01 response: body: string: !!python/unicode "{\n \"value\": [\n {\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool1\"\ @@ -2465,7 +2465,7 @@ interactions: accept-language: - en-US method: DELETE - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2?api-version=2019-11-01 response: body: string: !!python/unicode '' @@ -2517,7 +2517,7 @@ interactions: accept-language: - en-US method: DELETE - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-10-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2019-11-01 response: body: string: !!python/unicode '' diff --git a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py index 86231378256..d749a05e476 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py +++ b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py @@ -12,8 +12,7 @@ from azure.cli.testsdk import ( ResourceGroupPreparer, RoleBasedServicePrincipalPreparer, ScenarioTest, live_only) from azure_devtools.scenario_tests import AllowLargeResponse -from azure.cli.testsdk.checkers import ( - StringContainCheck, StringContainCheckIgnoreCase) +from azure.cli.testsdk.checkers import (StringContainCheck, StringContainCheckIgnoreCase) from azure.cli.command_modules.acs._format import version_to_tuple # flake8: noqa diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 46470bba46f..39176028af8 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -78,7 +78,7 @@ 'azure-mgmt-consumption~=2.0', 'azure-mgmt-containerinstance~=1.4', 'azure-mgmt-containerregistry~=3.0.0rc8', - 'azure-mgmt-containerservice~=8.0.0', + 'azure-mgmt-containerservice~=8.1.0', 'azure-mgmt-cosmosdb~=0.11.0', 'azure-mgmt-datalake-analytics~=0.2.1', 'azure-mgmt-datalake-store~=0.5.0', From 476cbfed35d990375e068bf5712f87e929ad3dc8 Mon Sep 17 00:00:00 2001 From: gtracer Date: Tue, 28 Jan 2020 16:28:15 -0800 Subject: [PATCH 08/14] feedback: update history, help docs and port validator --- src/azure-cli/HISTORY.rst | 1 + src/azure-cli/azure/cli/command_modules/acs/_help.py | 4 ++-- src/azure-cli/azure/cli/command_modules/acs/_validators.py | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst index 5683b23026a..d5aa5f1f702 100644 --- a/src/azure-cli/HISTORY.rst +++ b/src/azure-cli/HISTORY.rst @@ -6,6 +6,7 @@ Release History **ACS** * Added support to set outbound allocated ports and idle timeouts on standard load balancer +* Update to API Version 2019-11-01 **ACR** diff --git a/src/azure-cli/azure/cli/command_modules/acs/_help.py b/src/azure-cli/azure/cli/command_modules/acs/_help.py index a4fa5cdc5f7..dc7b6707fae 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/_help.py +++ b/src/azure-cli/azure/cli/command_modules/acs/_help.py @@ -255,7 +255,7 @@ - name: --load-balancer-outbound-ports type: string short-summary: Load balancer outbound allocated ports. - long-summary: Desired static number of outbound ports per VM in the load balancer backend pool. By default, azure dynamically configures allocated ports as VM count changes. + long-summary: Desired static number of outbound ports per VM in the load balancer backend pool. By default, set to 0 which uses the default allocation based on the number of VMs. - name: --load-balancer-idle-timeout type: string short-summary: Load balancer idle timeout in minutes. @@ -385,7 +385,7 @@ - name: --load-balancer-outbound-ports type: string short-summary: Load balancer outbound allocated ports. - long-summary: Desired static number of outbound ports per VM in the load balancer backend pool. By default, azure dynamically configures allocated ports as VM count changes. + long-summary: Desired static number of outbound ports per VM in the load balancer backend pool. By default, set to 0 which uses the default allocation based on the number of VMs. - name: --load-balancer-idle-timeout type: string short-summary: Load balancer idle timeout in minutes. diff --git a/src/azure-cli/azure/cli/command_modules/acs/_validators.py b/src/azure-cli/azure/cli/command_modules/acs/_validators.py index 4a0b8427661..ee52b3a4f1f 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/_validators.py +++ b/src/azure-cli/azure/cli/command_modules/acs/_validators.py @@ -202,15 +202,15 @@ def validate_load_balancer_outbound_ports(namespace): if namespace.load_balancer_outbound_ports is not None: if namespace.load_balancer_outbound_ports % 8 != 0: raise CLIError("--load-balancer-allocated-ports must be a multiple of 8") - if namespace.load_balancer_outbound_ports < 0: - raise CLIError("--load-balancer-allocated-ports cannot be negative") + if namespace.load_balancer_outbound_ports < 0 or namespace.load_balancer_outbound_ports > 64000: + raise CLIError("--load-balancer-allocated-ports must be in the range [0,64000]") def validate_load_balancer_idle_timeout(namespace): """validate load balancer profile idle timeout""" if namespace.load_balancer_idle_timeout is not None: if namespace.load_balancer_idle_timeout < 4 or namespace.load_balancer_idle_timeout > 120: - raise CLIError("--load-balancer-idle-timeout must be set between 4 and 120 minutes") + raise CLIError("--load-balancer-idle-timeout must be in the range [4,120]") def validate_nodes_count(namespace): From 1bd6942a82a57760b6954246c35069de6dac3d14 Mon Sep 17 00:00:00 2001 From: gtracer Date: Tue, 28 Jan 2020 22:36:09 -0800 Subject: [PATCH 09/14] feedback:int not string, typo --- src/azure-cli/azure/cli/command_modules/acs/_help.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/acs/_help.py b/src/azure-cli/azure/cli/command_modules/acs/_help.py index 3fe509392c7..fd630e62126 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/_help.py +++ b/src/azure-cli/azure/cli/command_modules/acs/_help.py @@ -253,11 +253,11 @@ short-summary: Load balancer outbound IP prefix resource IDs. long-summary: Comma-separated public IP prefix resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only. - name: --load-balancer-outbound-ports - type: string + type: int short-summary: Load balancer outbound allocated ports. long-summary: Desired static number of outbound ports per VM in the load balancer backend pool. By default, set to 0 which uses the default allocation based on the number of VMs. - name: --load-balancer-idle-timeout - type: string + type: int short-summary: Load balancer idle timeout in minutes. long-summary: Desired idle timeout for load balancer outbound flows, default is 30 minutes. Please specify a value in the range of [4, 120]. - name: --enable-cluster-autoscaler @@ -383,11 +383,11 @@ short-summary: Load balancer outbound IP prefix resource IDs. long-summary: Comma-separated public IP prefix resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only. - name: --load-balancer-outbound-ports - type: string + type: int short-summary: Load balancer outbound allocated ports. long-summary: Desired static number of outbound ports per VM in the load balancer backend pool. By default, set to 0 which uses the default allocation based on the number of VMs. - name: --load-balancer-idle-timeout - type: string + type: int short-summary: Load balancer idle timeout in minutes. long-summary: Desired idle timeout for load balancer outbound flows, default is 30 minutes. Please specify a value in the range of [4, 120]. - name: --attach-acr From c61a6e3a28b60c4cf853b14a892051f7a8c3d49a Mon Sep 17 00:00:00 2001 From: gtracer Date: Tue, 28 Jan 2020 22:36:26 -0800 Subject: [PATCH 10/14] int not string --- .../azure/cli/command_modules/acs/_loadbalancer.py | 12 ++++++------ .../azure/cli/command_modules/acs/custom.py | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py b/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py index a2c53059d55..6c750ea78d1 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py +++ b/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py @@ -26,8 +26,8 @@ def set_load_balancer_sku(sku, kubernetes_version): def update_load_balancer_profile(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, outbound_ports, idle_timeout, profile): """parse and update an existing load balancer profile""" - if not is_load_balancer__profile_provided(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, - outbound_ports, idle_timeout): + if not is_load_balancer_profile_provided(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, + outbound_ports, idle_timeout): return profile return configure_load_balancer_profile(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, outbound_ports, idle_timeout, profile) @@ -36,8 +36,8 @@ def update_load_balancer_profile(managed_outbound_ip_count, outbound_ips, outbou def create_load_balancer_profile(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, outbound_ports, idle_timeout): """parse and build load balancer profile""" - if not is_load_balancer__profile_provided(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, - outbound_ports, idle_timeout): + if not is_load_balancer_profile_provided(managed_outbound_ip_count, outbound_ips, outbound_ip_prefixes, + outbound_ports, idle_timeout): return None profile = ManagedClusterLoadBalancerProfile() @@ -73,8 +73,8 @@ def configure_load_balancer_profile(managed_outbound_ip_count, outbound_ips, out return profile -def is_load_balancer__profile_provided(managed_outbound_ip_count, outbound_ips, ip_prefixes, - outbound_ports, idle_timeout): +def is_load_balancer_profile_provided(managed_outbound_ip_count, outbound_ips, ip_prefixes, + outbound_ports, idle_timeout): return any([managed_outbound_ip_count, outbound_ips, ip_prefixes, diff --git a/src/azure-cli/azure/cli/command_modules/acs/custom.py b/src/azure-cli/azure/cli/command_modules/acs/custom.py index 8a0bdbc80e5..e85b30b9485 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/custom.py +++ b/src/azure-cli/azure/cli/command_modules/acs/custom.py @@ -86,7 +86,7 @@ from ._helpers import _populate_api_server_access_profile, _set_vm_set_type -from ._loadbalancer import (set_load_balancer_sku, is_load_balancer__profile_provided, +from ._loadbalancer import (set_load_balancer_sku, is_load_balancer_profile_provided, update_load_balancer_profile, create_load_balancer_profile) logger = get_logger(__name__) @@ -1975,11 +1975,11 @@ def aks_update(cmd, client, resource_group_name, name, api_server_authorized_ip_ranges=None, no_wait=False): update_autoscaler = enable_cluster_autoscaler + disable_cluster_autoscaler + update_cluster_autoscaler - update_lb_profile = is_load_balancer__profile_provided(load_balancer_managed_outbound_ip_count, - load_balancer_outbound_ips, - load_balancer_outbound_ip_prefixes, - load_balancer_outbound_ports, - load_balancer_idle_timeout) + update_lb_profile = is_load_balancer_profile_provided(load_balancer_managed_outbound_ip_count, + load_balancer_outbound_ips, + load_balancer_outbound_ip_prefixes, + load_balancer_outbound_ports, + load_balancer_idle_timeout) if (update_autoscaler != 1 and not update_lb_profile and not attach_acr and From 46363c39e5e33db97fc03fb3636175cd11085963 Mon Sep 17 00:00:00 2001 From: gtracer Date: Wed, 29 Jan 2020 09:04:25 -0800 Subject: [PATCH 11/14] add blank line --- src/azure-cli/azure/cli/command_modules/acs/custom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/azure/cli/command_modules/acs/custom.py b/src/azure-cli/azure/cli/command_modules/acs/custom.py index e85b30b9485..c22f2d4b463 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/custom.py +++ b/src/azure-cli/azure/cli/command_modules/acs/custom.py @@ -3286,4 +3286,4 @@ def openshift_monitor_disable(cmd, client, resource_group_name, name, no_wait=Fa instance = client.get(resource_group_name, name) monitor_profile = OpenShiftManagedClusterMonitorProfile(enabled=False, workspace_resource_id=None) # pylint: disable=line-too-long instance.monitor_profile = monitor_profile - return sdk_no_wait(no_wait, client.create_or_update, resource_group_name, name, instance) \ No newline at end of file + return sdk_no_wait(no_wait, client.create_or_update, resource_group_name, name, instance) From 5b4f0da45050346795799494eb8cefa259204a61 Mon Sep 17 00:00:00 2001 From: Feiyue Yu Date: Fri, 31 Jan 2020 15:25:07 +0800 Subject: [PATCH 12/14] use logger instead of print --- .../azure/cli/command_modules/acs/_loadbalancer.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py b/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py index 6c750ea78d1..5a691a36f16 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py +++ b/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py @@ -12,12 +12,16 @@ from azure.mgmt.containerservice.v2019_11_01.models import ManagedClusterLoadBalancerProfileOutboundIPs from azure.mgmt.containerservice.v2019_11_01.models import ResourceReference +from knack.log import get_logger + +logger = get_logger(__name__) + def set_load_balancer_sku(sku, kubernetes_version): if sku: return sku if kubernetes_version and StrictVersion(kubernetes_version) < StrictVersion("1.13.0"): - print('Setting load_balancer_sku to basic as it is not specified and kubernetes \ + logger.warning('Setting load_balancer_sku to basic as it is not specified and kubernetes \ version(%s) less than 1.13.0 only supports basic load balancer SKU\n' % (kubernetes_version)) return "basic" return "standard" From c3ab4e111af71a4dece3519b1a2f20fb7d1d6dab Mon Sep 17 00:00:00 2001 From: Feiyue Yu Date: Fri, 31 Jan 2020 15:39:02 +0800 Subject: [PATCH 13/14] Update _loadbalancer.py --- src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py b/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py index 5a691a36f16..e3e6d314bc1 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py +++ b/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py @@ -22,7 +22,7 @@ def set_load_balancer_sku(sku, kubernetes_version): return sku if kubernetes_version and StrictVersion(kubernetes_version) < StrictVersion("1.13.0"): logger.warning('Setting load_balancer_sku to basic as it is not specified and kubernetes \ - version(%s) less than 1.13.0 only supports basic load balancer SKU\n' % (kubernetes_version)) + version({}) less than 1.13.0 only supports basic load balancer SKU\n'.format(kubernetes_version)) return "basic" return "standard" From bdabf26809dcfa99eb4592ba5a2a037b95c994f5 Mon Sep 17 00:00:00 2001 From: Feiyue Yu Date: Fri, 31 Jan 2020 15:45:56 +0800 Subject: [PATCH 14/14] Update _loadbalancer.py --- src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py b/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py index e3e6d314bc1..ba798d99d82 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py +++ b/src/azure-cli/azure/cli/command_modules/acs/_loadbalancer.py @@ -21,8 +21,9 @@ def set_load_balancer_sku(sku, kubernetes_version): if sku: return sku if kubernetes_version and StrictVersion(kubernetes_version) < StrictVersion("1.13.0"): - logger.warning('Setting load_balancer_sku to basic as it is not specified and kubernetes \ - version({}) less than 1.13.0 only supports basic load balancer SKU\n'.format(kubernetes_version)) + logger.warning('Setting load_balancer_sku to basic as it is not specified and kubernetes' + 'version(%s) less than 1.13.0 only supports basic load balancer SKU\n', + kubernetes_version) return "basic" return "standard"