diff --git a/src/k8s-extension/HISTORY.rst b/src/k8s-extension/HISTORY.rst index 8d7af781f76..5bc7e3ca5d3 100644 --- a/src/k8s-extension/HISTORY.rst +++ b/src/k8s-extension/HISTORY.rst @@ -3,6 +3,10 @@ Release History =============== +1.6.3 +++++++++++++++++++ +* Do not attempt to register Microsoft.Monitor and Microsoft.Dashboard resource providers if they are already registered. + 1.6.2 ++++++++++++++++++ * microsoft.workloadiam: Enhanced security by utilizing protected configuration settings for the join token instead of regular configuration settings. diff --git a/src/k8s-extension/azext_k8s_extension/partner_extensions/EntraWorkloadIAM.py b/src/k8s-extension/azext_k8s_extension/partner_extensions/EntraWorkloadIAM.py index 6cb3f8ded03..a65ded9f18f 100644 --- a/src/k8s-extension/azext_k8s_extension/partner_extensions/EntraWorkloadIAM.py +++ b/src/k8s-extension/azext_k8s_extension/partner_extensions/EntraWorkloadIAM.py @@ -27,6 +27,7 @@ CONFIG_SETTINGS_HELM_TENANT_ID = 'global.workload-iam.tenantID' CONFIG_SETTINGS_HELM_JOIN_TOKEN = 'workload-iam-local-authority.localAuthorityArgs.joinToken' + def settings_dict_to_lowercase(settings): """ Create new dictionary where the keys of the known user settings are all lowercase (but leave the @@ -47,6 +48,7 @@ def settings_dict_to_lowercase(settings): return validated_settings + class EntraWorkloadIAM(DefaultExtension): def Create(self, cmd, client, resource_group_name, cluster_name, name, cluster_type, cluster_rp, diff --git a/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/helper.py b/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/helper.py index 2169ac0a3b3..79061330008 100644 --- a/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/helper.py +++ b/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/helper.py @@ -57,7 +57,7 @@ def rp_registrations(cmd, subscription_id): raise CLIError(e) isInsightsRpRegistered = False isAlertsManagementRpRegistered = False - isMoniotrRpRegistered = False + isMonitorRpRegistered = False isDashboardRpRegistered = False json_response = json.loads(r.text) values_array = json_response["value"] @@ -67,9 +67,9 @@ def rp_registrations(cmd, subscription_id): if value["namespace"].lower() == "microsoft.alertsmanagement" and value["registrationState"].lower() == "registered": isAlertsManagementRpRegistered = True if value["namespace"].lower() == "microsoft.monitor" and value["registrationState"].lower() == "registered": - isAlertsManagementRpRegistered = True + isMonitorRpRegistered = True if value["namespace"].lower() == "microsoft.dashboard" and value["registrationState"].lower() == "registered": - isAlertsManagementRpRegistered = True + isDashboardRpRegistered = True if isInsightsRpRegistered is False: print(f"Registering microsoft.insights RP for the subscription {subscription_id}") headers = ['User-Agent=arc-azuremonitormetrics.register_insights_rp'] @@ -78,7 +78,7 @@ def rp_registrations(cmd, subscription_id): print(f"Registering microsoft.alertsmanagement RP for the subscription {subscription_id}") headers = ['User-Agent=arc-azuremonitormetrics.register_alertsmanagement_rp'] post_request(cmd, subscription_id, "microsoft.alertsmanagement", headers) - if isMoniotrRpRegistered is False: + if isMonitorRpRegistered is False: print(f"Registering microsoft.monitor RP for the subscription {subscription_id}") headers = ['User-Agent=arc-azuremonitormetrics.register_monitor_rp'] post_request(cmd, subscription_id, "microsoft.monitor", headers) diff --git a/src/k8s-extension/setup.py b/src/k8s-extension/setup.py index 259c0594542..05b70a05016 100644 --- a/src/k8s-extension/setup.py +++ b/src/k8s-extension/setup.py @@ -33,7 +33,7 @@ # TODO: Add any additional SDK dependencies here DEPENDENCIES = [] -VERSION = "1.6.2" +VERSION = "1.6.3" with open("README.rst", "r", encoding="utf-8") as f: README = f.read()