Skip to content

[ARO] az aro update: Fix update for clusters created with subnets that are now deleted #31039

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
kairu-ms merged 1 commit into from
Mar 27, 2025
Merged

[ARO] az aro update: Fix update for clusters created with subnets that are now deleted #31039

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions src/azure-cli/azure/cli/command_modules/aro/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
from base64 import b64decode
import textwrap

from azure.core.exceptions import HttpResponseError
from azure.core.exceptions import HttpResponseError, \
ResourceNotFoundError as CoreResourceNotFoundError
from azure.mgmt.core.tools import resource_id, parse_resource_id
import azure.mgmt.redhatopenshift.models as openshiftcluster

Expand Down Expand Up @@ -462,11 +463,14 @@ def get_network_resources_from_subnets(cli_ctx, subnets, fail, oc):
Please retry, if issue persists: raise azure support ticket""")
logger.info("Failed to validate subnet '%s'", sn)

subnet = subnet_show(cli_ctx=cli_ctx)(command_args={
"name": sid['resource_name'],
"vnet_name": sid['name'],
"resource_group": sid['resource_group']
})
try:
subnet = subnet_show(cli_ctx=cli_ctx)(command_args={
"name": sid['resource_name'],
"vnet_name": sid['name'],
"resource_group": sid['resource_group']}
)
except CoreResourceNotFoundError:
continue

if subnet.get("routeTable", None):
subnet_resources.add(subnet["routeTable"]["id"])
Expand Down