Skip to content

add support for the aks 1.16/1.17 in "aks browse" command. #11804

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
qwordy merged 9 commits into from
Jan 31, 2020
Merged

add support for the aks 1.16/1.17 in "aks browse" command. #11804

Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8339728
switch to use the kube proxy to open the dashboard.
andyliuliming Jan 8, 2020
1157ded
fix
andyliuliming Jan 9, 2020
1d357ab
fix
andyliuliming Jan 9, 2020
83616f8
fix
andyliuliming Jan 9, 2020
61c653c
fix
andyliuliming Jan 9, 2020
8fbca67
fix
andyliuliming Jan 9, 2020
97959ac
fix
andyliuliming Jan 10, 2020
8472106
fix
andyliuliming Jan 14, 2020
6f364f1
fix
andyliuliming Jan 14, 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
17 changes: 6 additions & 11 deletions src/azure-cli/azure/cli/command_modules/acs/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1544,7 +1544,9 @@ def aks_browse(cmd, client, resource_group_name, name, disable_browser=False,
else:
protocol = 'http'

proxy_url = '{0}://{1}:{2}/'.format(protocol, listen_address, listen_port)
proxy_url = 'http://{1}:{2}/'.format(listen_address, listen_port)
dashboardURL = '{0}/api/v1/namespaces/kube-system/services/{1}:kubernetes-dashboard:/proxy'.format(proxy_url,
protocol)
# launch kubectl port-forward locally to access the remote dashboard
if in_cloud_console():
# TODO: better error handling here.
Expand All @@ -1560,19 +1562,12 @@ def aks_browse(cmd, client, resource_group_name, name, disable_browser=False,

logger.warning('Press CTRL+C to close the tunnel...')
if not disable_browser:
wait_then_open_async(proxy_url)
wait_then_open_async(dashboardURL)
try:
try:
subprocess.check_output(["kubectl", "--kubeconfig", browse_path, "--namespace", "kube-system",
"port-forward", "--address", listen_address, dashboard_pod,
"{0}:{1}".format(listen_port, dashboard_port)], stderr=subprocess.STDOUT)
subprocess.check_output(["kubectl", "--kubeconfig", browse_path, "proxy"], stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as err:
if err.output.find(b'unknown flag: --address'):
if listen_address != '127.0.0.1':
logger.warning('"--address" is only supported in kubectl v1.13 and later.')
logger.warning('The "--listen-address" argument will be ignored.')
subprocess.call(["kubectl", "--kubeconfig", browse_path, "--namespace", "kube-system",
"port-forward", dashboard_pod, "{0}:{1}".format(listen_port, dashboard_port)])
logger.warning("error occured when setup the proxy: %s", err)
except KeyboardInterrupt:
# Let command processing finish gracefully after the user presses [Ctrl+C]
pass
Expand Down