diff --git a/src/k8s-extension/HISTORY.rst b/src/k8s-extension/HISTORY.rst index d0e19128855..2fe8a591fb9 100644 --- a/src/k8s-extension/HISTORY.rst +++ b/src/k8s-extension/HISTORY.rst @@ -3,6 +3,12 @@ Release History =============== +0.4.2 +++++++++++++++++++ + +* Hotfix servicebus namespace creation for Track 2 changes +* Change resource tag from 'amlk8s' to 'Azure Arc-enabled ML' in microsoft.azureml.kubernetes + 0.4.1 ++++++++++++++++++ diff --git a/src/k8s-extension/azext_k8s_extension/_validators.py b/src/k8s-extension/azext_k8s_extension/_validators.py index 9941c4a117b..31078a4ddbb 100644 --- a/src/k8s-extension/azext_k8s_extension/_validators.py +++ b/src/k8s-extension/azext_k8s_extension/_validators.py @@ -4,7 +4,7 @@ # -------------------------------------------------------------------------------------------- from knack.log import get_logger -from azext_k8s_extension._client_factory import _resource_providers_client +from ._client_factory import _resource_providers_client from . import consts diff --git a/src/k8s-extension/azext_k8s_extension/azext_metadata.json b/src/k8s-extension/azext_k8s_extension/azext_metadata.json index cf7b8927a07..f5fcee1c14a 100644 --- a/src/k8s-extension/azext_k8s_extension/azext_metadata.json +++ b/src/k8s-extension/azext_k8s_extension/azext_metadata.json @@ -1,4 +1,4 @@ { "azext.isPreview": true, - "azext.minCliCoreVersion": "2.15.0" + "azext.minCliCoreVersion": "2.24.0" } diff --git a/src/k8s-extension/azext_k8s_extension/custom.py b/src/k8s-extension/azext_k8s_extension/custom.py index f2fae3f54d4..d07c0015792 100644 --- a/src/k8s-extension/azext_k8s_extension/custom.py +++ b/src/k8s-extension/azext_k8s_extension/custom.py @@ -13,10 +13,8 @@ from azure.cli.core.azclierror import ResourceNotFoundError, MutuallyExclusiveArgumentError, \ InvalidArgumentValueError, CommandNotFoundError, RequiredArgumentMissingError from azure.cli.core.commands.client_factory import get_subscription_id -from azext_k8s_extension.vendored_sdks.models import ConfigurationIdentity -from azext_k8s_extension.vendored_sdks.models import ErrorResponseException -from azext_k8s_extension.vendored_sdks.models import Scope -from azext_k8s_extension._validators import validate_cc_registration +from .vendored_sdks.models import ConfigurationIdentity, ErrorResponseException, Scope +from ._validators import validate_cc_registration from .partner_extensions.ContainerInsights import ContainerInsights from .partner_extensions.AzureDefender import AzureDefender diff --git a/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureMLKubernetes.py b/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureMLKubernetes.py index d907e7d3c63..3a2544a4e3b 100644 --- a/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureMLKubernetes.py +++ b/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureMLKubernetes.py @@ -30,7 +30,7 @@ logger = get_logger(__name__) -resource_tag = {'created_by': 'amlk8s-extension'} +resource_tag = {'created_by': 'Azure Arc-enabled ML'} class AzureMLKubernetes(PartnerExtensionModel): @@ -271,10 +271,10 @@ def _lock_resource(cmd, lock_scope, lock_level='CanNotDelete'): lock_client: azure.mgmt.resource.locks.ManagementLockClient = get_mgmt_service_client( cmd.cli_ctx, azure.mgmt.resource.locks.ManagementLockClient) # put lock on relay resource - lock_object = ManagementLockObject(level=lock_level, notes='locked by amlk8s.') + lock_object = ManagementLockObject(level=lock_level, notes='locked by amlarc.') try: lock_client.management_locks.create_or_update_by_scope( - scope=lock_scope, lock_name='amlk8s-resource-lock', parameters=lock_object) + scope=lock_scope, lock_name='amlarc-resource-lock', parameters=lock_object) except: # try to lock the resource if user has the owner privilege pass @@ -337,7 +337,7 @@ def _get_service_bus_connection_string(cmd, subscription_id, resource_group_name location=cluster_location, sku=service_bus_sku, tags=resource_tag) - async_poller = service_bus_client.namespaces.create_or_update( + async_poller = service_bus_client.namespaces.begin_create_or_update( resource_group_name, service_bus_namespace_name, service_bus_namespace) while True: async_poller.result(15) diff --git a/src/k8s-extension/setup.py b/src/k8s-extension/setup.py index 4cc69f2cbef..908ecc53009 100644 --- a/src/k8s-extension/setup.py +++ b/src/k8s-extension/setup.py @@ -32,7 +32,7 @@ # TODO: Add any additional SDK dependencies here DEPENDENCIES = [] -VERSION = "0.4.1" +VERSION = "0.4.2" with open('README.rst', 'r', encoding='utf-8') as f: README = f.read()