Skip to content

fixing lint errors #2

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

Merged
rashmichandrashekar merged 3 commits into from
Feb 8, 2020
Merged

fixing lint errors #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f908fd1
{omsagent} role assignment changes for msi
rashmichandrashekar Feb 7, 2020
f556403
fixing lint errors
rashmichandrashekar Feb 8, 2020
cff5eab
Merge branch 'master' into rashmi/msi-changes
rashmichandrashekar Feb 8, 2020
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
59 changes: 35 additions & 24 deletions src/aks-preview/azext_aks_preview/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,8 @@ def create_role_assignment(cli_ctx, role, assignee, isServicePrincipal, resource
return _create_role_assignment(cli_ctx, role, assignee, isServicePrincipal, resource_group_name, scope)


def _create_role_assignment(cli_ctx, role, assignee, isServicePrincipal, resource_group_name=None, scope=None, resolve_assignee=True):
def _create_role_assignment(cli_ctx, role, assignee, isServicePrincipal,
resource_group_name=None, scope=None, resolve_assignee=True):
from azure.cli.core.profiles import ResourceType, get_sdk
factory = get_auth_management_client(cli_ctx, scope)
assignments_client = factory.role_assignments
Expand All @@ -356,7 +357,8 @@ def _create_role_assignment(cli_ctx, role, assignee, isServicePrincipal, resourc
scope = _build_role_scope(resource_group_name, scope, assignments_client.config.subscription_id)

role_id = _resolve_role_id(role, scope, definitions_client)
# If the cluster has service principal resolve the service principal client id to get the object id, if not use MSI object id.
# If the cluster has service principal resolve the service principal client id to get the object id,
# if not use MSI object id.
if isServicePrincipal:
object_id = _resolve_object_id(cli_ctx, assignee) if resolve_assignee else assignee
else:
Expand Down Expand Up @@ -905,12 +907,12 @@ def aks_create(cmd, # pylint: disable=too-many-locals,too-many-statements,to
retry_exception = Exception(None)
for _ in range(0, max_retry):
try:
result = sdk_no_wait(no_wait, client.create_or_update,
resource_group_name=resource_group_name,
resource_name=name,
parameters=mc,
custom_headers=headers)

result = sdk_no_wait(
no_wait, client.create_or_update,
resource_group_name=resource_group_name,
resource_name=name,
parameters=mc,
custom_headers=headers)
# adding a wait here since we rely on the result for role assignment
result = LongRunningOperation(cmd.cli_ctx)(result)

Expand All @@ -929,14 +931,19 @@ def aks_create(cmd, # pylint: disable=too-many-locals,too-many-statements,to
service_principal_msi_id = None
# Check if service principal exists, if it does, assign permissions to service principal
# Else, provide permissions to MSI
if hasattr(result, 'service_principal_profile') and hasattr(result.service_principal_profile, 'client_id'):
if (
hasattr(result, 'service_principal_profile') and
hasattr(result.service_principal_profile, 'client_id')
):
logger.warning('service principal exists, using it')
service_principal_msi_id = result.service_principal_profile.client_id
isServicePrincipal = True
elif ((hasattr(result, 'addon_profiles')) and
('omsagent' in result.addon_profiles) and
(hasattr(result.addon_profiles['omsagent'], 'identity')) and
(hasattr(result.addon_profiles['omsagent'].identity, 'object_id'))):
elif (
(hasattr(result, 'addon_profiles')) and
('omsagent' in result.addon_profiles) and
(hasattr(result.addon_profiles['omsagent'], 'identity')) and
(hasattr(result.addon_profiles['omsagent'].identity, 'object_id'))
):
logger.warning('omsagent MSI exists, using it')
service_principal_msi_id = result.addon_profiles['omsagent'].identity.object_id
isServicePrincipal = False
Expand Down Expand Up @@ -1341,7 +1348,6 @@ def aks_kollect(cmd, # pylint: disable=too-many-statements,too-many-locals
if not prompt_y_n('Do you want to see analysis results now?', default="n"):
print(f"You can run 'az aks kanalyze -g {resource_group_name} -n {name}' "
f"anytime to check the analysis results.")
return
else:
display_diagnostics_report(temp_kubeconfig_path)

Expand Down Expand Up @@ -2101,10 +2107,10 @@ def aks_enable_addons(cmd, client, resource_group_name, name, addons, workspace_

if 'omsagent' in instance.addon_profiles:
_ensure_container_insights_for_monitoring(cmd, instance.addon_profiles['omsagent'])

# send the managed cluster representation to update the addon profiles
result = sdk_no_wait(no_wait, client.create_or_update,
resource_group_name, name, instance)
result = sdk_no_wait(
no_wait, client.create_or_update,
resource_group_name, name, instance)
result = LongRunningOperation(cmd.cli_ctx)(result)

if 'omsagent' in instance.addon_profiles:
Expand All @@ -2125,19 +2131,24 @@ def aks_enable_addons(cmd, client, resource_group_name, name, addons, workspace_
logger.warning('service principal exists, using it')
service_principal_msi_id = result.service_principal_profile.client_id
isServicePrincipal = True
elif ((hasattr(result, 'addon_profiles')) and
('omsagent' in result.addon_profiles) and
(hasattr(result.addon_profiles['omsagent'], 'identity')) and
(hasattr(result.addon_profiles['omsagent'].identity, 'object_id'))):
elif (
(hasattr(result, 'addon_profiles')) and
('omsagent' in result.addon_profiles) and
(hasattr(result.addon_profiles['omsagent'], 'identity')) and
(hasattr(result.addon_profiles['omsagent'].identity, 'object_id'))
):
logger.warning('omsagent MSI exists, using it')
service_principal_msi_id = result.addon_profiles['omsagent'].identity.object_id
isServicePrincipal = False

if service_principal_msi_id is not None:
if not _add_role_assignment(cmd.cli_ctx, 'Monitoring Metrics Publisher',
service_principal_msi_id, isServicePrincipal, scope=cluster_resource_id):
logger.warning('Could not create a role assignment for Monitoring addon. '
'Are you an Owner on this subscription?')
service_principal_msi_id, isServicePrincipal,
scope=cluster_resource_id):
logger.warning(
'Could not create a role assignment for Monitoring addon.'
'Are you an Owner on this subscription?'
)

return result

Expand Down