Skip to content
This repository was archived by the owner on May 13, 2025. It is now read-only.

sperate api version for connected and provisioned #169

Merged
bavneetsingh16 merged 6 commits into from
Aug 18, 2022
Merged

sperate api version for connected and provisioned #169

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4b33aba
fix ci script
Aug 9, 2022
ab11fe3
Merge branch 'k8s-extension/public' into longw/lcm
bavneetsingh16 Aug 10, 2022
fe46f45
Merge branch 'AzureArcForKubernetes:k8s-extension/public' into longw/lcm
wanlonghenry Aug 18, 2022
1ac2844
sperate_api_version
wanlonghenry Aug 18, 2022
e079190
change_style
wanlonghenry Aug 18, 2022
9cfb269
use_const_for_provisioned_api
wanlonghenry Aug 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/k8s-extension/azext_k8s_extension/partner_extensions/ContainerInsights.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from ..utils import get_cluster_rp_api_version

from knack.log import get_logger
from .. import consts

from azure.cli.core.azclierror import AzCLIError, CLIError, InvalidArgumentValueError, ClientRequestError
from azure.cli.core.commands import LongRunningOperation
Expand Down Expand Up @@ -244,7 +245,10 @@ def _ensure_default_log_analytics_workspace_for_monitoring(cmd, subscription_id,
cluster_resource_id = '/subscriptions/{0}/resourceGroups/{1}/providers/{2}/{3}/{4}'.format(
subscription_id, cluster_resource_group_name, cluster_rp, cluster_type, cluster_name)
try:
resource = resources.get_by_id(cluster_resource_id, '2022-05-01-preview')
if cluster_rp.lower() == consts.HYBRIDCONTAINERSERVICE_RP:
resource = resources.get_by_id(cluster_resource_id, '2022-05-01-preview')
Comment thread
bavneetsingh16 marked this conversation as resolved.
Outdated
else:
resource = resources.get_by_id(cluster_resource_id, '2020-01-01-preview')
Comment thread
bavneetsingh16 marked this conversation as resolved.
cluster_location = resource.location.lower()
except HttpResponseError as ex:
raise ex
Expand Down Expand Up @@ -574,7 +578,10 @@ def _ensure_container_insights_dcr_for_monitoring(cmd, subscription_id, cluster_
cluster_resource_id = '/subscriptions/{0}/resourceGroups/{1}/providers/{2}/{3}/{4}'.format(
subscription_id, cluster_resource_group_name, cluster_rp, cluster_type, cluster_name)
try:
resource = resources.get_by_id(cluster_resource_id, '2022-05-01-preview')
if cluster_rp.lower() == consts.HYBRIDCONTAINERSERVICE_RP:
resource = resources.get_by_id(cluster_resource_id, '2022-05-01-preview')
else:
resource = resources.get_by_id(cluster_resource_id, '2020-01-01-preview')
cluster_region = resource.location.lower()
except HttpResponseError as ex:
raise ex
Expand Down