Merge pull request #147 from Azure/AL-Nets

LZ Update
Azure · Mar 4, 2021 · b210c99 · b210c99
2 parents 2012109 + a1960cd
commit b210c99
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 28 deletions.
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -6,7 +6,7 @@
   version: '3.7'
   services:
     rover:
-      image: aztfmod/rover:2102.0100
+      image: aztfmod/rover:0.13.6-2103.0304
       user: vscode
 
       labels:

diff --git a/.github/workflows/landingzones-tf14.yml b/.github/workflows/landingzones-tf14.yml
@@ -16,6 +16,7 @@ env:
   ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
   ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
   ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}
+  ROVER_RUNNER: true
 
 jobs:
   foundations100:
@@ -29,7 +30,7 @@ jobs:
           random_length: ['5']
 
     container:
-      image: aztfmod/roverdev:0.14.6-2102.090746
+      image: aztfmod/rover:0.14.7-2103.0304
       options: --user 0
 
     steps:
@@ -78,7 +79,7 @@ jobs:
           ]
 
     container:
-      image: aztfmod/roverdev:0.14.6-2102.090746
+      image: aztfmod/rover:0.14.7-2103.0304
       options: --user 0
 
     steps:
@@ -122,7 +123,7 @@ jobs:
           random_length: ['5']
 
     container:
-      image: aztfmod/roverdev:0.14.6-2102.090746
+      image: aztfmod/rover:0.14.7-2103.0304
       options: --user 0
 
     steps:
@@ -169,7 +170,7 @@ jobs:
           ]
 
     container:
-      image: aztfmod/roverdev:0.14.6-2102.090746
+      image: aztfmod/rover:0.14.7-2103.0304
       options: --user 0
 
     steps:
@@ -212,7 +213,7 @@ jobs:
         random_length: ['5']
 
     container:
-      image: aztfmod/roverdev:0.14.6-2102.090746
+      image: aztfmod/rover:0.14.7-2103.0304
       options: --user 0
 
     steps:

diff --git a/.github/workflows/landingzones-tf15.yml b/.github/workflows/landingzones-tf15.yml
@@ -16,6 +16,7 @@ env:
   ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
   ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
   ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}
+  ROVER_RUNNER: true
 
 jobs:
   foundations100:
@@ -29,7 +30,7 @@ jobs:
           random_length: ['5']
 
     container:
-      image: aztfmod/roveralpha:0.15.0-alpha20210127-2102.090746
+      image: aztfmod/rover:0.15.0-alpha20210210-2103.0304
       options: --user 0
 
     steps:
@@ -78,7 +79,7 @@ jobs:
           ]
 
     container:
-      image: aztfmod/roveralpha:0.15.0-alpha20210127-2102.090746
+      image: aztfmod/rover:0.15.0-alpha20210210-2103.0304
       options: --user 0
 
     steps:
@@ -122,7 +123,7 @@ jobs:
           random_length: ['5']
 
     container:
-      image: aztfmod/roveralpha:0.15.0-alpha20210127-2102.090746
+      image: aztfmod/rover:0.15.0-alpha20210210-2103.0304
       options: --user 0
 
     steps:
@@ -169,7 +170,7 @@ jobs:
           ]
 
     container:
-      image: aztfmod/roveralpha:0.15.0-alpha20210127-2102.090746
+      image: aztfmod/rover:0.15.0-alpha20210210-2103.0304
       options: --user 0
 
     steps:
@@ -212,7 +213,7 @@ jobs:
         random_length: ['5']
 
     container:
-      image: aztfmod/roveralpha:0.15.0-alpha20210127-2102.090746
+      image: aztfmod/rover:0.15.0-alpha20210210-2103.0304
       options: --user 0
 
     steps:

diff --git a/.github/workflows/landingzones.yml b/.github/workflows/landingzones.yml
@@ -28,6 +28,7 @@ env:
   ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
   ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
   ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}
+  ROVER_RUNNER: true
 
 jobs:
   foundations100:
@@ -41,7 +42,7 @@ jobs:
           random_length: ['5']
 
     container:
-      image: aztfmod/rover:2102.0100
+      image: aztfmod/rover:0.13.6-2103.0304
       options: --user 0
 
     steps:
@@ -90,7 +91,7 @@ jobs:
           ]
 
     container:
-      image: aztfmod/rover:2102.0100
+      image: aztfmod/rover:0.13.6-2103.0304
       options: --user 0
 
     steps:
@@ -134,7 +135,7 @@ jobs:
           random_length: ['5']
 
     container:
-      image: aztfmod/rover:2102.0100
+      image: aztfmod/rover:0.13.6-2103.0304
       options: --user 0
 
     steps:
@@ -181,7 +182,7 @@ jobs:
           ]
 
     container:
-      image: aztfmod/rover:2102.0100
+      image: aztfmod/rover:0.13.6-2103.0304
       options: --user 0
 
     steps:
@@ -224,7 +225,7 @@ jobs:
         random_length: ['5']
 
     container:
-      image: aztfmod/rover:2102.0100
+      image: aztfmod/rover:0.13.6-2103.0304
       options: --user 0
 
     steps:

diff --git a/landingzones/caf_networking/landingzone.tf b/landingzones/caf_networking/landingzone.tf
@@ -30,6 +30,7 @@ module "networking" {
     private_dns                                             = var.private_dns
     private_endpoints                                       = var.private_endpoints
     public_ip_addresses                                     = var.public_ip_addresses
+    load_balancers                                          = var.load_balancers
     route_tables                                            = var.route_tables
     vhub_peerings                                           = var.vhub_peerings
     virtual_network_gateways                                = var.virtual_network_gateways

diff --git a/landingzones/caf_networking/variables.tf b/landingzones/caf_networking/variables.tf
@@ -141,4 +141,7 @@ variable dns_zone_records {
 }
 variable virtual_network_gateways {
   default = {}
+}
+variable load_balancers {
+  default = {}
 }
diff --git a/landingzones/caf_solutions/add-ons/aks_applications/locals.remote_tfstates.tf b/landingzones/caf_solutions/add-ons/aks_applications/locals.remote_tfstates.tf
@@ -42,12 +42,12 @@ locals {
 
   clusters = local.remote.aks_clusters[var.landingzone.global_settings_key]
   k8sconfigs = { for key, value in values(local.clusters) : key => {
-    host                   = value.enable_rbac ? value.kube_admin_config.0.host : value.kube_config.0.host
-    username               = value.enable_rbac ? value.kube_admin_config.0.username : value.kube_config.0.username
-    password               = value.enable_rbac ? value.kube_admin_config.0.password : value.kube_config.0.password
-    client_certificate     = value.enable_rbac ? base64decode(value.kube_admin_config.0.client_certificate) : base64decode(value.kube_config.0.client_certificate)
-    client_key             = value.enable_rbac ? base64decode(value.kube_admin_config.0.client_key) : base64decode(value.kube_config.0.client_key)
-    cluster_ca_certificate = value.enable_rbac ? base64decode(value.kube_admin_config.0.cluster_ca_certificate) : base64decode(value.kube_config.0.cluster_ca_certificate)
+    host                   = value.enable_rbac ? value.kube_config.0.host : value.kube_config.0.host
+    username               = value.enable_rbac ? value.kube_config.0.username : value.kube_config.0.username
+    password               = value.enable_rbac ? value.kube_config.0.password : value.kube_config.0.password
+    client_certificate     = value.enable_rbac ? base64decode(value.kube_config.0.client_certificate) : base64decode(value.kube_config.0.client_certificate)
+    client_key             = value.enable_rbac ? base64decode(value.kube_config.0.client_key) : base64decode(value.kube_config.0.client_key)
+    cluster_ca_certificate = value.enable_rbac ? base64decode(value.kube_config.0.cluster_ca_certificate) : base64decode(value.kube_config.0.cluster_ca_certificate)
     }
   }
 

diff --git a/landingzones/caf_solutions/add-ons/aks_applications/main.tf b/landingzones/caf_solutions/add-ons/aks_applications/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 2.43"
+      version = "~> 2.49"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"

diff --git a/landingzones/caf_solutions/landingzone.tf b/landingzones/caf_solutions/landingzone.tf
@@ -58,17 +58,17 @@ module "caf" {
   }
 
   networking = {
-
     application_gateway_applications     = var.application_gateway_applications
     application_gateways                 = var.application_gateways
     azurerm_routes                       = var.azurerm_routes
-    dns_zones                            = var.dns_zones
     dns_zone_records                     = var.dns_zone_records
+    dns_zones                            = var.dns_zones
     domain_name_registrations            = var.domain_name_registrations
     express_route_circuit_authorizations = var.express_route_circuit_authorizations
     express_route_circuits               = var.express_route_circuits
     front_door_waf_policies              = var.front_door_waf_policies
     front_doors                          = var.front_doors
+    load_balancers                       = var.load_balancers
     local_network_gateways               = var.local_network_gateways
     network_security_group_definition    = var.network_security_group_definition
     network_watchers                     = var.network_watchers
@@ -119,10 +119,10 @@ module "caf" {
   }
 
   security = {
-    keyvault_keys                 = var.keyvault_keys
-    keyvault_certificates         = var.keyvault_certificates
-    keyvault_certificate_requests = var.keyvault_certificate_requests
     keyvault_certificate_issuers  = var.keyvault_certificate_issuers
+    keyvault_certificate_requests = var.keyvault_certificate_requests
+    keyvault_certificates         = var.keyvault_certificates
+    keyvault_keys                 = var.keyvault_keys
   }
 
   shared_services = {

diff --git a/landingzones/caf_solutions/variables.tf b/landingzones/caf_solutions/variables.tf
@@ -266,4 +266,7 @@ variable dns_zone_records {
 }
 variable keyvault_keys {
   default = {}
+}
+variable load_balancers {
+  default = {}
 }