From aee45353c2a2e99000aa2b1e87d1b61e90f8b725 Mon Sep 17 00:00:00 2001 From: hyperfocus1337 Date: Wed, 13 Jul 2022 11:16:52 +0200 Subject: [PATCH 1/8] Update hashicorp/random provider to 3.3.2 --- caf_solution/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caf_solution/main.tf b/caf_solution/main.tf index 8bf4b29af..757236fcb 100644 --- a/caf_solution/main.tf +++ b/caf_solution/main.tf @@ -4,7 +4,7 @@ terraform { // azuread version driven by the caf module random = { source = "hashicorp/random" - version = "~> 3.1.0" + version = "~> 3.3.2" } external = { source = "hashicorp/external" From 7e4ab9461b1d3a5428b8ed4e3e31980067f04a57 Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Fri, 15 Jul 2022 07:08:03 +0000 Subject: [PATCH 2/8] Aligning version constraint with module 5.6.x --- caf_launchpad/main.tf | 2 +- caf_solution/main.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/caf_launchpad/main.tf b/caf_launchpad/main.tf index db5bd0e26..ee73d87f2 100644 --- a/caf_launchpad/main.tf +++ b/caf_launchpad/main.tf @@ -4,7 +4,7 @@ terraform { // azuread version driven by the caf module random = { source = "hashicorp/random" - version = "~> 3.1.0" + version = "~> 3.3.0" } external = { source = "hashicorp/external" diff --git a/caf_solution/main.tf b/caf_solution/main.tf index 8bf4b29af..31ed6f558 100644 --- a/caf_solution/main.tf +++ b/caf_solution/main.tf @@ -4,7 +4,7 @@ terraform { // azuread version driven by the caf module random = { source = "hashicorp/random" - version = "~> 3.1.0" + version = "~> 3.3.0" } external = { source = "hashicorp/external" From bbc81fe997d8533d9b985cab275070a3fca92c06 Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Fri, 15 Jul 2022 07:13:50 +0000 Subject: [PATCH 3/8] Rover update --- .devcontainer/docker-compose.yml | 2 +- .github/workflows/landingzones-tf100.yml | 10 +++++----- rover_on_ssh_host.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index f87ba737d..680c8260e 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -6,7 +6,7 @@ version: '3.7' services: rover: - image: aztfmod/rover-preview:1.2.1-2205.300342 + image: aztfmod/rover:1.2.3-2207.0210 user: vscode labels: diff --git a/.github/workflows/landingzones-tf100.yml b/.github/workflows/landingzones-tf100.yml index e2c5597fe..90af44660 100644 --- a/.github/workflows/landingzones-tf100.yml +++ b/.github/workflows/landingzones-tf100.yml @@ -39,7 +39,7 @@ jobs: random_length: ['5'] container: - image: aztfmod/rover-preview:1.2.1-2205.300342 + image: aztfmod/rover:1.2.3-2207.0210 options: --user 0 steps: @@ -92,7 +92,7 @@ jobs: ] container: - image: aztfmod/rover-preview:1.2.1-2205.300342 + image: aztfmod/rover:1.2.3-2207.0210 options: --user 0 steps: @@ -135,7 +135,7 @@ jobs: random_length: ['5'] container: - image: aztfmod/rover-preview:1.2.1-2205.300342 + image: aztfmod/rover:1.2.3-2207.0210 options: --user 0 steps: @@ -186,7 +186,7 @@ jobs: ] container: - image: aztfmod/rover-preview:1.2.1-2205.300342 + image: aztfmod/rover:1.2.3-2207.0210 options: --user 0 steps: @@ -228,7 +228,7 @@ jobs: random_length: ['5'] container: - image: aztfmod/rover-preview:1.2.1-2205.300342 + image: aztfmod/rover:1.2.3-2207.0210 options: --user 0 steps: diff --git a/rover_on_ssh_host.yml b/rover_on_ssh_host.yml index 8dc2b93c9..3ff4aab23 100644 --- a/rover_on_ssh_host.yml +++ b/rover_on_ssh_host.yml @@ -11,7 +11,7 @@ version: '3.7' services: rover: - image: aztfmod/rover-preview:1.2.1-2205.300342 + image: aztfmod/rover:1.2.3-2207.0210 user: vscode From 3d6fa1768323e23c8b29c82dd63446904205c963 Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Fri, 15 Jul 2022 07:24:54 +0000 Subject: [PATCH 4/8] Revert "Rover update" This reverts commit bbc81fe997d8533d9b985cab275070a3fca92c06. --- .devcontainer/docker-compose.yml | 2 +- .github/workflows/landingzones-tf100.yml | 10 +++++----- rover_on_ssh_host.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 680c8260e..f87ba737d 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -6,7 +6,7 @@ version: '3.7' services: rover: - image: aztfmod/rover:1.2.3-2207.0210 + image: aztfmod/rover-preview:1.2.1-2205.300342 user: vscode labels: diff --git a/.github/workflows/landingzones-tf100.yml b/.github/workflows/landingzones-tf100.yml index 90af44660..e2c5597fe 100644 --- a/.github/workflows/landingzones-tf100.yml +++ b/.github/workflows/landingzones-tf100.yml @@ -39,7 +39,7 @@ jobs: random_length: ['5'] container: - image: aztfmod/rover:1.2.3-2207.0210 + image: aztfmod/rover-preview:1.2.1-2205.300342 options: --user 0 steps: @@ -92,7 +92,7 @@ jobs: ] container: - image: aztfmod/rover:1.2.3-2207.0210 + image: aztfmod/rover-preview:1.2.1-2205.300342 options: --user 0 steps: @@ -135,7 +135,7 @@ jobs: random_length: ['5'] container: - image: aztfmod/rover:1.2.3-2207.0210 + image: aztfmod/rover-preview:1.2.1-2205.300342 options: --user 0 steps: @@ -186,7 +186,7 @@ jobs: ] container: - image: aztfmod/rover:1.2.3-2207.0210 + image: aztfmod/rover-preview:1.2.1-2205.300342 options: --user 0 steps: @@ -228,7 +228,7 @@ jobs: random_length: ['5'] container: - image: aztfmod/rover:1.2.3-2207.0210 + image: aztfmod/rover-preview:1.2.1-2205.300342 options: --user 0 steps: diff --git a/rover_on_ssh_host.yml b/rover_on_ssh_host.yml index 3ff4aab23..8dc2b93c9 100644 --- a/rover_on_ssh_host.yml +++ b/rover_on_ssh_host.yml @@ -11,7 +11,7 @@ version: '3.7' services: rover: - image: aztfmod/rover:1.2.3-2207.0210 + image: aztfmod/rover-preview:1.2.1-2205.300342 user: vscode From c6e68f29db42eda20ac1c1f6ca896c92553fb762 Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Thu, 21 Jul 2022 02:23:38 +0000 Subject: [PATCH 5/8] Fix bastion subnetting --- .../scenario/foundations/gitops/networking.tfvars | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/caf_solution/scenario/foundations/gitops/networking.tfvars b/caf_solution/scenario/foundations/gitops/networking.tfvars index e21c316fe..28834e999 100644 --- a/caf_solution/scenario/foundations/gitops/networking.tfvars +++ b/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 = { From 6dfb88048ba3f50b8365bf59836dc538414f3d04 Mon Sep 17 00:00:00 2001 From: Hong Yi Date: Sat, 20 Aug 2022 17:21:47 +0800 Subject: [PATCH 6/8] add support for static web app to caf_solution --- caf_solution/local.webapp.tf | 1 + caf_solution/variables.webapp.tf | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/caf_solution/local.webapp.tf b/caf_solution/local.webapp.tf index c69c19622..64844afb0 100644 --- a/caf_solution/local.webapp.tf +++ b/caf_solution/local.webapp.tf @@ -7,6 +7,7 @@ locals { app_services = var.app_services azurerm_application_insights = var.azurerm_application_insights function_apps = var.function_apps + static_sites = var.static_sites } ) } diff --git a/caf_solution/variables.webapp.tf b/caf_solution/variables.webapp.tf index 68afec4d7..3445b594b 100644 --- a/caf_solution/variables.webapp.tf +++ b/caf_solution/variables.webapp.tf @@ -23,4 +23,7 @@ variable "azurerm_application_insights" { } variable "function_apps" { default = {} -} \ No newline at end of file +} +variable "static_sites" { + default = {} +} From e0f5b4bfa80d9e7dad25844bcd383c44b2b52066 Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Fri, 9 Sep 2022 06:18:16 +0000 Subject: [PATCH 7/8] Fix for [bug] - Azure devops self-hosted agent set too much privilege on the agent folder #414 --- .../azure_devops_agent/scripts/devops_runtime_baremetal.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caf_solution/add-ons/azure_devops_agent/scripts/devops_runtime_baremetal.sh b/caf_solution/add-ons/azure_devops_agent/scripts/devops_runtime_baremetal.sh index 7abc06a08..9e5e8b407 100644 --- a/caf_solution/add-ons/azure_devops_agent/scripts/devops_runtime_baremetal.sh +++ b/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" From 57d67d2640ea8541e639d60fc70de5a3409c8876 Mon Sep 17 00:00:00 2001 From: ianlim Date: Tue, 13 Sep 2022 09:03:55 +0000 Subject: [PATCH 8/8] add remote virtual subnets referencing --- caf_solution/local.remote.tf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/caf_solution/local.remote.tf b/caf_solution/local.remote.tf index 219fbf60c..f5a6f9753 100644 --- a/caf_solution/local.remote.tf +++ b/caf_solution/local.remote.tf @@ -229,6 +229,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, {})) }