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

refactor: Use hash convention for default spc name #385

Merged
merged 3 commits into from
Sep 25, 2024
Merged

refactor: Use hash convention for default spc name #385

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
151b67a
WIP
digimaun Sep 25, 2024
d8b882e
Merge branch 'feature/0.7.0' into gen_spc_name
digimaun Sep 25, 2024
483a154
Merge branch 'feature/0.7.0' into gen_spc_name
digimaun Sep 25, 2024
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
11 changes: 8 additions & 3 deletions azext_edge/edge/providers/orchestration/resources/instances.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ def get_user_msg_warn_ra(prefix: str, principal_id: str, scope: str) -> str:
)


def get_spc_name(instance_name: str) -> str:
return f"{instance_name}-spc"
def get_spc_name(cluster_name: str, resource_group_name: str, instance_name: str) -> str:
return "spc-ops-" + url_safe_hash_phrase(f"{cluster_name}-{resource_group_name}-{instance_name}")[:7]


def get_fc_name(cluster_name: str, oidc_issuer: str, subject: str) -> str:
Expand Down Expand Up @@ -292,7 +292,12 @@ def enable_secretsync(
)
spc_poller = self.ssc_mgmt_client.azure_key_vault_secret_provider_classes.begin_create_or_update(
resource_group_name=resource_group_name,
azure_key_vault_secret_provider_class_name=spc_name or get_spc_name(instance["name"]),
azure_key_vault_secret_provider_class_name=spc_name
or get_spc_name(
cluster_name=cluster_resource["name"],
resource_group_name=resource_group_name,
instance_name=instance["name"],
),
resource={
"location": cluster_resource["location"],
"extendedLocation": instance["extendedLocation"],
Expand Down