Merge branch 'k8s-extension/public' into huayang/fe-migration

AzureArcForKubernetes · Aug 4, 2021 · af43486 · af43486
2 parents 438fa13 + a2a4050
commit af43486
Show file tree

Hide file tree

Showing 125 changed files with 30,013 additions and 9,826 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -198,4 +198,6 @@
 
 /src/diskpool/ @Juliehzl
 
-/src/dataprotection/ @sambitratha
+/src/serial-console/ @adrianabedon
+
+/src/dataprotection/ @sambitratha
diff --git a/scripts/ci/build_ext_cmd_tree.sh b/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
 

diff --git a/src/aks-preview/azcli_aks_live_test/configs/cli_matrix_default.json b/src/aks-preview/azcli_aks_live_test/configs/cli_matrix_default.json
@@ -6,7 +6,8 @@
     },
     "exclude": {
         "need additional feature": [
-            "test_managed_aad_enable_azure_rbac"
+            "test_managed_aad_enable_azure_rbac",
+            "test_aks_create_edge_zone"
         ]
     }
 }
diff --git a/src/aks-preview/azcli_aks_live_test/scripts/setup_venv.sh b/src/aks-preview/azcli_aks_live_test/scripts/setup_venv.sh
@@ -5,6 +5,7 @@
 [[ -z "${PYTHON_VERSION}" ]] && (echo "PYTHON_VERSION is empty"; exit 1)
 
 patchImageTools(){
+    apt update
     apt install -y curl
 }
 

diff --git a/...ks_preview/tests/latest/recordings/test_aks_create_aadv1_and_update_with_managed_aad.yaml b/...ks_preview/tests/latest/recordings/test_aks_create_aadv1_and_update_with_managed_aad.yaml
diff --git a/...ordings/test_aks_create_addon_with_azurekeyvaultsecretsprovider_with_secret_rotation.yaml b/...ordings/test_aks_create_addon_with_azurekeyvaultsecretsprovider_with_secret_rotation.yaml
@@ -15,7 +15,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.25.0 azsdk-python-azure-mgmt-resource/18.0.0 Python/3.6.9 (Linux-5.4.72-microsoft-standard-WSL2-x86_64-with-Ubuntu-18.04-bionic)
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001?api-version=2020-10-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001?api-version=2021-04-01
   response:
     body:
       string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001","name":"clitest000001","type":"Microsoft.Resources/resourceGroups","location":"westus2","tags":{"product":"azurecli","cause":"automation","date":"2021-06-23T08:01:22Z"},"properties":{"provisioningState":"Succeeded"}}'

diff --git a/...zext_aks_preview/tests/latest/recordings/test_aks_create_and_update_with_managed_aad.yaml b/...zext_aks_preview/tests/latest/recordings/test_aks_create_and_update_with_managed_aad.yaml
diff --git a/...ests/latest/recordings/test_aks_create_and_update_with_managed_aad_enable_azure_rbac.yaml b/...ests/latest/recordings/test_aks_create_and_update_with_managed_aad_enable_azure_rbac.yaml
diff --git a/...s_preview/tests/latest/recordings/test_aks_create_nonaad_and_update_with_managed_aad.yaml b/...s_preview/tests/latest/recordings/test_aks_create_nonaad_and_update_with_managed_aad.yaml
diff --git a/...view/azext_aks_preview/tests/latest/recordings/test_aks_create_none_private_dns_zone.yaml b/...view/azext_aks_preview/tests/latest/recordings/test_aks_create_none_private_dns_zone.yaml
diff --git a/...zext_aks_preview/tests/latest/recordings/test_aks_create_private_cluster_public_fqdn.yaml b/...zext_aks_preview/tests/latest/recordings/test_aks_create_private_cluster_public_fqdn.yaml
@@ -16,7 +16,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.25.0 azsdk-python-azure-mgmt-resource/18.0.0 Python/3.6.9 (Linux-5.4.72-microsoft-standard-WSL2-x86_64-with-Ubuntu-18.04-bionic)
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001?api-version=2020-10-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001?api-version=2021-04-01
   response:
     body:
       string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001","name":"clitest000001","type":"Microsoft.Resources/resourceGroups","location":"westus2","tags":{"product":"azurecli","cause":"automation","date":"2021-06-23T08:01:22Z"},"properties":{"provisioningState":"Succeeded"}}'

diff --git a/...iew/tests/latest/recordings/test_aks_create_using_azurecni_with_pod_identity_enabled.yaml b/...iew/tests/latest/recordings/test_aks_create_using_azurecni_with_pod_identity_enabled.yaml
@@ -16,7 +16,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.25.0 azsdk-python-azure-mgmt-resource/18.0.0 Python/3.6.9 (Linux-5.4.72-microsoft-standard-WSL2-x86_64-with-Ubuntu-18.04-bionic)
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001?api-version=2020-10-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001?api-version=2021-04-01
   response:
     body:
       string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001","name":"clitest000001","type":"Microsoft.Resources/resourceGroups","location":"westus2","tags":{"product":"azurecli","cause":"automation","date":"2021-06-23T08:01:22Z"},"properties":{"provisioningState":"Succeeded"}}'

diff --git a/src/aks-preview/azext_aks_preview/tests/latest/recordings/test_aks_create_with_ahub.yaml b/src/aks-preview/azext_aks_preview/tests/latest/recordings/test_aks_create_with_ahub.yaml
diff --git a/.../azext_aks_preview/tests/latest/recordings/test_aks_create_with_auto_upgrade_channel.yaml b/.../azext_aks_preview/tests/latest/recordings/test_aks_create_with_auto_upgrade_channel.yaml
@@ -16,7 +16,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.25.0 azsdk-python-azure-mgmt-resource/18.0.0 Python/3.6.9 (Linux-5.4.72-microsoft-standard-WSL2-x86_64-with-Ubuntu-18.04-bionic)
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001?api-version=2020-10-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001?api-version=2021-04-01
   response:
     body:
       string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001","name":"clitest000001","type":"Microsoft.Resources/resourceGroups","location":"westus2","tags":{"product":"azurecli","cause":"automation","date":"2021-06-23T08:01:22Z"},"properties":{"provisioningState":"Succeeded"}}'

diff --git a/...view/tests/latest/recordings/test_aks_create_with_azurekeyvaultsecretsprovider_addon.yaml b/...view/tests/latest/recordings/test_aks_create_with_azurekeyvaultsecretsprovider_addon.yaml
@@ -15,7 +15,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.25.0 azsdk-python-azure-mgmt-resource/18.0.0 Python/3.6.9 (Linux-5.4.72-microsoft-standard-WSL2-x86_64-with-Ubuntu-18.04-bionic)
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001?api-version=2020-10-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001?api-version=2021-04-01
   response:
     body:
       string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001","name":"clitest000001","type":"Microsoft.Resources/resourceGroups","location":"westus2","tags":{"product":"azurecli","cause":"automation","date":"2021-06-23T08:01:22Z"},"properties":{"provisioningState":"Succeeded"}}'