diff --git a/src/aks-preview/HISTORY.rst b/src/aks-preview/HISTORY.rst index 95716f5f936..c2c055cb49a 100644 --- a/src/aks-preview/HISTORY.rst +++ b/src/aks-preview/HISTORY.rst @@ -12,6 +12,9 @@ To release a new version, please select a new version number (usually plus 1 to Pending +++++++ +0.5.68 +++++++ +* Add option `Windows2019`, `Windows2022` to `--os-sku` for `az aks nodepool add`. 0.5.67 +++++++++++++++++++++ diff --git a/src/aks-preview/azcli_aks_live_test/configs/ext_matrix_default.json b/src/aks-preview/azcli_aks_live_test/configs/ext_matrix_default.json index 96f17666206..076b8d0fa76 100644 --- a/src/aks-preview/azcli_aks_live_test/configs/ext_matrix_default.json +++ b/src/aks-preview/azcli_aks_live_test/configs/ext_matrix_default.json @@ -25,7 +25,8 @@ "test_aks_create_with_crg_id", "test_aks_create_and_update_with_http_proxy_config", "test_aks_snapshot", - "test_aks_custom_kubelet_identity" + "test_aks_custom_kubelet_identity", + "test_aks_nodepool_add_with_ossku_windows2022" ] } } \ No newline at end of file diff --git a/src/aks-preview/azext_aks_preview/_completers.py b/src/aks-preview/azext_aks_preview/_completers.py index 712af92bfc0..b9632c0b513 100644 --- a/src/aks-preview/azext_aks_preview/_completers.py +++ b/src/aks-preview/azext_aks_preview/_completers.py @@ -8,6 +8,13 @@ from azext_aks_preview._client_factory import CUSTOM_MGMT_AKS_PREVIEW +from ._consts import ( + CONST_OS_SKU_UBUNTU, + CONST_OS_SKU_CBLMARINER, + CONST_OS_SKU_WINDOWS2019, + CONST_OS_SKU_WINDOWS2022, +) + @Completer def get_k8s_upgrades_completion_list(cmd, prefix, namespace, **kwargs): # pylint: disable=unused-argument @@ -63,10 +70,17 @@ def get_vm_sizes(cli_ctx, location): @Completer -def get_ossku_completion_list(cmd, prefix, namespace, **kwargs): # pylint: disable=unused-argument - """Return the list of allowed os-sku values""" +def get_cluster_ossku_completion_list(cmd, prefix, namespace, **kwargs): # pylint: disable=unused-argument + """Return the list of allowed os-sku values when create cluster""" + + return [CONST_OS_SKU_UBUNTU, CONST_OS_SKU_CBLMARINER] + + +@Completer +def get_nodepool_ossku_completion_list(cmd, prefix, namespace, **kwargs): # pylint: disable=unused-argument + """Return the list of allowed os-sku values when add nodepool""" - return ["Ubuntu", "CBLMariner"] + return [CONST_OS_SKU_UBUNTU, CONST_OS_SKU_CBLMARINER, CONST_OS_SKU_WINDOWS2019, CONST_OS_SKU_WINDOWS2022] def _get_location(cli_ctx, namespace): diff --git a/src/aks-preview/azext_aks_preview/_consts.py b/src/aks-preview/azext_aks_preview/_consts.py index ebdf9a127d9..164da6c670f 100644 --- a/src/aks-preview/azext_aks_preview/_consts.py +++ b/src/aks-preview/azext_aks_preview/_consts.py @@ -30,6 +30,8 @@ # os sku CONST_OS_SKU_UBUNTU = "Ubuntu" CONST_OS_SKU_CBLMARINER = "CBLMariner" +CONST_OS_SKU_WINDOWS2019 = "Windows2019" +CONST_OS_SKU_WINDOWS2022 = "Windows2022" # vm set type CONST_VIRTUAL_MACHINE_SCALE_SETS = "VirtualMachineScaleSets" diff --git a/src/aks-preview/azext_aks_preview/_help.py b/src/aks-preview/azext_aks_preview/_help.py index 8aaad7a8792..227284da8b1 100644 --- a/src/aks-preview/azext_aks_preview/_help.py +++ b/src/aks-preview/azext_aks_preview/_help.py @@ -1052,7 +1052,7 @@ short-summary: The OS Type. Linux or Windows. - name: --os-sku type: string - short-summary: The os-sku of the agent node pool. Ubuntu or CBLMariner. + short-summary: The os-sku of the agent node pool. Ubuntu or CBLMariner when os-type is Linux, default is Ubuntu if not set; Windows2019 or Windows2022 when os-type is Windows, the current default is Windows2019 if not set, and the default will be changed to Windows2022 after Windows2019 is deprecated. - name: --enable-fips-image type: bool short-summary: Use FIPS-enabled OS on agent nodes. diff --git a/src/aks-preview/azext_aks_preview/_params.py b/src/aks-preview/azext_aks_preview/_params.py index bd2d21d081e..26fcc194d52 100644 --- a/src/aks-preview/azext_aks_preview/_params.py +++ b/src/aks-preview/azext_aks_preview/_params.py @@ -24,7 +24,8 @@ from ._completers import ( get_k8s_upgrades_completion_list, get_k8s_versions_completion_list, - get_ossku_completion_list, + get_cluster_ossku_completion_list, + get_nodepool_ossku_completion_list, get_vm_size_completion_list, ) from ._consts import ( @@ -48,6 +49,8 @@ CONST_OS_DISK_TYPE_MANAGED, CONST_OS_SKU_CBLMARINER, CONST_OS_SKU_UBUNTU, + CONST_OS_SKU_WINDOWS2019, + CONST_OS_SKU_WINDOWS2022, CONST_OUTBOUND_TYPE_LOAD_BALANCER, CONST_OUTBOUND_TYPE_MANAGED_NAT_GATEWAY, CONST_OUTBOUND_TYPE_USER_ASSIGNED_NAT_GATEWAY, @@ -116,7 +119,7 @@ node_eviction_policies = [CONST_SPOT_EVICTION_POLICY_DELETE, CONST_SPOT_EVICTION_POLICY_DEALLOCATE] node_os_disk_types = [CONST_OS_DISK_TYPE_MANAGED, CONST_OS_DISK_TYPE_EPHEMERAL] node_mode_types = [CONST_NODEPOOL_MODE_SYSTEM, CONST_NODEPOOL_MODE_USER] -node_os_skus = [CONST_OS_SKU_UBUNTU, CONST_OS_SKU_CBLMARINER] +node_os_skus = [CONST_OS_SKU_UBUNTU, CONST_OS_SKU_CBLMARINER, CONST_OS_SKU_WINDOWS2019, CONST_OS_SKU_WINDOWS2022] scale_down_modes = [CONST_SCALE_DOWN_MODE_DELETE, CONST_SCALE_DOWN_MODE_DEALLOCATE] workload_runtimes = [CONST_WORKLOAD_RUNTIME_OCI_CONTAINER, CONST_WORKLOAD_RUNTIME_WASM_WASI] gpu_instance_profiles = [ @@ -243,7 +246,7 @@ def load_arguments(self, _): help='Node pool name, upto 12 alphanumeric characters', validator=validate_nodepool_name) c.argument('node_vm_size', options_list=[ '--node-vm-size', '-s'], completer=get_vm_size_completion_list) - c.argument('os_sku', completer=get_ossku_completion_list) + c.argument('os_sku', completer=get_cluster_ossku_completion_list) c.argument('vnet_subnet_id', validator=validate_vnet_subnet_id) c.argument('pod_subnet_id', validator=validate_pod_subnet_id) c.argument('enable_node_public_ip', action='store_true') @@ -411,7 +414,7 @@ def load_arguments(self, _): '--node-vm-size', '-s'], completer=get_vm_size_completion_list) c.argument('os_type') c.argument('os_sku', options_list=[ - '--os-sku'], completer=get_ossku_completion_list) + '--os-sku'], completer=get_nodepool_ossku_completion_list) c.argument('vnet_subnet_id', validator=validate_vnet_subnet_id) c.argument('pod_subnet_id', diff --git a/src/aks-preview/azext_aks_preview/tests/latest/recordings/test_aks_nodepool_add_with_ossku_windows2022.yaml b/src/aks-preview/azext_aks_preview/tests/latest/recordings/test_aks_nodepool_add_with_ossku_windows2022.yaml new file mode 100644 index 00000000000..e4edf531ca8 --- /dev/null +++ b/src/aks-preview/azext_aks_preview/tests/latest/recordings/test_aks_nodepool_add_with_ossku_windows2022.yaml @@ -0,0 +1,1283 @@ +interactions: +- request: + body: null + headers: + Accept: + - application/json + Accept-Encoding: + - gzip, deflate + CommandName: + - aks get-versions + Connection: + - keep-alive + ParameterSetName: + - -l --query + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0 Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/orchestrators?api-version=2019-04-01&resource-type=managedClusters + response: + body: + string: "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/orchestrators\",\n + \ \"name\": \"default\",\n \"type\": \"Microsoft.ContainerService/locations/orchestrators\",\n + \ \"properties\": {\n \"orchestrators\": [\n {\n \"orchestratorType\": + \"Kubernetes\",\n \"orchestratorVersion\": \"1.21.7\",\n \"upgrades\": + [\n {\n \"orchestratorType\": \"Kubernetes\",\n \"orchestratorVersion\": + \"1.21.9\"\n },\n {\n \"orchestratorType\": \"Kubernetes\",\n + \ \"orchestratorVersion\": \"1.22.4\"\n },\n {\n \"orchestratorType\": + \"Kubernetes\",\n \"orchestratorVersion\": \"1.22.6\"\n }\n ]\n + \ },\n {\n \"orchestratorType\": \"Kubernetes\",\n \"orchestratorVersion\": + \"1.21.9\",\n \"upgrades\": [\n {\n \"orchestratorType\": \"Kubernetes\",\n + \ \"orchestratorVersion\": \"1.22.4\"\n },\n {\n \"orchestratorType\": + \"Kubernetes\",\n \"orchestratorVersion\": \"1.22.6\"\n }\n ]\n + \ },\n {\n \"orchestratorType\": \"Kubernetes\",\n \"orchestratorVersion\": + \"1.22.4\",\n \"upgrades\": [\n {\n \"orchestratorType\": \"Kubernetes\",\n + \ \"orchestratorVersion\": \"1.22.6\"\n },\n {\n \"orchestratorType\": + \"Kubernetes\",\n \"orchestratorVersion\": \"1.23.3\"\n },\n {\n + \ \"orchestratorType\": \"Kubernetes\",\n \"orchestratorVersion\": + \"1.23.5\"\n }\n ]\n },\n {\n \"orchestratorType\": \"Kubernetes\",\n + \ \"orchestratorVersion\": \"1.22.6\",\n \"default\": true,\n \"upgrades\": + [\n {\n \"orchestratorType\": \"Kubernetes\",\n \"orchestratorVersion\": + \"1.23.3\"\n },\n {\n \"orchestratorType\": \"Kubernetes\",\n + \ \"orchestratorVersion\": \"1.23.5\"\n }\n ]\n },\n {\n + \ \"orchestratorType\": \"Kubernetes\",\n \"orchestratorVersion\": + \"1.23.3\",\n \"upgrades\": [\n {\n \"orchestratorType\": \"Kubernetes\",\n + \ \"orchestratorVersion\": \"1.23.5\"\n }\n ]\n },\n {\n + \ \"orchestratorType\": \"Kubernetes\",\n \"orchestratorVersion\": + \"1.23.5\"\n }\n ]\n }\n }" + headers: + cache-control: + - no-cache + content-length: + - '2022' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:14:20 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + status: + code: 200 + message: OK +- request: + body: '{"location": "westus2", "identity": {"type": "SystemAssigned"}, "properties": + {"kubernetesVersion": "1.23.5", "dnsPrefix": "cliaksdns000002", "agentPoolProfiles": + [{"count": 1, "vmSize": "Standard_DS2_v2", "workloadRuntime": "OCIContainer", + "osType": "Linux", "enableAutoScaling": false, "type": "VirtualMachineScaleSets", + "mode": "System", "enableNodePublicIP": false, "scaleSetPriority": "Regular", + "scaleSetEvictionPolicy": "Delete", "spotMaxPrice": -1.0, "enableEncryptionAtHost": + false, "enableUltraSSD": false, "enableFIPS": false, "name": "nodepool1"}], + "linuxProfile": {"adminUsername": "azureuser", "ssh": {"publicKeys": [{"keyData": + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsMRN6qC4PIzt0V47z0xSwm0sC3e6uD5eNWMJBF75l7hEjmys53pC8IPkDzs9WiwrE+0WK2stuJlFYBO56aLH9HVy3Y0mpjbSqGcNjcfi00OypBtRAjk1z9P4zEoIVoU0Ijfithq2OPrq6b0LuPNwQFpDQlSmSY8pr4vvTmi3xVIe+EQ7dGYmgE4xpNiHz8tT2EkKiPatecdVcyMYX1bXfUa8AllSPEqPnNoRUh9huDtU/Z+iouAaPK0B/rBobgt8fFSwmE6qmUsTwnX0lcs7/J/jut9o22u1+1gD44SlbA8IM/GHgiuf2W6y9HChD5e78Mdv44PR7sNnCjRxEMbcr + azcli_aks_live_test@example.com\n"}]}}, "windowsProfile": {"adminUsername": + "azureuser1", "adminPassword": "replace-Password1234$"}, "addonProfiles": {}, + "enableRBAC": true, "enablePodSecurityPolicy": false, "networkProfile": {"networkPlugin": + "azure", "outboundType": "loadBalancer", "loadBalancerSku": "standard"}, "disableLocalAccounts": + false, "storageProfile": {"diskCSIDriver": {"enabled": true}, "fileCSIDriver": + {"enabled": true}, "snapshotController": {"enabled": true}}}}' + headers: + Accept: + - application/json + Accept-Encoding: + - gzip, deflate + CommandName: + - aks create + Connection: + - keep-alive + Content-Length: + - '1506' + Content-Type: + - application/json + ParameterSetName: + - --resource-group --name --location --dns-name-prefix --node-count --windows-admin-username + --windows-admin-password --load-balancer-sku --vm-set-type --network-plugin + --ssh-key-value --kubernetes-version + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: PUT + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2022-04-02-preview + response: + body: + string: "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\",\n + \ \"location\": \"westus2\",\n \"name\": \"cliakstest000001\",\n \"type\": + \"Microsoft.ContainerService/ManagedClusters\",\n \"properties\": {\n \"provisioningState\": + \"Creating\",\n \"powerState\": {\n \"code\": \"Running\"\n },\n \"kubernetesVersion\": + \"1.23.5\",\n \"currentKubernetesVersion\": \"1.23.5\",\n \"dnsPrefix\": + \"cliaksdns000002\",\n \"fqdn\": \"cliaksdns000002-3ea736f7.hcp.westus2.azmk8s.io\",\n + \ \"azurePortalFQDN\": \"cliaksdns000002-3ea736f7.portal.hcp.westus2.azmk8s.io\",\n + \ \"agentPoolProfiles\": [\n {\n \"name\": \"nodepool1\",\n \"count\": + 1,\n \"vmSize\": \"Standard_DS2_v2\",\n \"osDiskSizeGB\": 128,\n \"osDiskType\": + \"Managed\",\n \"kubeletDiskType\": \"OS\",\n \"workloadRuntime\": + \"OCIContainer\",\n \"maxPods\": 30,\n \"type\": \"VirtualMachineScaleSets\",\n + \ \"enableAutoScaling\": false,\n \"provisioningState\": \"Creating\",\n + \ \"powerState\": {\n \"code\": \"Running\"\n },\n \"orchestratorVersion\": + \"1.23.5\",\n \"enableNodePublicIP\": false,\n \"mode\": \"System\",\n + \ \"enableEncryptionAtHost\": false,\n \"enableUltraSSD\": false,\n + \ \"osType\": \"Linux\",\n \"osSKU\": \"Ubuntu\",\n \"nodeImageVersion\": + \"AKSUbuntu-1804gen2containerd-2022.04.27\",\n \"enableFIPS\": false\n + \ }\n ],\n \"linuxProfile\": {\n \"adminUsername\": \"azureuser\",\n + \ \"ssh\": {\n \"publicKeys\": [\n {\n \"keyData\": \"ssh-rsa + AAAAB3NzaC1yc2EAAAADAQABAAABAQCsMRN6qC4PIzt0V47z0xSwm0sC3e6uD5eNWMJBF75l7hEjmys53pC8IPkDzs9WiwrE+0WK2stuJlFYBO56aLH9HVy3Y0mpjbSqGcNjcfi00OypBtRAjk1z9P4zEoIVoU0Ijfithq2OPrq6b0LuPNwQFpDQlSmSY8pr4vvTmi3xVIe+EQ7dGYmgE4xpNiHz8tT2EkKiPatecdVcyMYX1bXfUa8AllSPEqPnNoRUh9huDtU/Z+iouAaPK0B/rBobgt8fFSwmE6qmUsTwnX0lcs7/J/jut9o22u1+1gD44SlbA8IM/GHgiuf2W6y9HChD5e78Mdv44PR7sNnCjRxEMbcr + azcli_aks_live_test@example.com\\n\"\n }\n ]\n }\n },\n \"windowsProfile\": + {\n \"adminUsername\": \"azureuser1\",\n \"enableCSIProxy\": true\n + \ },\n \"servicePrincipalProfile\": {\n \"clientId\":\"00000000-0000-0000-0000-000000000001\"\n + \ },\n \"nodeResourceGroup\": \"MC_clitest000001_cliakstest000001_westus2\",\n + \ \"enableRBAC\": true,\n \"enablePodSecurityPolicy\": false,\n \"networkProfile\": + {\n \"networkPlugin\": \"azure\",\n \"loadBalancerSku\": \"standard\",\n + \ \"loadBalancerProfile\": {\n \"managedOutboundIPs\": {\n \"count\": + 1\n }\n },\n \"serviceCidr\": \"10.0.0.0/16\",\n \"dnsServiceIP\": + \"10.0.0.10\",\n \"dockerBridgeCidr\": \"172.17.0.1/16\",\n \"outboundType\": + \"loadBalancer\",\n \"serviceCidrs\": [\n \"10.0.0.0/16\"\n ],\n + \ \"ipFamilies\": [\n \"IPv4\"\n ]\n },\n \"maxAgentPools\": + 100,\n \"disableLocalAccounts\": false,\n \"securityProfile\": {},\n \"storageProfile\": + {\n \"diskCSIDriver\": {\n \"enabled\": true\n },\n \"fileCSIDriver\": + {\n \"enabled\": true\n },\n \"snapshotController\": {\n \"enabled\": + true\n }\n },\n \"oidcIssuerProfile\": {\n \"enabled\": false\n + \ }\n },\n \"identity\": {\n \"type\": \"SystemAssigned\",\n \"principalId\":\"00000000-0000-0000-0000-000000000001\",\n + \ \"tenantId\": \"72f988bf-86f1-41af-91ab-2d7cd011db47\"\n },\n \"sku\": + {\n \"name\": \"Basic\",\n \"tier\": \"Free\"\n }\n }" + headers: + azure-asyncoperation: + - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/operations/e8dff0b7-dc56-45e5-b6c1-5d6303b183db?api-version=2016-03-30 + cache-control: + - no-cache + content-length: + - '3189' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:14:23 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + x-content-type-options: + - nosniff + x-ms-ratelimit-remaining-subscription-writes: + - '1199' + status: + code: 201 + message: Created +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - aks create + Connection: + - keep-alive + ParameterSetName: + - --resource-group --name --location --dns-name-prefix --node-count --windows-admin-username + --windows-admin-password --load-balancer-sku --vm-set-type --network-plugin + --ssh-key-value --kubernetes-version + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/operations/e8dff0b7-dc56-45e5-b6c1-5d6303b183db?api-version=2016-03-30 + response: + body: + string: "{\n \"name\": \"b7f0dfe8-56dc-e545-b6c1-5d6303b183db\",\n \"status\": + \"InProgress\",\n \"startTime\": \"2022-05-11T13:14:24.4433333Z\"\n }" + headers: + cache-control: + - no-cache + content-length: + - '126' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:14:54 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - aks create + Connection: + - keep-alive + ParameterSetName: + - --resource-group --name --location --dns-name-prefix --node-count --windows-admin-username + --windows-admin-password --load-balancer-sku --vm-set-type --network-plugin + --ssh-key-value --kubernetes-version + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/operations/e8dff0b7-dc56-45e5-b6c1-5d6303b183db?api-version=2016-03-30 + response: + body: + string: "{\n \"name\": \"b7f0dfe8-56dc-e545-b6c1-5d6303b183db\",\n \"status\": + \"InProgress\",\n \"startTime\": \"2022-05-11T13:14:24.4433333Z\"\n }" + headers: + cache-control: + - no-cache + content-length: + - '126' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:15:24 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - aks create + Connection: + - keep-alive + ParameterSetName: + - --resource-group --name --location --dns-name-prefix --node-count --windows-admin-username + --windows-admin-password --load-balancer-sku --vm-set-type --network-plugin + --ssh-key-value --kubernetes-version + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/operations/e8dff0b7-dc56-45e5-b6c1-5d6303b183db?api-version=2016-03-30 + response: + body: + string: "{\n \"name\": \"b7f0dfe8-56dc-e545-b6c1-5d6303b183db\",\n \"status\": + \"InProgress\",\n \"startTime\": \"2022-05-11T13:14:24.4433333Z\"\n }" + headers: + cache-control: + - no-cache + content-length: + - '126' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:15:54 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - aks create + Connection: + - keep-alive + ParameterSetName: + - --resource-group --name --location --dns-name-prefix --node-count --windows-admin-username + --windows-admin-password --load-balancer-sku --vm-set-type --network-plugin + --ssh-key-value --kubernetes-version + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/operations/e8dff0b7-dc56-45e5-b6c1-5d6303b183db?api-version=2016-03-30 + response: + body: + string: "{\n \"name\": \"b7f0dfe8-56dc-e545-b6c1-5d6303b183db\",\n \"status\": + \"InProgress\",\n \"startTime\": \"2022-05-11T13:14:24.4433333Z\"\n }" + headers: + cache-control: + - no-cache + content-length: + - '126' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:16:24 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - aks create + Connection: + - keep-alive + ParameterSetName: + - --resource-group --name --location --dns-name-prefix --node-count --windows-admin-username + --windows-admin-password --load-balancer-sku --vm-set-type --network-plugin + --ssh-key-value --kubernetes-version + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/operations/e8dff0b7-dc56-45e5-b6c1-5d6303b183db?api-version=2016-03-30 + response: + body: + string: "{\n \"name\": \"b7f0dfe8-56dc-e545-b6c1-5d6303b183db\",\n \"status\": + \"InProgress\",\n \"startTime\": \"2022-05-11T13:14:24.4433333Z\"\n }" + headers: + cache-control: + - no-cache + content-length: + - '126' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:16:54 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - aks create + Connection: + - keep-alive + ParameterSetName: + - --resource-group --name --location --dns-name-prefix --node-count --windows-admin-username + --windows-admin-password --load-balancer-sku --vm-set-type --network-plugin + --ssh-key-value --kubernetes-version + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/operations/e8dff0b7-dc56-45e5-b6c1-5d6303b183db?api-version=2016-03-30 + response: + body: + string: "{\n \"name\": \"b7f0dfe8-56dc-e545-b6c1-5d6303b183db\",\n \"status\": + \"Succeeded\",\n \"startTime\": \"2022-05-11T13:14:24.4433333Z\",\n \"endTime\": + \"2022-05-11T13:17:10.2382758Z\"\n }" + headers: + cache-control: + - no-cache + content-length: + - '170' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:17:24 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - aks create + Connection: + - keep-alive + ParameterSetName: + - --resource-group --name --location --dns-name-prefix --node-count --windows-admin-username + --windows-admin-password --load-balancer-sku --vm-set-type --network-plugin + --ssh-key-value --kubernetes-version + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2022-04-02-preview + response: + body: + string: "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001\",\n + \ \"location\": \"westus2\",\n \"name\": \"cliakstest000001\",\n \"type\": + \"Microsoft.ContainerService/ManagedClusters\",\n \"properties\": {\n \"provisioningState\": + \"Succeeded\",\n \"powerState\": {\n \"code\": \"Running\"\n },\n \"kubernetesVersion\": + \"1.23.5\",\n \"currentKubernetesVersion\": \"1.23.5\",\n \"dnsPrefix\": + \"cliaksdns000002\",\n \"fqdn\": \"cliaksdns000002-3ea736f7.hcp.westus2.azmk8s.io\",\n + \ \"azurePortalFQDN\": \"cliaksdns000002-3ea736f7.portal.hcp.westus2.azmk8s.io\",\n + \ \"agentPoolProfiles\": [\n {\n \"name\": \"nodepool1\",\n \"count\": + 1,\n \"vmSize\": \"Standard_DS2_v2\",\n \"osDiskSizeGB\": 128,\n \"osDiskType\": + \"Managed\",\n \"kubeletDiskType\": \"OS\",\n \"workloadRuntime\": + \"OCIContainer\",\n \"maxPods\": 30,\n \"type\": \"VirtualMachineScaleSets\",\n + \ \"enableAutoScaling\": false,\n \"provisioningState\": \"Succeeded\",\n + \ \"powerState\": {\n \"code\": \"Running\"\n },\n \"orchestratorVersion\": + \"1.23.5\",\n \"enableNodePublicIP\": false,\n \"mode\": \"System\",\n + \ \"enableEncryptionAtHost\": false,\n \"enableUltraSSD\": false,\n + \ \"osType\": \"Linux\",\n \"osSKU\": \"Ubuntu\",\n \"nodeImageVersion\": + \"AKSUbuntu-1804gen2containerd-2022.04.27\",\n \"enableFIPS\": false\n + \ }\n ],\n \"linuxProfile\": {\n \"adminUsername\": \"azureuser\",\n + \ \"ssh\": {\n \"publicKeys\": [\n {\n \"keyData\": \"ssh-rsa + AAAAB3NzaC1yc2EAAAADAQABAAABAQCsMRN6qC4PIzt0V47z0xSwm0sC3e6uD5eNWMJBF75l7hEjmys53pC8IPkDzs9WiwrE+0WK2stuJlFYBO56aLH9HVy3Y0mpjbSqGcNjcfi00OypBtRAjk1z9P4zEoIVoU0Ijfithq2OPrq6b0LuPNwQFpDQlSmSY8pr4vvTmi3xVIe+EQ7dGYmgE4xpNiHz8tT2EkKiPatecdVcyMYX1bXfUa8AllSPEqPnNoRUh9huDtU/Z+iouAaPK0B/rBobgt8fFSwmE6qmUsTwnX0lcs7/J/jut9o22u1+1gD44SlbA8IM/GHgiuf2W6y9HChD5e78Mdv44PR7sNnCjRxEMbcr + azcli_aks_live_test@example.com\\n\"\n }\n ]\n }\n },\n \"windowsProfile\": + {\n \"adminUsername\": \"azureuser1\",\n \"enableCSIProxy\": true\n + \ },\n \"servicePrincipalProfile\": {\n \"clientId\":\"00000000-0000-0000-0000-000000000001\"\n + \ },\n \"nodeResourceGroup\": \"MC_clitest000001_cliakstest000001_westus2\",\n + \ \"enableRBAC\": true,\n \"enablePodSecurityPolicy\": false,\n \"networkProfile\": + {\n \"networkPlugin\": \"azure\",\n \"loadBalancerSku\": \"Standard\",\n + \ \"loadBalancerProfile\": {\n \"managedOutboundIPs\": {\n \"count\": + 1\n },\n \"effectiveOutboundIPs\": [\n {\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MC_clitest000001_cliakstest000001_westus2/providers/Microsoft.Network/publicIPAddresses/360543c9-cb61-4619-8073-dbfe19a4d796\"\n + \ }\n ]\n },\n \"serviceCidr\": \"10.0.0.0/16\",\n \"dnsServiceIP\": + \"10.0.0.10\",\n \"dockerBridgeCidr\": \"172.17.0.1/16\",\n \"outboundType\": + \"loadBalancer\",\n \"serviceCidrs\": [\n \"10.0.0.0/16\"\n ],\n + \ \"ipFamilies\": [\n \"IPv4\"\n ]\n },\n \"maxAgentPools\": + 100,\n \"identityProfile\": {\n \"kubeletidentity\": {\n \"resourceId\": + \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/MC_clitest000001_cliakstest000001_westus2/providers/Microsoft.ManagedIdentity/userAssignedIdentities/cliakstest000001-agentpool\",\n + \ \"clientId\":\"00000000-0000-0000-0000-000000000001\",\n \"objectId\":\"00000000-0000-0000-0000-000000000001\"\n + \ }\n },\n \"disableLocalAccounts\": false,\n \"securityProfile\": + {},\n \"storageProfile\": {\n \"diskCSIDriver\": {\n \"enabled\": + true\n },\n \"fileCSIDriver\": {\n \"enabled\": true\n },\n \"snapshotController\": + {\n \"enabled\": true\n }\n },\n \"oidcIssuerProfile\": {\n \"enabled\": + false\n }\n },\n \"identity\": {\n \"type\": \"SystemAssigned\",\n \"principalId\":\"00000000-0000-0000-0000-000000000001\",\n + \ \"tenantId\": \"72f988bf-86f1-41af-91ab-2d7cd011db47\"\n },\n \"sku\": + {\n \"name\": \"Basic\",\n \"tier\": \"Free\"\n }\n }" + headers: + cache-control: + - no-cache + content-length: + - '3842' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:17:25 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - application/json + Accept-Encoding: + - gzip, deflate + CommandName: + - aks nodepool add + Connection: + - keep-alive + ParameterSetName: + - --resource-group --cluster-name --name --node-count --os-type --os-sku + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools?api-version=2022-04-02-preview + response: + body: + string: "{\n \"value\": [\n {\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool1\",\n + \ \"name\": \"nodepool1\",\n \"type\": \"Microsoft.ContainerService/managedClusters/agentPools\",\n + \ \"properties\": {\n \"count\": 1,\n \"vmSize\": \"Standard_DS2_v2\",\n + \ \"osDiskSizeGB\": 128,\n \"osDiskType\": \"Managed\",\n \"kubeletDiskType\": + \"OS\",\n \"workloadRuntime\": \"OCIContainer\",\n \"maxPods\": 30,\n + \ \"type\": \"VirtualMachineScaleSets\",\n \"enableAutoScaling\": false,\n + \ \"provisioningState\": \"Succeeded\",\n \"powerState\": {\n \"code\": + \"Running\"\n },\n \"orchestratorVersion\": \"1.23.5\",\n \"enableNodePublicIP\": + false,\n \"mode\": \"System\",\n \"enableEncryptionAtHost\": false,\n + \ \"enableUltraSSD\": false,\n \"osType\": \"Linux\",\n \"osSKU\": + \"Ubuntu\",\n \"nodeImageVersion\": \"AKSUbuntu-1804gen2containerd-2022.04.27\",\n + \ \"enableFIPS\": false\n }\n }\n ]\n }" + headers: + cache-control: + - no-cache + content-length: + - '1002' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:17:26 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + status: + code: 200 + message: OK +- request: + body: '{"properties": {"count": 1, "vmSize": "Standard_D2s_v3", "workloadRuntime": + "OCIContainer", "osType": "Windows", "osSKU": "Windows2022", "scaleDownMode": + "Delete", "mode": "User", "upgradeSettings": {}, "enableNodePublicIP": false, + "scaleSetPriority": "Regular", "scaleSetEvictionPolicy": "Delete", "spotMaxPrice": + -1.0, "nodeTaints": [], "enableEncryptionAtHost": false, "enableUltraSSD": false, + "enableFIPS": false}}' + headers: + Accept: + - application/json + Accept-Encoding: + - gzip, deflate + CommandName: + - aks nodepool add + Connection: + - keep-alive + Content-Length: + - '418' + Content-Type: + - application/json + ParameterSetName: + - --resource-group --cluster-name --name --node-count --os-type --os-sku + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: PUT + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/npwin?api-version=2022-04-02-preview + response: + body: + string: "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/npwin\",\n + \ \"name\": \"npwin\",\n \"type\": \"Microsoft.ContainerService/managedClusters/agentPools\",\n + \ \"properties\": {\n \"count\": 1,\n \"vmSize\": \"Standard_D2s_v3\",\n + \ \"osDiskSizeGB\": 128,\n \"osDiskType\": \"Managed\",\n \"kubeletDiskType\": + \"OS\",\n \"workloadRuntime\": \"OCIContainer\",\n \"maxPods\": 30,\n + \ \"type\": \"VirtualMachineScaleSets\",\n \"scaleDownMode\": \"Delete\",\n + \ \"provisioningState\": \"Creating\",\n \"powerState\": {\n \"code\": + \"Running\"\n },\n \"orchestratorVersion\": \"1.23.5\",\n \"enableNodePublicIP\": + false,\n \"mode\": \"User\",\n \"enableEncryptionAtHost\": false,\n \"enableUltraSSD\": + false,\n \"osType\": \"Windows\",\n \"osSKU\": \"Windows2022\",\n \"nodeImageVersion\": + \"AKSWindows-2022-containerd-20348.681.220426\",\n \"upgradeSettings\": + {},\n \"enableFIPS\": false\n }\n }" + headers: + azure-asyncoperation: + - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/operations/a37fccab-53b2-401a-befd-288c7372664c?api-version=2016-03-30 + cache-control: + - no-cache + content-length: + - '946' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:17:29 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + x-content-type-options: + - nosniff + x-ms-ratelimit-remaining-subscription-writes: + - '1199' + status: + code: 201 + message: Created +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - aks nodepool add + Connection: + - keep-alive + ParameterSetName: + - --resource-group --cluster-name --name --node-count --os-type --os-sku + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/operations/a37fccab-53b2-401a-befd-288c7372664c?api-version=2016-03-30 + response: + body: + string: "{\n \"name\": \"abcc7fa3-b253-1a40-befd-288c7372664c\",\n \"status\": + \"InProgress\",\n \"startTime\": \"2022-05-11T13:17:30.0266666Z\"\n }" + headers: + cache-control: + - no-cache + content-length: + - '126' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:17:59 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - aks nodepool add + Connection: + - keep-alive + ParameterSetName: + - --resource-group --cluster-name --name --node-count --os-type --os-sku + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/operations/a37fccab-53b2-401a-befd-288c7372664c?api-version=2016-03-30 + response: + body: + string: "{\n \"name\": \"abcc7fa3-b253-1a40-befd-288c7372664c\",\n \"status\": + \"InProgress\",\n \"startTime\": \"2022-05-11T13:17:30.0266666Z\"\n }" + headers: + cache-control: + - no-cache + content-length: + - '126' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:18:29 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - aks nodepool add + Connection: + - keep-alive + ParameterSetName: + - --resource-group --cluster-name --name --node-count --os-type --os-sku + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/operations/a37fccab-53b2-401a-befd-288c7372664c?api-version=2016-03-30 + response: + body: + string: "{\n \"name\": \"abcc7fa3-b253-1a40-befd-288c7372664c\",\n \"status\": + \"InProgress\",\n \"startTime\": \"2022-05-11T13:17:30.0266666Z\"\n }" + headers: + cache-control: + - no-cache + content-length: + - '126' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:18:59 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - aks nodepool add + Connection: + - keep-alive + ParameterSetName: + - --resource-group --cluster-name --name --node-count --os-type --os-sku + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/operations/a37fccab-53b2-401a-befd-288c7372664c?api-version=2016-03-30 + response: + body: + string: "{\n \"name\": \"abcc7fa3-b253-1a40-befd-288c7372664c\",\n \"status\": + \"InProgress\",\n \"startTime\": \"2022-05-11T13:17:30.0266666Z\"\n }" + headers: + cache-control: + - no-cache + content-length: + - '126' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:19:30 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - aks nodepool add + Connection: + - keep-alive + ParameterSetName: + - --resource-group --cluster-name --name --node-count --os-type --os-sku + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/operations/a37fccab-53b2-401a-befd-288c7372664c?api-version=2016-03-30 + response: + body: + string: "{\n \"name\": \"abcc7fa3-b253-1a40-befd-288c7372664c\",\n \"status\": + \"InProgress\",\n \"startTime\": \"2022-05-11T13:17:30.0266666Z\"\n }" + headers: + cache-control: + - no-cache + content-length: + - '126' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:20:00 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - aks nodepool add + Connection: + - keep-alive + ParameterSetName: + - --resource-group --cluster-name --name --node-count --os-type --os-sku + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/operations/a37fccab-53b2-401a-befd-288c7372664c?api-version=2016-03-30 + response: + body: + string: "{\n \"name\": \"abcc7fa3-b253-1a40-befd-288c7372664c\",\n \"status\": + \"InProgress\",\n \"startTime\": \"2022-05-11T13:17:30.0266666Z\"\n }" + headers: + cache-control: + - no-cache + content-length: + - '126' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:20:30 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - aks nodepool add + Connection: + - keep-alive + ParameterSetName: + - --resource-group --cluster-name --name --node-count --os-type --os-sku + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/operations/a37fccab-53b2-401a-befd-288c7372664c?api-version=2016-03-30 + response: + body: + string: "{\n \"name\": \"abcc7fa3-b253-1a40-befd-288c7372664c\",\n \"status\": + \"InProgress\",\n \"startTime\": \"2022-05-11T13:17:30.0266666Z\"\n }" + headers: + cache-control: + - no-cache + content-length: + - '126' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:21:00 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - aks nodepool add + Connection: + - keep-alive + ParameterSetName: + - --resource-group --cluster-name --name --node-count --os-type --os-sku + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/operations/a37fccab-53b2-401a-befd-288c7372664c?api-version=2016-03-30 + response: + body: + string: "{\n \"name\": \"abcc7fa3-b253-1a40-befd-288c7372664c\",\n \"status\": + \"InProgress\",\n \"startTime\": \"2022-05-11T13:17:30.0266666Z\"\n }" + headers: + cache-control: + - no-cache + content-length: + - '126' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:21:30 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - aks nodepool add + Connection: + - keep-alive + ParameterSetName: + - --resource-group --cluster-name --name --node-count --os-type --os-sku + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/operations/a37fccab-53b2-401a-befd-288c7372664c?api-version=2016-03-30 + response: + body: + string: "{\n \"name\": \"abcc7fa3-b253-1a40-befd-288c7372664c\",\n \"status\": + \"InProgress\",\n \"startTime\": \"2022-05-11T13:17:30.0266666Z\"\n }" + headers: + cache-control: + - no-cache + content-length: + - '126' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:21:59 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - aks nodepool add + Connection: + - keep-alive + ParameterSetName: + - --resource-group --cluster-name --name --node-count --os-type --os-sku + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/operations/a37fccab-53b2-401a-befd-288c7372664c?api-version=2016-03-30 + response: + body: + string: "{\n \"name\": \"abcc7fa3-b253-1a40-befd-288c7372664c\",\n \"status\": + \"Succeeded\",\n \"startTime\": \"2022-05-11T13:17:30.0266666Z\",\n \"endTime\": + \"2022-05-11T13:22:29.7988562Z\"\n }" + headers: + cache-control: + - no-cache + content-length: + - '170' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:22:30 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - aks nodepool add + Connection: + - keep-alive + ParameterSetName: + - --resource-group --cluster-name --name --node-count --os-type --os-sku + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/npwin?api-version=2022-04-02-preview + response: + body: + string: "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/npwin\",\n + \ \"name\": \"npwin\",\n \"type\": \"Microsoft.ContainerService/managedClusters/agentPools\",\n + \ \"properties\": {\n \"count\": 1,\n \"vmSize\": \"Standard_D2s_v3\",\n + \ \"osDiskSizeGB\": 128,\n \"osDiskType\": \"Managed\",\n \"kubeletDiskType\": + \"OS\",\n \"workloadRuntime\": \"OCIContainer\",\n \"maxPods\": 30,\n + \ \"type\": \"VirtualMachineScaleSets\",\n \"scaleDownMode\": \"Delete\",\n + \ \"provisioningState\": \"Succeeded\",\n \"powerState\": {\n \"code\": + \"Running\"\n },\n \"orchestratorVersion\": \"1.23.5\",\n \"enableNodePublicIP\": + false,\n \"mode\": \"User\",\n \"enableEncryptionAtHost\": false,\n \"enableUltraSSD\": + false,\n \"osType\": \"Windows\",\n \"osSKU\": \"Windows2022\",\n \"nodeImageVersion\": + \"AKSWindows-2022-containerd-20348.681.220426\",\n \"upgradeSettings\": + {},\n \"enableFIPS\": false\n }\n }" + headers: + cache-control: + - no-cache + content-length: + - '947' + content-type: + - application/json + date: + - Wed, 11 May 2022 13:22:31 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - application/json + Accept-Encoding: + - gzip, deflate + CommandName: + - aks delete + Connection: + - keep-alive + Content-Length: + - '0' + ParameterSetName: + - -g -n --yes --no-wait + User-Agent: + - AZURECLI/2.36.0 azsdk-python-azure-mgmt-containerservice/19.0.0b Python/3.8.10 + (Linux-5.13.0-1022-azure-x86_64-with-glibc2.29) + method: DELETE + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001?api-version=2022-04-02-preview + response: + body: + string: '' + headers: + azure-asyncoperation: + - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/operations/0e363a09-89f9-43ca-8fe3-d49b4f199f28?api-version=2016-03-30 + cache-control: + - no-cache + content-length: + - '0' + date: + - Wed, 11 May 2022 13:22:32 GMT + expires: + - '-1' + location: + - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/westus2/operationresults/0e363a09-89f9-43ca-8fe3-d49b4f199f28?api-version=2016-03-30 + pragma: + - no-cache + server: + - nginx + strict-transport-security: + - max-age=31536000; includeSubDomains + x-content-type-options: + - nosniff + x-ms-ratelimit-remaining-subscription-deletes: + - '14999' + status: + code: 202 + message: Accepted +version: 1 diff --git a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py index 3108b4b5c55..0ec5465c39b 100644 --- a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py +++ b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py @@ -1336,6 +1336,57 @@ def test_aks_nodepool_add_with_ossku(self, resource_group, resource_group_locati self.cmd( 'aks delete -g {resource_group} -n {name} --yes --no-wait', checks=[self.is_empty()]) + @AllowLargeResponse() + @AKSCustomResourceGroupPreparer(random_name_length=17, name_prefix='clitest', location='westus2') + def test_aks_nodepool_add_with_ossku_windows2022(self, resource_group, resource_group_location): + # reset the count so in replay mode the random names will start with 0 + self.test_resources_count = 0 + # kwargs for string formatting + aks_name = self.create_random_name('cliakstest', 16) + _, create_version = self._get_versions(resource_group_location) + self.kwargs.update({ + 'resource_group': resource_group, + 'name': aks_name, + 'dns_name_prefix': self.create_random_name('cliaksdns', 16), + 'location': resource_group_location, + 'resource_type': 'Microsoft.ContainerService/ManagedClusters', + 'windows_admin_username': 'azureuser1', + 'windows_admin_password': 'replace-Password1234$', + 'windows_nodepool_name': 'npwin', + 'k8s_version': create_version, + 'ssh_key_value': self.generate_ssh_keys() + }) + + # create + create_cmd = 'aks create --resource-group={resource_group} --name={name} --location={location} ' \ + '--dns-name-prefix={dns_name_prefix} --node-count=1 ' \ + '--windows-admin-username={windows_admin_username} --windows-admin-password={windows_admin_password} ' \ + '--load-balancer-sku=standard --vm-set-type=virtualmachinescalesets --network-plugin=azure ' \ + '--ssh-key-value={ssh_key_value} --kubernetes-version={k8s_version}' + self.cmd(create_cmd, checks=[ + self.exists('fqdn'), + self.exists('nodeResourceGroup'), + self.check('provisioningState', 'Succeeded'), + self.check('windowsProfile.adminUsername', 'azureuser1') + ]) + + # add Windows2022 nodepool + self.cmd('aks nodepool add ' + '--resource-group={resource_group} ' + '--cluster-name={name} ' + '--name={windows_nodepool_name} ' + '--node-count=1 ' + '--os-type Windows ' + '--os-sku Windows2022', + checks=[ + self.check('provisioningState', 'Succeeded'), + self.check('osSku', 'Windows2022'), + ]) + + # delete + self.cmd( + 'aks delete -g {resource_group} -n {name} --yes --no-wait', checks=[self.is_empty()]) + @AllowLargeResponse() @AKSCustomResourceGroupPreparer(random_name_length=17, name_prefix='clitest', location='eastus') def test_aks_create_add_nodepool_with_motd(self, resource_group, resource_group_location): diff --git a/src/aks-preview/setup.py b/src/aks-preview/setup.py index 91e7dfb9fbb..b71436ad77d 100644 --- a/src/aks-preview/setup.py +++ b/src/aks-preview/setup.py @@ -9,7 +9,7 @@ from setuptools import setup, find_packages -VERSION = "0.5.67" +VERSION = "0.5.68" CLASSIFIERS = [ "Development Status :: 4 - Beta", "Intended Audience :: Developers",