Skip to content

Commit d6fa1c6

Browse files
committed
removing aks from the equation - prepping for initial release of content
1 parent 2bb3137 commit d6fa1c6

File tree

3 files changed

+1
-38
lines changed

3 files changed

+1
-38
lines changed

terraform/data.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,4 @@ data "azurerm_resource_group" "rg" {
22
name = var.resource_group_name
33
}
44

5-
data "azurerm_kubernetes_cluster" "aks" {
6-
name = var.aks_name
7-
resource_group_name = data.azurerm_resource_group.rg.name
8-
}
9-
105
data "azuread_client_config" "current" {}

terraform/main.tf

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ resource "azurerm_role_assignment" "uaid_contributor" {
7878
scope = azurerm_container_registry.this_container_registry.id
7979
}
8080

81-
resource "azurerm_federated_identity_credential" "ado_fed-id" {
81+
resource "azurerm_federated_identity_credential" "ado_fed_id" {
8282
name = "DevSecOps-Fed-Identity"
8383
resource_group_name = azurerm_resource_group.this_resource_group.name
8484
audience = ["api://AzureADTokenExchange"]
@@ -172,31 +172,3 @@ resource "azuredevops_serviceendpoint_azurerm" "arm_sc" {
172172
}
173173
}
174174

175-
resource "azurerm_kubernetes_cluster" "this_aks_cluster" {
176-
name = var.aks_name
177-
location = var.location
178-
resource_group_name = azurerm_resource_group.this_resource_group.name
179-
dns_prefix = "DSB"
180-
181-
182-
default_node_pool {
183-
name = "default"
184-
node_count = 1
185-
vm_size = "Standard_A2_v2"
186-
}
187-
188-
identity {
189-
type = "UserAssigned"
190-
identity_ids = [azurerm_user_assigned_identity.this_uaid.id]
191-
}
192-
193-
tags = {
194-
Environment = "Production"
195-
}
196-
depends_on = [
197-
azurerm_role_assignment.uaid_contributor,
198-
azurerm_role_assignment.acr_pull,
199-
azurerm_role_assignment.acr_push
200-
]
201-
}
202-

terraform/outputs.tf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ output "acr_url" {
66
value = azurerm_container_registry.this_container_registry.login_server
77
}
88

9-
output "aks_name" {
10-
value = azurerm_kubernetes_cluster.this_aks_cluster.name
11-
}
12-
139
output "azure_service_connection_name" {
1410
value = azuredevops_serviceendpoint_azurerm.arm_sc.service_endpoint_name
1511
}

0 commit comments

Comments
 (0)