Merge branch 'k8s-configuration' into joinnis/k8s-configuration-add-flux

.gitattributes

@@ -0,0 +1 @@
+src/vmware/azext_vmware/tests/latest/recordings/*.yaml linguist-generated=true

.github/CODEOWNERS

@@ -128,8 +128,6 @@
 
 /src/k8s-configuration/ @NarayanThiru @jonathan-innis
 
-/src/k8s-config/ @NarayanThiru @jonathan-innis
-
 /src/k8s-extension/ @NarayanThiru @jonathan-innis
 
 /src/log-analytics-solution/ @zhoxing-ms
@@ -140,7 +138,7 @@
 
 /src/costmanagement/ @kairu-ms @jsntcy
 
-/src/datafactory/ @qiaozha @fengzhou-msft @qwordy
+/src/datafactory/ @kairu-ms  @evelyn-ys @Juliehzl
 
 /src/blockchain/ @jsntcy
 
@@ -152,7 +150,7 @@
 
 /src/guestconfig/ @gehuan
 
-/src/swiftlet/ @qwordy
+/src/swiftlet/ @zhoxing-ms
 
 /src/maintenance/ @sotaneja
 
@@ -170,13 +168,13 @@
 
 /src/communication/ @kairu-ms @jsntcy
 
-/src/automation/ @qwordy
+/src/automation/ @zhoxing-ms
 
 /src/monitor-control-service/ @jsntcy @kairu-ms
 
 /src/rdbms-connect/ @mjain2 @Juliehzl
 
-/src/confluent/ @fengzhou-msft
+/src/confluent/ @zhoxing-ms @jsntcy
 
 /src/offazure/ @houk-ms
 
@@ -192,12 +190,16 @@
 
 /src/redisenterprise/ @greenms
 
-/src/cloudservice/ @qwordy
+/src/cloudservice/ @zhoxing-ms
 
 /src/webpubsub/ @zackliu
 
 /src/connectedvmware/ @sanmishra18
 
 /src/diskpool/ @Juliehzl
 
+/src/serial-console/ @adrianabedon
+
 /src/dataprotection/ @sambitratha
+
+/src/authV2/ @mkarmark

azure-pipelines.yml

@@ -55,7 +55,7 @@ jobs:
       git clone -q --single-branch -b dev https://github.com/Azure/azure-cli.git ../azure-cli
 
       python -m pip install -U pip
-      pip install -q azdev==0.1.31
+      pip install -q azdev
 
       azdev setup -c ../azure-cli -r ./
 
@@ -140,7 +140,7 @@ jobs:
         git clone --single-branch -b dev https://github.com/Azure/azure-cli.git ../azure-cli
 
         python -m pip install -U pip
-        pip install azdev==0.1.31
+        pip install azdev
 
         azdev --version
 

k8s-custom-pipelines.yml

@@ -2,23 +2,23 @@ trigger:
   batch: true
   branches:
     include:
-      - k8s-config
+      - k8s-configuration
 pr:
   branches:
     include:
-      - k8s-config
+      - k8s-configuration
 
 stages:
 - stage: BuildTestPublishExtension
   displayName: "Build, Test, and Publish Extension"
   variables:
     TEST_PATH: $(Agent.BuildDirectory)/s/testing
     CLI_REPO_PATH: $(Agent.BuildDirectory)/s
-    EXTENSION_NAME: "k8s-config"
-    EXTENSION_FILE_NAME: "k8s_config"
+    EXTENSION_NAME: "k8s-configuration"
+    EXTENSION_FILE_NAME: "k8s_configuration"
     SUBSCRIPTION_ID: "15c06b1b-01d6-407b-bb21-740b8617dea3"
     RESOURCE_GROUP: "K8sPartnerExtensionTest"
-    BASE_CLUSTER_NAME: "k8s-config-cluster"
+    BASE_CLUSTER_NAME: "k8s-configuration-cluster"
   jobs:
   - job: K8sConfigurationTestSuite
     displayName: "Run the Test Suite"
@@ -82,7 +82,7 @@ stages:
                           --arg AKS_CLUSTER_NAME "$AKS_CLUSTER_NAME" \
                           --arg ARC_CLUSTER_NAME "$ARC_CLUSTER_NAME" \
                           --arg K8S_CONFIG_VERSION "$K8S_CONFIG_VERSION" \
-                          '{subscriptionId: $SUB_ID, resourceGroup: $RG, aksClusterName: $AKS_CLUSTER_NAME, arcClusterName: $ARC_CLUSTER_NAME, extensionVersion: {"k8s-config": $K8S_CONFIG_VERSION, connectedk8s: "1.0.0"}}')
+                          '{subscriptionId: $SUB_ID, resourceGroup: $RG, aksClusterName: $AKS_CLUSTER_NAME, arcClusterName: $ARC_CLUSTER_NAME, extensionVersion: {"k8s-configuration": $K8S_CONFIG_VERSION, connectedk8s: "1.0.0"}}')
           echo $JSON_STRING > settings.json
           cat settings.json
         workingDirectory: $(TEST_PATH)
@@ -112,7 +112,7 @@ stages:
           scriptType: pscore
           scriptLocation: inlineScript
           inlineScript: |
-            .\Test.ps1 -Type k8s-config -CI
+            .\Test.ps1 -Type k8s-configuration -CI
           workingDirectory: $(TEST_PATH)
         continueOnError: true
 
@@ -140,7 +140,7 @@ stages:
     displayName: "Build and Publish the Extension Artifact"
     variables: 
       CLI_REPO_PATH: $(Agent.BuildDirectory)/s
-      EXTENSION_NAME: "k8s-config"
+      EXTENSION_NAME: "k8s-configuration"
     steps:
     - task: UsePythonVersion@0
       displayName: 'Use Python 3.6'

linter_exclusions.yml

@@ -61,6 +61,12 @@ aks create:
     load_balancer_outbound_ports:
       rule_exclusions:
       - option_length_too_long
+    nat_gateway_idle_timeout:
+      rule_exclusions:
+      - option_length_too_long
+    nat_gateway_managed_outbound_ip_count:
+      rule_exclusions:
+      - option_length_too_long
     node_osdisk_diskencryptionset_id:
       rule_exclusions:
       - option_length_too_long
@@ -76,6 +82,9 @@ aks create:
     workspace_resource_id:
       rule_exclusions:
       - option_length_too_long
+    enable_msi_auth_for_monitoring:
+      rule_exclusions:
+      - option_length_too_long
     enable_encryption_at_host:
       rule_exclusions:
       - option_length_too_long
@@ -93,6 +102,9 @@ aks enable-addons:
     workspace_resource_id:
       rule_exclusions:
       - option_length_too_long
+    enable_msi_auth_for_monitoring:
+      rule_exclusions:
+      - option_length_too_long
 aks nodepool add:
   parameters:
     enable_node_public_ip:
@@ -136,6 +148,12 @@ aks update:
     load_balancer_outbound_ports:
       rule_exclusions:
       - option_length_too_long
+    nat_gateway_idle_timeout:
+      rule_exclusions:
+      - option_length_too_long
+    nat_gateway_managed_outbound_ip_count:
+      rule_exclusions:
+      - option_length_too_long
     enable_managed_identity:
       rule_exclusions:
       - option_length_too_long
@@ -2067,6 +2085,11 @@ spring-cloud update:
     disable_distributed_tracing:
       rule_exclusions:
       - option_length_too_long
+ssh vm:
+  parameters:
+    ssh_args:
+      rule_exclusions:
+        - no_positional_parameters
 storage account create:
   parameters:
     hierarchical_namespace:

scripts/ci/avail-ext-doc/list-template.md

@@ -1,6 +1,6 @@
 ---
-title: Available extensions for the Azure CLI
-description: A complete list of the officially supported extensions for the Azure CLI.
+title: List of available Azure CLI extensions | Microsoft Docs
+description: A complete list of officially supported Azure Command-Line Interface (CLI) extensions that are provided and maintained by Microsoft.
 author: haroldrandom
 ms.author: jianzen
 manager: yonzhan,yungezz
@@ -10,18 +10,19 @@ ms.prod: azure
 ms.technology: azure-cli
 ms.devlang: azure-cli
 ms.custom: devx-track-azurecli
+keywords: az extension, azure cli extensions, azure extensions
 ---
 
-# Available extensions for the Azure CLI
+# Available Azure CLI extensions
 
-This article is a complete list of the available extensions for the Azure CLI which are supported by Microsoft.
-
-The list of extensions is also available from the CLI. To get it, run [az extension list-available](/cli/azure/extension#az_extension_list_available):
+This article is a complete list of the available extensions for the Azure CLI which are supported by Microsoft.  The list of extensions is also available from the CLI. To get it, run [az extension list-available](/cli/azure/extension#az_extension_list_available):
 
 ```azurecli-interactive
 az extension list-available --output table
 ```
 
+You will be prompted to install an extension on first use.  
+
 | Extension | Required Minimum CLI Version | Description | Status | Release Notes |
 |----|-----------------|-------------|---------|---------------|{% for extension in extensions %}
 |[{{ extension.name }}]({{ extension.project_url }}) | {{ extension.min_cli_core_version }} | {{ extension.desc }} | {{ extension.status }} | [{{extension.version}}]({{extension.history}}) |{% endfor %}

scripts/ci/build_ext_cmd_tree.sh

@@ -19,7 +19,8 @@ export AZURE_EXTENSION_INDEX_URL=https://raw.githubusercontent.com/Azure/azure-c
 
 output=$(az extension list-available --query [].name -otsv)
 # azure-cli-ml is replaced by ml
-blocklist=("azure-cli-ml")
+# TODO: azure-batch-cli-extensions is not compatible with latest batch SDK.
+blocklist=("azure-cli-ml" "azure-batch-cli-extensions")
 
 rm -f ~/.azure/extCmdTreeToUpload.json
 

scripts/ci/test_source.py

@@ -15,7 +15,7 @@
 import shlex
 from subprocess import check_output, check_call, CalledProcessError
 
-import mock
+from unittest import mock
 from wheel.install import WHEEL_INFO_RE
 from six import with_metaclass
 

src/account/azext_account/__init__.py

@@ -5,6 +5,10 @@
 
 from azure.cli.core import AzCommandsLoader
 from azext_account.generated._help import helps  # pylint: disable=unused-import
+try:
+    from azext_account.manual._help import helps  # pylint: disable=reimported
+except ImportError:
+    pass
 
 
 class SubscriptionClientCommandsLoader(AzCommandsLoader):

src/ai-examples/azext_ai_examples/tests/latest/test_ai_examples_scenario.py

@@ -6,7 +6,7 @@
 
 import json
 import unittest
-import mock
+from unittest import mock
 import requests
 
 from azure_devtools.scenario_tests import AllowLargeResponse

src/aks-preview/HISTORY.md

@@ -2,6 +2,57 @@
 
 Release History
 ===============
+
+0.5.31
++++++
+* Add support for new outbound types: 'managedNATGateway' and 'userAssignedNATGateway'
+
+0.5.30
++++++
+* Add preview support for setting scaleDownMode field on nodepools. Requires registering the feature flag "Microsoft.ContainerService/AKS-ScaleDownModePreview" for setting the value to "Deallocate".
+
+0.5.29
++++++
+* Fix update (failed due to "ERROR: (BadRequest) Feature Microsoft.ContainerService/AutoUpgradePreview is not enabled" even when autoupgrade was not specified)
+* Add podMaxPids argument for kubelet-config
+
+0.5.28
++++++
+* Update to adopt 2021-07-01 api-version
+
+0.5.27
++++++
+* GA private cluster public FQDN feature, breaking change to replace create parameter `--enable-public-fqdn` with `--disable-public-fqdn` since now it's enabled by default for private cluster during cluster creation.
+
+0.5.26
++++++
+* Correct containerLogMaxSizeMb to containerLogMaxSizeMB in customized kubelet config
+
+0.5.25
++++++
+* Add support for http proxy
+
+0.5.24
++++++
+* * Add "--aks-custom-headers" for "az aks nodepool upgrade"
+
+0.5.23
++++++
+* Fix issue that `maintenanceconfiguration add` subcommand cannot work
+
+0.5.22
++++++
+* Fix issue in dcr template
+
+0.5.21
++++++
+* Fix issue when disable monitoring on an AKS cluster would fail in regions where Data Collection Rules are not enabled
+
+0.5.20
++++++
+* Support enabling monitoring on AKS clusters with msi auth
+* Add `--enable-msi-auth-for-monitoring` option in aks create and aks enable-addons
+
 0.5.19
 +++++
 * Remove azure-defender from list of available addons to install via `az aks enable-addons` command

src/aks-preview/azcli_aks_live_test/configs/cli_matrix_default.json

@@ -6,7 +6,9 @@
     },
     "exclude": {
         "need additional feature": [
-            "test_managed_aad_enable_azure_rbac"
+            "test_aks_create_enable_encryption",
+            "test_aks_create_edge_zone",
+            "test_aks_create_with_auto_upgrade_channel"
         ]
     }
 }

src/aks-preview/azcli_aks_live_test/configs/ext_matrix_default.json

@@ -6,10 +6,7 @@
     },
     "exclude": {
         "need additional feature": [
-            "test_aks_create_with_ossku",
-            "test_aks_nodepool_add_with_ossku",
-            "test_aks_create_with_node_config",
-            "test_aks_create_private_cluster_public_fqdn",
+            "test_aks_create_with_azurekeyvaultsecretsprovider_addon",
             "test_aks_create_addon_with_azurekeyvaultsecretsprovider_with_secret_rotation",
             "test_aks_update_azurekeyvaultsecretsprovider_with_secret_rotation",
             "test_aks_enable_addon_with_azurekeyvaultsecretsprovider",
@@ -20,20 +17,17 @@
             "test_aks_enable_addon_with_openservicemesh",
             "test_aks_disable_addon_openservicemesh",
             "test_aks_create_with_auto_upgrade_channel",
-            "test_aks_create_with_azurekeyvaultsecretsprovider_addon",
-            "test_aks_custom_kubelet_identity",
             "test_aks_disable_local_accounts",
             "test_aks_create_with_pod_identity_enabled",
             "test_aks_create_using_azurecni_with_pod_identity_enabled",
             "test_aks_pod_identity_usage",
-            "test_aks_create_with_fips"
-        ],
-        "unknown": [
-            "test_aks_create_and_update_with_managed_aad_enable_azure_rbac",
-            "test_aks_update_to_msi_cluster_with_addons"
-        ],
-        "code bug": [
-            "test_aks_nodepool_get_upgrades"
+            "test_aks_create_with_fips",
+            "test_aks_create_with_monitoring_aad_auth_msi",
+            "test_aks_create_with_monitoring_aad_auth_uai",
+            "test_aks_enable_monitoring_with_aad_auth_msi",
+            "test_aks_enable_monitoring_with_aad_auth_uai",
+            "test_aks_create_and_update_with_managed_nat_gateway_outbound",
+            "test_aks_create_with_http_proxy_config"
         ]
     }
 }

src/aks-preview/azcli_aks_live_test/scripts/clean_up.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 # login
-az login --service-principal -u $AZCLI_ALT_CLIENT_ID -p $AZCLI_ALT_CLIENT_SECRET -t $TENANT_ID
-az account set -s $AZCLI_ALT_SUBSCRIPTION_ID
+az login --service-principal -u "${AZCLI_ALT_CLIENT_ID}" -p "${AZCLI_ALT_CLIENT_SECRET}" -t "${TENANT_ID}"
+az account set -s "${AZCLI_ALT_SUBSCRIPTION_ID}"
 az account show
 
 # list the details of resource groups whose names start with "clitest"