Skip to content

K8se master kube env create validations #3

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
calvinsID merged 3 commits into from
Jul 22, 2021
Merged

K8se master kube env create validations #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29dd22b
az kube create: allow using custom location name. Also get location f…
calvinsID Jun 4, 2021
33e9a0d
Require cli core 2.26.0 or later
calvinsID Jul 22, 2021
2d5c1ed
Merge branch 'k8se-master' into k8se-master-kube-env-create-validations
calvinsID Jul 22, 2021
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
5 changes: 5 additions & 0 deletions src/appservice-kube/azext_appservice_kube/_client_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,14 @@ def _polish_bad_errors(ex):
return _polish_bad_errors


def customlocation_client_factory(cli_ctx, **_):
return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_CUSTOMLOCATION)


def web_client_factory(cli_ctx, **_):
return get_mgmt_service_client(cli_ctx, CUSTOM_MGMT_APPSERVICE)


def resource_client_factory(cli_ctx, **_):
from azure.cli.core.profiles import ResourceType
return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES)
Expand Down
26 changes: 17 additions & 9 deletions src/appservice-kube/azext_appservice_kube/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
should_create_new_rg, set_location, get_site_availability, does_app_already_exist, get_profile_username,
get_plan_to_use,get_kube_plan_to_use, get_lang_from_content, get_rg_to_use, get_sku_to_use,
detect_os_form_src, get_current_stack_from_runtime, generate_default_app_service_plan_name)
from ._client_factory import web_client_factory, cf_kube_environments, ex_handler_factory
from ._client_factory import web_client_factory, cf_kube_environments, ex_handler_factory, customlocation_client_factory

import subprocess
from subprocess import PIPE
Expand All @@ -100,19 +100,27 @@
# pylint: disable=too-many-locals,too-many-lines

def create_kube_environment(cmd, client, name, resource_group_name, custom_location, static_ip,
location=None, tags=None, no_wait=False):
tags=None, no_wait=False):
KubeEnvironment, ExtendedLocation, ArcConfiguration, FrontEndConfiguration = cmd.get_models('KubeEnvironment',
'ExtendedLocation', 'ArcConfiguration', 'FrontEndConfiguration')

if not is_valid_resource_id(custom_location):
raise CLIError('Invalid custom location')
client = customlocation_client_factory(cmd.cli_ctx)
custom_location_object = None

parsed_custom_location = parse_resource_id(custom_location)
if parsed_custom_location['resource_type'].lower() != 'customlocations':
raise CLIError('Invalid custom location')
if is_valid_resource_id(custom_location):
parsed_custom_location = parse_resource_id(custom_location)
if parsed_custom_location['resource_type'].lower() != 'customlocations':
raise CLIError('Invalid custom location')

custom_location_object = client.custom_locations.get(
parsed_custom_location['resource_group'],
parsed_custom_location['name'])
else:
custom_location_object = client.custom_locations.get(resource_group_name, custom_location)
custom_location = custom_location_object.id

location = custom_location_object.location

if not location:
location = _get_location_from_resource_group(cmd.cli_ctx, parsed_custom_location['resource_group'])
front_end_configuration = FrontEndConfiguration(kind="LoadBalancer")
extended_location = ExtendedLocation(custom_location=custom_location)
arc_configuration = ArcConfiguration(
Expand Down