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

Jump to bottom

Fix custom domain removal from az containerapp up #116

Merged
merged 3 commits into from
Jun 3, 2022
Merged

Fix custom domain removal from az containerapp up #116

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
d9e7379
Fix https://github.com/microsoft/azure-container-apps/issues/234
StrawnSC Jun 1, 2022
b1404ba
Added history note.
Jun 3, 2022
4b4ebd9
Merge branch 'containerapp-0.3.6' into fix-up-domain-clearing
haroonf Jun 3, 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
2 changes: 1 addition & 1 deletion src/containerapp/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ Release History
* Added parameter --environment to 'az containerapp list'
* Added 'az containerapp revision label swap' to swap traffic labels
* BREAKING CHANGE: 'az containerapp revision list' now shows only active revisions by default, added flag --all to show all revisions
* Fixed but with 'az containerapp up' where custom domains would be removed when updating existing containerapp
* Fixed bug with 'az containerapp auth update' when using --unauthenticated-client-action


0.3.5
++++++
* Add parameter --zone-redundant to 'az containerapp env create'
Expand Down
5 changes: 4 additions & 1 deletion src/containerapp/azext_containerapp/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2344,7 +2344,10 @@ def containerapp_up_logic(cmd, resource_group_name, name, managed_env, image, en

ingress_def = None
if target_port is not None and ingress is not None:
ingress_def = IngressModel
if ca_exists:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if this is a team fix until API PATCH is fixed & deployed - add a comment to remove this if not required.

ingress_def = containerapp_def["properties"]["configuration"]["ingress"]
else:
ingress_def = IngressModel
ingress_def["external"] = external_ingress
ingress_def["targetPort"] = target_port
containerapp_def["properties"]["configuration"]["ingress"] = ingress_def
Expand Down