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

Update Terraform pre-cluster config in playground #1568

Merged
merged 1 commit into from
Dec 19, 2024
Merged

Update Terraform pre-cluster config in playground #1568

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion terraform/subscriptions/s940/c2/common/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ module "radix_id_gitrunner" {
scope_id = "/subscriptions/${module.config.subscription}/resourceGroups/${data.azurerm_virtual_network.this.resource_group_name}"
}
app_registry_contributor = {
role = "Contributor"
role = "Contributor"
scope_id = "/subscriptions/${module.config.subscription}/resourceGroups/common/providers/Microsoft.ContainerRegistry/registries/radix${module.config.environment}app"
}
}
Expand Down
2 changes: 1 addition & 1 deletion terraform/subscriptions/s940/prod/common/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ module "radix_id_gitrunner" {
scope_id = "/subscriptions/${module.config.subscription}/resourceGroups/${data.azurerm_virtual_network.this.resource_group_name}"
}
app_registry_contributor = {
role = "Contributor"
role = "Contributor"
scope_id = "/subscriptions/${module.config.subscription}/resourceGroups/common/providers/Microsoft.ContainerRegistry/registries/radixprodapp" # TODO: Replace resource name when fixed
}
}
Expand Down
2 changes: 1 addition & 1 deletion terraform/subscriptions/s941/dev/common/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ module "radix_id_gitrunner" {
scope_id = "/subscriptions/${module.config.subscription}/resourceGroups/${data.azurerm_virtual_network.this.resource_group_name}"
}
app_registry_contributor = {
role = "Contributor"
role = "Contributor"
scope_id = "/subscriptions/${module.config.subscription}/resourceGroups/common/providers/Microsoft.ContainerRegistry/registries/radix${module.config.environment}app"
}
}
Expand Down
2 changes: 1 addition & 1 deletion terraform/subscriptions/s941/playground/common/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ module "radix_id_gitrunner" {
scope_id = "/subscriptions/${module.config.subscription}/resourceGroups/${data.azurerm_virtual_network.this.resource_group_name}"
}
app_registry_contributor = {
role = "Contributor"
role = "Contributor"
scope_id = "/subscriptions/${module.config.subscription}/resourceGroups/common/providers/Microsoft.ContainerRegistry/registries/radix${module.config.environment}app"
}
}
Expand Down
15 changes: 0 additions & 15 deletions terraform/subscriptions/s941/playground/post-clusters/cert-manager.tf
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions terraform/subscriptions/s941/playground/pre-clusters/backend.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,9 @@ module "config" {
source = "../../../modules/config"
}

module "clusters" {
source = "../../../modules/active-clusters"
resource_group_name = module.config.cluster_resource_group
subscription = module.config.subscription
}

7 changes: 3 additions & 4 deletions terraform/subscriptions/s941/playground/pre-clusters/cert-manager.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ data "azurerm_user_assigned_identity" "cert-manager-mi" {
name = "radix-id-certmanager-${module.config.environment}"
}

resource "azurerm_federated_identity_credential" "cert-manager-mi-fedcred" {
for_each = module.clusters.oidc_issuer_url

audience = ["api://AzureADTokenExchange"]
module "cert-manager-mi-fedcred" {
source = "../../../modules/federated-credentials"
for_each = module.clusters.oidc_issuer_url
name = "k8s-cert-manager-dns01-${each.key}-${module.config.environment}"
issuer = each.value
subject = "system:serviceaccount:cert-manager:cert-manager"
Expand Down
Loading