Skip to content

Commit

Permalink
Add some Terraform outputs in Playground_Platform_C2 (#1400)
Browse files Browse the repository at this point in the history
* Add some Terraform outputs in Playground_Platform_C2

* Some outputs

* Some outputs

---------

Co-authored-by: Automatic Update <radix@statoilsrm.onmicrosoft.com>
  • Loading branch information
sveinpj and Automatic Update authored Jul 16, 2024
1 parent ec65d8a commit 80dfb38
Show file tree
Hide file tree
Showing 10 changed files with 57 additions and 9 deletions.
10 changes: 5 additions & 5 deletions scripts/aks/playground.env
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@ ARM_BOOTSTRAP_COUNT="1"
ARM_DISK_SIZE="1023"
ARM_VM_SIZE="Standard_B8ps_v2"
ARM_PIPE_MAX_COUNT="8"
ARM_PIPE_MIN_COUNT="0"
ARM_PIPE_MIN_COUNT="1"
ARM_USER_MAX_COUNT="8"
ARM_USER_MIN_COUNT="1"

X86_BOOTSTRAP_COUNT="1"
X86_DISK_SIZE="1023"
X86_VM_SIZE="Standard_B8as_v2"
X86_PIPE_MAX_COUNT="8"
X86_PIPE_MIN_COUNT="0"
X86_PIPE_MIN_COUNT="1"
X86_USER_MAX_COUNT="8"
X86_USER_MIN_COUNT="1"

SYSTEM_BOOTSTRAP_COUNT="2"
SYSTEM_BOOTSTRAP_COUNT="3"
SYSTEM_DISK_SIZE="1023"
SYSTEM_VM_SIZE="Standard_B8as_v2"
SYSTEM_MAX_COUNT="3"
SYSTEM_MIN_COUNT="2"
SYSTEM_MAX_COUNT="4"
SYSTEM_MIN_COUNT="3"

POD_PER_NODE="110" # how many pods each node can run. Max in AKS and k8s is 110
OUTBOUND_IP_COUNT="2" # how many public ips will be assigned to the cluster.
Expand Down
8 changes: 8 additions & 0 deletions terraform/subscriptions/s940/c2/clusters/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -155,3 +155,11 @@ module "nsg" {
resource_group_name = each.value.resource_group_name
destination_address_prefix = each.value.destination_address_prefix
}

output "radix_id_aks_mi_id" {
value = module.radix_id_aks_mi.data.id
}

output "radix_id_akskubelet_mi_id" {
value = module.radix_id_akskubelet_mi.data.id
}
4 changes: 4 additions & 0 deletions terraform/subscriptions/s940/c2/common/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,7 @@ output "workspace_id" {
output "log_storageaccount_id" {
value = module.storageaccount["log"].data.id
}

output "acr_id" {
value = module.acr.azurerm_container_registry_id
}
8 changes: 8 additions & 0 deletions terraform/subscriptions/s940/extmon/clusters/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -148,3 +148,11 @@ module "radix_id_velero_mi" {
}
}
}

output "radix_id_aks_mi_id" {
value = module.radix_id_aks_mi.data.id
}

output "radix_id_akskubelet_mi_id" {
value = module.radix_id_akskubelet_mi.data.id
}
8 changes: 8 additions & 0 deletions terraform/subscriptions/s940/prod/clusters/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -162,3 +162,11 @@ module "nsg" {
resource_group_name = each.value.resource_group_name
destination_address_prefix = each.value.destination_address_prefix
}

output "radix_id_aks_mi_id" {
value = module.radix_id_aks_mi.data.id
}

output "radix_id_akskubelet_mi_id" {
value = module.radix_id_akskubelet_mi.data.id
}
4 changes: 4 additions & 0 deletions terraform/subscriptions/s940/prod/common/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,7 @@ output "log_storageaccount_id" {
value = module.storageaccount["log"].data.id
}

output "acr_id" {
value = module.acr.azurerm_container_registry_id
}

1 change: 0 additions & 1 deletion terraform/subscriptions/s941/dev/common/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,4 @@ output "log_storageaccount_id" {

output "acr_id" {
value = module.acr.azurerm_container_registry_id

}
13 changes: 13 additions & 0 deletions terraform/subscriptions/s941/playground/clusters/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ module "radix_id_akskubelet_mi" {
role = "AcrPull"
scope_id = data.azurerm_container_registry.this.id
}
arcpulldev = {
role = "AcrPull"
scope_id = data.azurerm_container_registry.dev.id #TODO - Removed in the future
}
arccache = {
role = "AcrPull"
scope_id = data.azurerm_container_registry.cache.id
Expand Down Expand Up @@ -123,6 +127,7 @@ module "id_radix_akskubelet_mi" {
}
}


#Legacy AKS MI
module "id_radix_aks_mi" {
source = "../../../modules/userassignedidentity"
Expand Down Expand Up @@ -162,3 +167,11 @@ module "nsg" {
resource_group_name = each.value.resource_group_name
destination_address_prefix = each.value.destination_address_prefix
}

output "radix_id_aks_mi_id" {
value = module.radix_id_aks_mi.data.id
}

output "radix_id_akskubelet_mi_id" {
value = module.radix_id_akskubelet_mi.data.id
}
6 changes: 5 additions & 1 deletion terraform/subscriptions/s941/playground/common/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,8 @@ output "workspace_id" {

output "log_storageaccount_id" {
value = module.storageaccount["log"].data.id
}
}

output "acr_id" {
value = module.acr.azurerm_container_registry_id
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ data "azurerm_virtual_network" "vnets" {
module "vnet_peering" {
source = "../../../modules/vnet-peering"
for_each = module.clusters.vnets_url
hub_to_cluster_peering_name = "vnet-hub-to-playground-11" #TODO
cluster_to_hub_peering_name = "playground-11-to-vnet-hub" #TODO
hub_to_cluster_peering_name = "hub-to-${each.key}"
cluster_to_hub_peering_name = "${each.key}-to-hub"
cluster_vnet_resource_group = module.config.cluster_resource_group
vnet_cluster_name = data.azurerm_virtual_network.vnets[each.key].name
vnet_cluster_id = data.azurerm_virtual_network.vnets[each.key].id
Expand Down

0 comments on commit 80dfb38

Please sign in to comment.