Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/appservice-kube/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
Release History
===============

0.1.5
++++++
* SSL bind bug fix

0.1.4
++++++
* Ensure compatibility of 'az webapp create' and 'az functionapp create' with CLI version 2.34.0
Expand Down
3 changes: 0 additions & 3 deletions src/appservice-kube/azext_appservice_kube/_constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------

import os


KUBE_DEFAULT_SKU = "K1"
KUBE_ASP_KIND = "linux,kubernetes"
KUBE_APP_KIND = "linux,kubernetes,app"
Expand Down
12 changes: 7 additions & 5 deletions src/appservice-kube/azext_appservice_kube/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
update_container_settings,
_rename_server_farm_props,
get_site_configs,
get_webapp,
_get_site_credential,
_format_fx_version,
_get_extension_version_functionapp,
Expand Down Expand Up @@ -472,7 +471,9 @@ def _get_kube_env_from_custom_location(cmd, custom_location, resource_group):
if kube.extended_location and kube.extended_location.type == "CustomLocation":
parsed_custom_location_2 = parse_resource_id(kube.extended_location.name)

if parsed_custom_location_2["name"].lower() == custom_location_name.lower() and parsed_custom_location_2.get("resource_group").lower() == resource_group.lower():
matched_name = parsed_custom_location_2["name"].lower() == custom_location_name.lower()
matched_rg = parsed_custom_location_2.get("resource_group").lower() == resource_group.lower()
if matched_name and matched_rg:
kube_environment_id = kube.id
break

Expand Down Expand Up @@ -1727,9 +1728,10 @@ def _update_ssl_binding(cmd, resource_group_name, name, certificate_thumbprint,
found_cert = webapp_cert
if found_cert:
if len(found_cert.host_names) == 1 and not found_cert.host_names[0].startswith('*'):
return _update_host_name_ssl_state(cmd, resource_group_name, name, webapp,
found_cert.host_names[0], ssl_type,
certificate_thumbprint, slot)
_update_host_name_ssl_state(cmd, resource_group_name, name, webapp,
found_cert.host_names[0], ssl_type,
certificate_thumbprint, slot)
return show_webapp(cmd, resource_group_name, name, slot)

query_result = list_hostnames(cmd, resource_group_name, name, slot)
hostnames_in_webapp = [x.name.split('/')[-1] for x in query_result]
Expand Down
4 changes: 2 additions & 2 deletions src/appservice-kube/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

# TODO: Confirm this is the right version number you want and it matches your
# HISTORY.rst entry.
VERSION = '0.1.4'
VERSION = '0.1.5'

# The full list of classifiers is available at
# https://pypi.python.org/pypi?%3Aaction=list_classifiers
Expand Down Expand Up @@ -60,4 +60,4 @@
package_data={'azext_appservice_kube': ['azext_metadata.json',
'resources/LinuxFunctionsStacks.json',
'resources/WindowsFunctionsStacks.json']},
)
)