Azure
/
caf-terraform-landingzones
зеркало из https://github.com/Azure/caf-terraform-landingzones.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Update with latests rover + update to aztfmod master

This commit is contained in:
lolorol 2021-12-08 02:32:39 +00:00
Родитель f99ed65a77
Коммит 0c533f0bef
10 изменённых файлов: 64 добавлений и 58 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
.devcontainer/docker-compose.yml
Просмотреть файл

@ -6,7 +6,7 @@
version: '3.7'
services:
rover:
image: aztfmod/rover:1.0.11-2112.0701
image: aztfmod/rover:1.0.11-2112.0723
user: vscode
labels:

12
.github/workflows/landingzones-tf100.yml поставляемый
Просмотреть файл

@ -23,6 +23,8 @@ env:
ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}
TF_REGISTRY_DISCOVERY_RETRY: 5
TF_REGISTRY_CLIENT_TIMEOUT: 15
ROVER_RUNNER: true
jobs:
@ -37,7 +39,7 @@ jobs:
random_length: ['5']
container:
image: aztfmod/rover:1.0.11-2112.0701
image: aztfmod/rover:1.0.11-2112.0723
options: --user 0
steps:
@ -90,7 +92,7 @@ jobs:
]
container:
image: aztfmod/rover:1.0.11-2112.0701
image: aztfmod/rover:1.0.11-2112.0723
options: --user 0
steps:
@ -133,7 +135,7 @@ jobs:
random_length: ['5']
container:
image: aztfmod/rover:1.0.11-2112.0701
image: aztfmod/rover:1.0.11-2112.0723
options: --user 0
steps:
@ -184,7 +186,7 @@ jobs:
]
container:
image: aztfmod/rover:1.0.11-2112.0701
image: aztfmod/rover:1.0.11-2112.0723
options: --user 0
steps:
@ -226,7 +228,7 @@ jobs:
random_length: ['5']
container:
image: aztfmod/rover:1.0.11-2112.0701
image: aztfmod/rover:1.0.11-2112.0723
options: --user 0
steps:

12
.github/workflows/landingzones-tf14.yml поставляемый
Просмотреть файл

@ -17,6 +17,8 @@ env:
ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}
TF_REGISTRY_DISCOVERY_RETRY: 5
TF_REGISTRY_CLIENT_TIMEOUT: 15
ROVER_RUNNER: true
jobs:
@ -31,7 +33,7 @@ jobs:
random_length: ['5']
container:
image: aztfmod/rover:0.14.11-2112.0701
image: aztfmod/rover:0.14.11-2112.0723
options: --user 0
steps:
@ -83,7 +85,7 @@ jobs:
]
container:
image: aztfmod/rover:0.14.11-2112.0701
image: aztfmod/rover:0.14.11-2112.0723
options: --user 0
steps:
@ -126,7 +128,7 @@ jobs:
random_length: ['5']
container:
image: aztfmod/rover:0.14.11-2112.0701
image: aztfmod/rover:0.14.11-2112.0723
options: --user 0
steps:
@ -177,7 +179,7 @@ jobs:
]
container:
image: aztfmod/rover:0.14.11-2112.0701
image: aztfmod/rover:0.14.11-2112.0723
options: --user 0
steps:
@ -219,7 +221,7 @@ jobs:
random_length: ['5']
container:
image: aztfmod/rover:0.14.11-2112.0701
image: aztfmod/rover:0.14.11-2112.0723
options: --user 0
steps:

12
.github/workflows/landingzones-tf15.yml поставляемый
Просмотреть файл

@ -17,6 +17,8 @@ env:
ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}
TF_REGISTRY_DISCOVERY_RETRY: 5
TF_REGISTRY_CLIENT_TIMEOUT: 15
ROVER_RUNNER: true
jobs:
@ -31,7 +33,7 @@ jobs:
random_length: ['5']
container:
image: aztfmod/rover:0.15.5-2112.0701
image: aztfmod/rover:0.15.5-2112.0723
options: --user 0
steps:
@ -83,7 +85,7 @@ jobs:
]
container:
image: aztfmod/rover:0.15.5-2112.0701
image: aztfmod/rover:0.15.5-2112.0723
options: --user 0
steps:
@ -126,7 +128,7 @@ jobs:
random_length: ['5']
container:
image: aztfmod/rover:0.15.5-2112.0701
image: aztfmod/rover:0.15.5-2112.0723
options: --user 0
steps:
@ -177,7 +179,7 @@ jobs:
]
container:
image: aztfmod/rover:0.15.5-2112.0701
image: aztfmod/rover:0.15.5-2112.0723
options: --user 0
steps:
@ -219,7 +221,7 @@ jobs:
random_length: ['5']
container:
image: aztfmod/rover:0.15.5-2112.0701
image: aztfmod/rover:0.15.5-2112.0723
options: --user 0
steps:

2
caf_launchpad/dynamic_secrets.tf
Просмотреть файл

@ -3,7 +3,7 @@ module "dynamic_keyvault_secrets" {
# source = "aztfmod/caf/azurerm//modules/security/dynamic_keyvault_secrets"
# version = "~>5.4.2"
source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git//modules/security/dynamic_keyvault_secrets?ref=p.remote_rg"
source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git//modules/security/dynamic_keyvault_secrets?ref=master"
for_each = try(var.dynamic_keyvault_secrets, {})

2
caf_launchpad/landingzone.tf
Просмотреть файл

@ -3,7 +3,7 @@ module "launchpad" {
# version = "~>5.4.2"
source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git?ref=p.remote_rg"
source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git?ref=master"
# source = "../../aztfmod"
providers = {

6
caf_solution/dynamic_secrets.tf
Просмотреть файл

@ -1,8 +1,8 @@
module "dynamic_keyvault_secrets" {
source = "aztfmod/caf/azurerm//modules/security/dynamic_keyvault_secrets"
version = "~>5.4.2"
# source = "aztfmod/caf/azurerm//modules/security/dynamic_keyvault_secrets"
# version = "~>5.4.2"
# source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git//modules/security/dynamic_keyvault_secrets?ref=master"
source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git//modules/security/dynamic_keyvault_secrets?ref=master"
for_each = {
for keyvault_key, secrets in try(var.dynamic_keyvault_secrets, {}) : keyvault_key => {

2
caf_solution/landingzone.tf
Просмотреть файл

@ -2,7 +2,7 @@ module "solution" {
# source = "aztfmod/caf/azurerm"
# version = "~>5.4.2"
source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git?ref=p.remote_rg"
source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git?ref=master"
# source = "../../aztfmod"
providers = {

10
caf_solution/vm_extensions.tf
Просмотреть файл

@ -6,7 +6,7 @@ module "vm_extension_monitoring_agent" {
# source = "aztfmod/caf/azurerm//modules/compute/virtual_machine_extensions"
# version = "~>5.4.0"
source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git//modules/compute/virtual_machine_extensions?ref=p.remote_rg"
source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git//modules/compute/virtual_machine_extensions?ref=master"
depends_on = [module.solution]
@ -28,7 +28,7 @@ module "vm_extension_diagnostics" {
# source = "aztfmod/caf/azurerm//modules/compute/virtual_machine_extensions"
# version = "~>5.4.0"
source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git//modules/compute/virtual_machine_extensions?ref=p.remote_rg"
source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git//modules/compute/virtual_machine_extensions?ref=master"
depends_on = [module.solution]
@ -55,7 +55,7 @@ module "vm_extension_microsoft_azure_domainjoin" {
# source = "/tf/caf/aztfmod/modules/compute/virtual_machine_extensions"
source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git//modules/compute/virtual_machine_extensions?ref=p.remote_rg"
source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git//modules/compute/virtual_machine_extensions?ref=master"
depends_on = [module.solution]
@ -77,7 +77,7 @@ module "vm_extension_session_host_dscextension" {
# source = "/tf/caf/aztfmod/modules/compute/virtual_machine_extensions"
source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git//modules/compute/virtual_machine_extensions?ref=p.remote_rg"
source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git//modules/compute/virtual_machine_extensions?ref=master"
depends_on = [module.vm_extension_microsoft_azure_domainjoin]
@ -99,7 +99,7 @@ module "vm_extension_custom_scriptextension" {
# source = "aztfmod/caf/azurerm//modules/compute/virtual_machine_extensions"
# version = "~>5.4.0"
source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git//modules/compute/virtual_machine_extensions?ref=p.remote_rg"
source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git//modules/compute/virtual_machine_extensions?ref=master"
depends_on = [module.solution, module.vm_extension_microsoft_azure_domainjoin]

62
caf_solution/vmss_extensions.tf
Просмотреть файл

@ -1,41 +1,41 @@
module "vmss_extension_microsoft_azure_domainjoin" {
source = "aztfmod/caf/azurerm//modules/compute/virtual_machine_scale_set_extensions"
version = "~>5.4.0"
# module "vmss_extension_microsoft_azure_domainjoin" {
# # source = "aztfmod/caf/azurerm//modules/compute/virtual_machine_scale_set_extensions"
# # version = "~>5.4.0"
# source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git//modules/compute/virtual_machine_scale_set_extensions?ref=master"
# source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git//modules/compute/virtual_machine_scale_set_extensions?ref=master"
depends_on = [module.solution]
# depends_on = [module.solution]
for_each = {
for key, value in try(var.virtual_machine_scale_sets, {}) : key => value
if try(value.virtual_machine_scale_set_extensions.microsoft_azure_domainjoin, null) != null
}
# for_each = {
# for key, value in try(var.virtual_machine_scale_sets, {}) : key => value
# if try(value.virtual_machine_scale_set_extensions.microsoft_azure_domainjoin, null) != null
# }
client_config = module.solution.client_config
virtual_machine_scale_set_id = module.solution.virtual_machine_scale_sets[each.key].id
extension = each.value.virtual_machine_scale_set_extensions.microsoft_azure_domainjoin
extension_name = "microsoft_azure_domainJoin"
keyvaults = merge(tomap({ (var.landingzone.key) = module.solution.keyvaults }), try(local.remote.keyvaults, {}))
}
# client_config = module.solution.client_config
# virtual_machine_scale_set_id = module.solution.virtual_machine_scale_sets[each.key].id
# extension = each.value.virtual_machine_scale_set_extensions.microsoft_azure_domainjoin
# extension_name = "microsoft_azure_domainJoin"
# keyvaults = merge(tomap({ (var.landingzone.key) = module.solution.keyvaults }), try(local.remote.keyvaults, {}))
# }
module "vmss_extension_custom_scriptextension" {
source = "aztfmod/caf/azurerm//modules/compute/virtual_machine_scale_set_extensions"
version = "~>5.4.0"
# module "vmss_extension_custom_scriptextension" {
# # source = "aztfmod/caf/azurerm//modules/compute/virtual_machine_scale_set_extensions"
# # version = "~>5.4.0"
# source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git//modules/compute/virtual_machine_scale_set_extensions?ref=master"
# source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git//modules/compute/virtual_machine_scale_set_extensions?ref=master"
depends_on = [module.solution]
# depends_on = [module.solution]
for_each = {
for key, value in try(var.virtual_machine_scale_sets, {}) : key => value
if try(value.virtual_machine_scale_set_extensions.custom_script, null) != null
}
# for_each = {
# for key, value in try(var.virtual_machine_scale_sets, {}) : key => value
# if try(value.virtual_machine_scale_set_extensions.custom_script, null) != null
# }
client_config = module.solution.client_config
virtual_machine_scale_set_id = module.solution.virtual_machine_scale_sets[each.key].id
extension = each.value.virtual_machine_scale_set_extensions.custom_script
extension_name = "custom_script"
managed_identities = merge(tomap({ (var.landingzone.key) = module.solution.managed_identities }), try(local.remote.managed_identities, {}))
storage_accounts = merge(tomap({ (var.landingzone.key) = module.solution.storage_accounts }), try(local.remote.storage_accounts, {}))
}
# client_config = module.solution.client_config
# virtual_machine_scale_set_id = module.solution.virtual_machine_scale_sets[each.key].id
# extension = each.value.virtual_machine_scale_set_extensions.custom_script
# extension_name = "custom_script"
# managed_identities = merge(tomap({ (var.landingzone.key) = module.solution.managed_identities }), try(local.remote.managed_identities, {}))
# storage_accounts = merge(tomap({ (var.landingzone.key) = module.solution.storage_accounts }), try(local.remote.storage_accounts, {}))
# }