Merge branch 'main' of https://github.com/Azure/azure-cli-extensions …

…into k8s-extension/public

.github/CODEOWNERS

@@ -2,7 +2,7 @@
 
 /linter_exclusions.yml @kairu-ms @fengzhou-msft
 
-/src/index.json @fengzhou-msft @qwordy @houk-ms @kairu-ms @jsntcy @Juliehzl @jiasli @zhoxing-ms @evelyn-ys @msyyc @xfz11 @08nholloway
+/src/index.json @fengzhou-msft @qwordy @houk-ms @kairu-ms @jsntcy @Juliehzl @jiasli @zhoxing-ms @evelyn-ys @xfz11 @08nholloway
 
 /src/footprint/ @jonunezd @Diego-Perez-Botero
 
@@ -28,7 +28,9 @@
 
 /src/dms-preview/ @temandr
 
-/src/express-route-cross-connection/ @kairu-ms @msyyc
+/src/dnc/ @alegal
+
+/src/express-route-cross-connection/ @kairu-ms @jsntcy
 
 /src/application-insights/ @alexeldeib
 
@@ -40,11 +42,11 @@
 
 /src/resource-graph/ @demyanenko @amirhbk @chiragg4u
 
-/src/azure-firewall/ @kairu-ms @msyyc
+/src/azure-firewall/ @kairu-ms @jsntcy
 
-/src/virtual-network-tap/ @kairu-ms @msyyc
+/src/virtual-network-tap/ @kairu-ms @jsntcy
 
-/src/virtual-wan/ @kairu-ms @msyyc
+/src/virtual-wan/ @kairu-ms @jsntcy
 
 /src/front-door/ @pichandwork
 
@@ -70,7 +72,7 @@
 
 /src/connectedmachine/ @farehar
 
-/src/ip-group/ @msyyc
+/src/ip-group/ @kairu-ms @jsntcy
 
 /src/connectedk8s/ @akashkeshari @alphaWizard
 
@@ -82,7 +84,7 @@
 
 /src/notification-hub/ @fengzhou-msft
 
-/src/connection-monitor-preview/ @msyyc
+/src/connection-monitor-preview/ @kairu-ms @jsntcy
 
 /src/support/ @mit2nil @shahbj79 @RudraSharma93Microsoft
 
@@ -98,7 +100,7 @@
 
 /src/storage-blob-preview/ @Juliehzl
 
-/src/logic/ @jsntcy @msyyc @kairu
+/src/logic/ @jsntcy @kairu
 
 /src/hardware-security-modules/ @bquantump
 
@@ -134,7 +136,7 @@
 
 /src/custom-providers/ @jsntcy
 
-/src/costmanagement/ @msyyc
+/src/costmanagement/ @kairu-ms @jsntcy
 
 /src/datafactory/ @qiaozha @fengzhou-msft @qwordy
 
@@ -156,19 +158,19 @@
 
 /src/cli-translator/ @houk-ms @fengzhou-msft
 
-/src/vmware/ @fengzhou-msft @qwordy
+/src/vmware/ @Juliehzl @zhoxing-ms
 
 /src/stack-hci/ @zhoxing-ms
 
 /src/acrtransfer/ @mabenedi
 
 /src/securityinsight/ @houk-ms
 
-/src/communication/ @msyyc
+/src/communication/ @kairu-ms @jsntcy
 
 /src/automation/ @qwordy
 
-/src/monitor-control-service/ @jsntcy @msyyc @kairu-ms
+/src/monitor-control-service/ @jsntcy @kairu-ms
 
 /src/rdbms-connect/ @mjain2 @Juliehzl
 
@@ -195,3 +197,5 @@
 /src/connectedvmware/ @sanmishra18
 
 /src/diskpool/ @Juliehzl
+
+/src/dataprotection/ @sambitratha

src/aks-preview/HISTORY.md

@@ -2,6 +2,22 @@
 
 Release History
 ===============
+0.5.19
++++++
+* Remove azure-defender from list of available addons to install via `az aks enable-addons` command
+
+0.5.18
++++++
+* Fix issue with node config not consuming logging settings
+
+0.5.17
++++++
+* Add parameter '--enable-ultra-ssd' to enable UltraSSD on agent node pool
+
+0.5.16
++++++
+* Vendor SDK using latest swagger with optional query parameter added
+* Support private cluster public fqdn feature
 
 0.5.15
 +++++

src/aks-preview/azcli_aks_live_test/ext_matrix_default.json

@@ -6,38 +6,34 @@
     },
     "exclude": {
         "need additional feature": [
-            "test_aks_create_addon_with_azurekeyvaultsecretsprovider_with_secret_rotation",
-            "test_aks_create_with_auto_upgrade_channel",
-            "test_aks_create_with_pod_identity_enabled",
-            "test_aks_create_with_azurekeyvaultsecretsprovider_addon",
-            "test_aks_create_using_azurecni_with_pod_identity_enabled",
-            "test_aks_create_with_gitops_addon",
+            "test_aks_create_with_ossku",
+            "test_aks_nodepool_add_with_ossku",
             "test_aks_create_with_node_config",
-            "test_aks_custom_kubelet_identity",
-            "test_aks_disable_addon_gitops",
-            "test_aks_disable_addon_openservicemesh",
-            "test_aks_pod_identity_usage",
-            "test_aks_create_with_openservicemesh_addon",
+            "test_aks_create_private_cluster_public_fqdn",
+            "test_aks_create_addon_with_azurekeyvaultsecretsprovider_with_secret_rotation",
             "test_aks_update_azurekeyvaultsecretsprovider_with_secret_rotation",
             "test_aks_enable_addon_with_azurekeyvaultsecretsprovider",
+            "test_aks_create_with_gitops_addon",
             "test_aks_enable_addon_with_gitops",
-            "test_aks_create_with_fips",
+            "test_aks_disable_addon_gitops",
+            "test_aks_create_with_openservicemesh_addon",
+            "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_nodepool_add_with_ossku",
-            "test_aks_create_with_ossku"
+            "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_create_with_virtual_node_addon",
             "test_aks_update_to_msi_cluster_with_addons"
         ],
         "code bug": [
-            "test_aks_create_with_ingress_appgw_addon_with_deprecated_subet_prefix",
-            "test_aks_byo_subnet_with_ingress_appgw_addon",
-            "test_aks_nodepool_get_upgrades",
-            "test_aks_byo_appgw_with_ingress_appgw_addon",
-            "test_aks_enable_addon_with_openservicemesh",
-            "test_aks_create_with_ingress_appgw_addon"
+            "test_aks_nodepool_get_upgrades"
         ]
     }
 }

src/aks-preview/azcli_aks_live_test/transcribe_env.sh

@@ -7,12 +7,21 @@ set -o pipefail
 set -o xtrace
 
 # check var
-[[ -z "${TENANT_ID}" ]] && (echo "TENANT_ID is empty"; exit 1)
-[[ -z "${AZCLI_ALT_SUBSCRIPTION_ID}" ]] && (echo "AZCLI_ALT_SUBSCRIPTION_ID is empty"; exit 1)
+# from variable group
 [[ -z "${AZCLI_ALT_CLIENT_ID}" ]] && (echo "AZCLI_ALT_CLIENT_ID is empty"; exit 1)
-[[ -z "${TEST_LOCATION}" ]] && (echo "TEST_LOCATION is empty"; exit 1)
+[[ -z "${AZCLI_ALT_SUBSCRIPTION_ID}" ]] && (echo "AZCLI_ALT_SUBSCRIPTION_ID is empty"; exit 1)
+[[ -z "${TENANT_ID}" ]] && (echo "TENANT_ID is empty"; exit 1)
+[[ -z "${IMAGE_PREFIX}" ]] && (echo "IMAGE_PREFIX is empty"; exit 1)
+[[ -z "${IMAGE_NAME}" ]] && (echo "IMAGE_NAME is empty"; exit 1)
+[[ -z "${IMAGE_TAG}" ]] && (echo "IMAGE_TAG is empty"; exit 1)
+[[ -z "${PYTHON_VERSION}" ]] && (echo "PYTHON_VERSION is empty"; exit 1)
+
+# from azure devops
 [[ -z "${BUILD_REASON}" ]] && (echo "BUILD_REASON is empty")
 [[ -z "${SYSTEM_PULLREQUEST_TARGETBRANCH}" ]] && (echo "SYSTEM_PULLREQUEST_TARGETBRANCH is empty")
+
+# custom
+[[ -z "${TEST_LOCATION}" ]] && (echo "TEST_LOCATION is empty"; exit 1)
 [[ -z "${COVERAGE}" ]] && (echo "COVERAGE is empty"; exit 1)
 [[ -z "${TEST_MODE}" ]] && (echo "TEST_MODE is empty"; exit 1)
 [[ -z "${PARALLELISM}" ]] && (echo "PARALLELISM is empty"; exit 1)
@@ -25,10 +34,6 @@ set -o xtrace
 [[ -z "${EXT_REPO}" ]] && (echo "EXT_REPO is empty"; exit 1)
 [[ -z "${EXT_BRANCH}" ]] && (echo "EXT_BRANCH is empty"; exit 1)
 [[ -z "${MANUAL_EXT}" ]] && (echo "MANUAL_EXT is empty"; exit 1)
-[[ -z "${IMAGE_PREFIX}" ]] && (echo "IMAGE_PREFIX is empty"; exit 1)
-[[ -z "${IMAGE_NAME}" ]] && (echo "IMAGE_NAME is empty"; exit 1)
-[[ -z "${IMAGE_TAG}" ]] && (echo "IMAGE_TAG is empty"; exit 1)
-[[ -z "${PYTHON_VERSION}" ]] && (echo "PYTHON_VERSION is empty")
 
 # clear
 cat /dev/null > env.list
@@ -38,14 +43,22 @@ echo "TENANT_ID=${TENANT_ID}" >> env.list
 echo "AZCLI_ALT_SUBSCRIPTION_ID=${AZCLI_ALT_SUBSCRIPTION_ID}" >> env.list
 echo "AZCLI_ALT_CLIENT_ID=${AZCLI_ALT_CLIENT_ID}" >> env.list
 
-# azdev env
-echo "AZURE_CLI_TEST_DEV_SP_NAME=${AZCLI_ALT_CLIENT_ID}" >> env.list
-echo "AZURE_CLI_TEST_DEV_RESOURCE_GROUP_LOCATION=${TEST_LOCATION}" >> env.list
+# image
+echo "IMAGE_PREFIX=${IMAGE_PREFIX}" >> env.list
+echo "IMAGE_NAME=${IMAGE_NAME}" >> env.list
+echo "IMAGE_TAG=${IMAGE_TAG}" >> env.list
 
 # predefined variables 
 echo "BUILD_REASON=${BUILD_REASON}" >> env.list
 echo "SYSTEM_PULLREQUEST_TARGETBRANCH=${SYSTEM_PULLREQUEST_TARGETBRANCH}" >> env.list
 
+# python version
+echo "PYTHON_VERSION=${PYTHON_VERSION}" >> env.list
+
+# azdev env
+echo "AZURE_CLI_TEST_DEV_SP_NAME=${AZCLI_ALT_CLIENT_ID}" >> env.list
+echo "AZURE_CLI_TEST_DEV_RESOURCE_GROUP_LOCATION=${TEST_LOCATION}" >> env.list
+
 # test
 echo "COVERAGE=${COVERAGE}" >> env.list
 echo "TEST_MODE=${TEST_MODE}" >> env.list
@@ -61,11 +74,3 @@ echo "CLI_BRANCH=${CLI_BRANCH}" >> env.list
 echo "EXT_REPO=${EXT_REPO}" >> env.list
 echo "EXT_BRANCH=${EXT_BRANCH}" >> env.list
 echo "MANUAL_EXT=${MANUAL_EXT}" >> env.list
-
-# image
-echo "IMAGE_PREFIX=${IMAGE_PREFIX}" >> env.list
-echo "IMAGE_NAME=${IMAGE_NAME}" >> env.list
-echo "IMAGE_TAG=${IMAGE_TAG}" >> env.list
-
-# misc
-echo "PYTHON_VERSION=${PYTHON_VERSION}" >> env.list

src/aks-preview/azcli_aks_live_test/vsts-azcli-aks-live-test.yaml

@@ -5,15 +5,15 @@ trigger: none
 pr:
   branches:
     include:
-    - master
+    - main
   paths:
     include:
     - src/aks-preview/
 
 jobs:
 - job: LiveTest
   pool:
-    vmImage: 'ubuntu-16.04'
+    vmImage: 'ubuntu-18.04'
   timeoutInMinutes: 360
   displayName: "Live Test with Python"
   steps:

src/aks-preview/azcli_aks_live_test/vsts-azcli-aks-unit-test.yaml

@@ -5,15 +5,15 @@ trigger: none
 pr:
   branches:
     include:
-    - master
+    - main
   paths:
     include:
     - src/aks-preview/
 
 jobs:
 - job: UnitTest
   pool:
-    vmImage: 'ubuntu-16.04'
+    vmImage: 'ubuntu-18.04'
   timeoutInMinutes: 360
   displayName: "Unit Test with Python"
   steps:

src/aks-preview/azext_aks_preview/_consts.py

@@ -64,12 +64,7 @@
 CONST_AZURE_KEYVAULT_SECRETS_PROVIDER_ADDON_NAME = "azureKeyvaultSecretsProvider"
 CONST_SECRET_ROTATION_ENABLED = "enableSecretRotation"
 
-# Azure Defender addon configuration keys
-CONST_AZURE_DEFENDER_ADDON_NAME = "azureDefender"
-CONST_AZURE_DEFENDER_LOG_ANALYTICS_WORKSPACE_RESOURCE_ID = CONST_MONITORING_LOG_ANALYTICS_WORKSPACE_RESOURCE_ID
-
 ADDONS = {
-    'azure-defender': CONST_AZURE_DEFENDER_ADDON_NAME,
     'http_application_routing': CONST_HTTP_APPLICATION_ROUTING_ADDON_NAME,
     'monitoring': CONST_MONITORING_ADDON_NAME,
     'virtual-node': CONST_VIRTUAL_NODE_ADDON_NAME,