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

Helmupdatefix #6

Merged
merged 7 commits into from
Feb 16, 2022
Merged

Helmupdatefix #6

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4b7aadf
Use userValues.txt instead of --resuse-values in update command
sikasire Feb 11, 2022
e8297ad
fix error msg
sikasire Feb 11, 2022
02014ea
fix output file
sikasire Feb 15, 2022
55283c9
Merge branch 'customcert' of https://github.com/Anumita/azure-cli-ext…
sikasire Feb 15, 2022
159e3bb
place values file in .azure folder
sikasire Feb 16, 2022
c18d3df
place values file in .azure folder
sikasire Feb 16, 2022
bc79fea
Merge branch 'customcert' into helmupdatefix
sirireddy12 Feb 16, 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
20 changes: 16 additions & 4 deletions src/connectedk8s/azext_connectedk8s/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,6 +777,8 @@ def update_agents(cmd, client, resource_group_name, cluster_name, https_proxy=""

# Send cloud information to telemetry
send_cloud_telemetry(cmd)
# Fetch OS details
operating_system = platform.system()

# Setting kubeconfig
kube_config = set_kube_config(kube_config)
Expand Down Expand Up @@ -885,7 +887,17 @@ def update_agents(cmd, client, resource_group_name, cluster_name, https_proxy=""
if kube_context:
cmd_helm_values.extend(["--kube-context", kube_context])

existing_user_values = open('userValues.txt', 'w+')
if(operating_system == 'Windows'):
user_values_filepath_string = f'.azure\\userValues.txt'
elif(operating_system == 'Linux' or operating_system == 'Darwin'):
user_values_filepath_string = f'.azure/userValues.txt'
else:
telemetry.set_exception(exception='Unsupported OS', fault_type=consts.Unsupported_Fault_Type,
summary=f'{operating_system} is not supported yet')
raise ClientRequestError(f'The {operating_system} platform is not currently supported.')

user_values_location = os.path.expanduser(os.path.join('~', user_values_filepath_string))
existing_user_values = open(user_values_location, 'w+')
response_helm_values_get = Popen(cmd_helm_values, stdout=existing_user_values, stderr=PIPE)
_, error_helm_get_values = response_helm_values_get.communicate()
if response_helm_values_get.returncode != 0:
Expand All @@ -897,7 +909,7 @@ def update_agents(cmd, client, resource_group_name, cluster_name, https_proxy=""

cmd_helm_upgrade = [helm_client_location, "upgrade", "azure-arc", chart_path, "--namespace", release_namespace,
"-f",
"userValues.txt", "--wait", "--output", "json"]
user_values_location, "--wait", "--output", "json"]
if values_file_provided:
cmd_helm_upgrade.extend(["-f", values_file])
if auto_upgrade is not None:
Expand Down Expand Up @@ -927,12 +939,12 @@ def update_agents(cmd, client, resource_group_name, cluster_name, https_proxy=""
telemetry.set_exception(exception=error_helm_upgrade.decode("ascii"), fault_type=consts.Install_HelmRelease_Fault_Type,
summary='Unable to install helm release')
try:
os.remove(existing_user_values.name)
os.remove(user_values_location)
except OSError:
pass
raise CLIInternalError(str.format(consts.Update_Agent_Failure, error_helm_upgrade.decode("ascii")))
try:
os.remove(existing_user_values.name)
os.remove(user_values_location)
except OSError:
pass
return str.format(consts.Update_Agent_Success, connected_cluster.name)
Expand Down