Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix ci script #162

Merged
merged 2 commits into from
Aug 10, 2022
Merged

fix ci script #162

Changes from all commits
Commits
Show all changes
2 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
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
6 changes: 3 additions & 3 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 @@ -236,10 +236,10 @@ def _ensure_default_log_analytics_workspace_for_monitoring(cmd, subscription_id,
cluster_location = ''
resources = cf_resources(cmd.cli_ctx, subscription_id)

cluster_resource_id = '/subscriptions/{0}/resourceGroups/{1}/providers//{2}/{3}/{4}'.format(
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, '2020-01-01-preview')
resource = resources.get_by_id(cluster_resource_id, '2022-05-01-preview')
cluster_location = resource.location.lower()
except HttpResponseError as ex:
raise ex
Expand Down Expand Up @@ -553,7 +553,7 @@ 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, '2020-01-01-preview')
resource = resources.get_by_id(cluster_resource_id, '2022-05-01-preview')
cluster_region = resource.location.lower()
except HttpResponseError as ex:
raise ex
Expand Down