Merge branch 'main' into int-5.6.0

caf_solution/add-ons/azure_devops_agent/scripts/devops_runtime_baremetal.sh

@@ -94,7 +94,7 @@ for agent_num in $(seq 1 ${num_agent}); do
     name="${agent_prefix}-${agent_num}"
     echo "installing agent $name"
     tar zxvf ../agent_package.tar.gz
-    chmod -R 777 .
+    chmod -R 770 .
     echo "extracted"
     ./bin/installdependencies.sh || true
     echo "dependencies installed"

caf_solution/local.remote.tf

@@ -232,6 +232,9 @@ locals {
     virtual_machines = {
       for key, value in try(var.landingzone.tfstates, {}) : key => merge(try(data.terraform_remote_state.remote[key].outputs.objects[key].virtual_machines, {}))
     }
+    virtual_subnets = {
+      for key, value in try(var.landingzone.tfstates, {}) : key => merge(try(data.terraform_remote_state.remote[key].outputs.objects[key].virtual_subnets, {}))
+    }
     virtual_wans = {
       for key, value in try(var.landingzone.tfstates, {}) : key => merge(try(data.terraform_remote_state.remote[key].outputs.objects[key].virtual_wans, {}))
     }

caf_solution/local.webapp.tf

@@ -8,6 +8,7 @@ locals {
       app_services                 = var.app_services
       azurerm_application_insights = var.azurerm_application_insights
       function_apps                = var.function_apps
+      static_sites                 = var.static_sites
     }
   )
 }

caf_solution/main.tf

@@ -2,6 +2,10 @@ terraform {
   required_providers {
     // azurerm version driven by the caf module
     // azuread version driven by the caf module
+    random = {
+      source  = "hashicorp/random"
+      version = "~> 3.3.0"
+    }
     external = {
       source  = "hashicorp/external"
       version = "~> 2.2.0"

caf_solution/scenario/foundations/gitops/networking.tfvars

@@ -39,37 +39,37 @@ vnets = {
     subnets = {
       AzureBastionSubnet = {
         name    = "AzureBastionSubnet" #Must be called AzureBastionSubnet
-        cidr    = ["10.100.100.24/29"]
+        cidr    = ["10.100.100.0/26"]
         nsg_key = "azure_bastion_nsg"
       }
       jumpbox = {
         name              = "jumpbox"
-        cidr              = ["10.100.100.32/29"]
+        cidr              = ["10.100.100.64/29"]
         service_endpoints = ["Microsoft.KeyVault"]
       }
       release_agent_level0 = {
         name              = "level0"
-        cidr              = ["10.100.100.40/29"]
+        cidr              = ["10.100.100.72/29"]
         service_endpoints = ["Microsoft.KeyVault"]
       }
       release_agent_level1 = {
         name              = "level1"
-        cidr              = ["10.100.100.48/29"]
+        cidr              = ["10.100.100.80/29"]
         service_endpoints = ["Microsoft.KeyVault"]
       }
       release_agent_level2 = {
         name              = "level2"
-        cidr              = ["10.100.100.56/29"]
+        cidr              = ["10.100.100.88/29"]
         service_endpoints = ["Microsoft.KeyVault"]
       }
       release_agent_level3 = {
         name              = "level3"
-        cidr              = ["10.100.100.64/29"]
+        cidr              = ["10.100.100.96/29"]
         service_endpoints = ["Microsoft.KeyVault"]
       }
       release_agent_level4 = {
         name              = "level4"
-        cidr              = ["10.100.100.72/29"]
+        cidr              = ["10.100.100.104/29"]
         service_endpoints = ["Microsoft.KeyVault"]
       }
       private_endpoints = {

caf_solution/variables.webapp.tf

@@ -26,4 +26,7 @@ variable "azurerm_application_insights" {
 }
 variable "function_apps" {
   default = {}
-}
+}
+variable "static_sites" {
+  default = {}
+}