Skip to content
This repository has been archived by the owner on Jul 26, 2024. It is now read-only.

Update components november 2023 #512

Merged
merged 2 commits into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
version: '3.7'
services:
rover:
image: aztfmod/rover:1.5.6-2309.0507
image: aztfmod/rover:1.6.4-2311.2003
user: vscode

labels:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/landingzones-tf100.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
random_length: ['5']

container:
image: aztfmod/rover:1.5.6-2309.0507
image: aztfmod/rover:1.6.4-2311.2003
options: --user 0

steps:
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
]

container:
image: aztfmod/rover:1.5.6-2309.0507
image: aztfmod/rover:1.6.4-2311.2003
options: --user 0

steps:
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
random_length: ['5']

container:
image: aztfmod/rover:1.5.6-2309.0507
image: aztfmod/rover:1.6.4-2311.2003
options: --user 0

steps:
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
]

container:
image: aztfmod/rover:1.5.6-2309.0507
image: aztfmod/rover:1.6.4-2311.2003
options: --user 0

steps:
Expand Down Expand Up @@ -244,7 +244,7 @@ jobs:
random_length: ['5']

container:
image: aztfmod/rover:1.5.6-2309.0507
image: aztfmod/rover:1.6.4-2311.2003
options: --user 0

steps:
Expand Down
2 changes: 1 addition & 1 deletion caf_launchpad/dynamic_secrets.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

module "dynamic_keyvault_secrets" {
source = "aztfmod/caf/azurerm//modules/security/dynamic_keyvault_secrets"
version = "5.7.6"
version = "5.7.7"

for_each = try(var.dynamic_keyvault_secrets, {})

Expand Down
2 changes: 1 addition & 1 deletion caf_launchpad/landingzone.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "launchpad" {
source = "aztfmod/caf/azurerm"
version = "5.7.6"
version = "5.7.7"
# source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git?ref=main"

providers = {
Expand Down
2 changes: 1 addition & 1 deletion caf_solution/dynamic_secrets.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "dynamic_keyvault_secrets" {
source = "aztfmod/caf/azurerm//modules/security/dynamic_keyvault_secrets"
version = "5.7.6"
version = "5.7.7"

for_each = {
for keyvault_key, secrets in try(var.dynamic_keyvault_secrets, {}) : keyvault_key => {
Expand Down
2 changes: 1 addition & 1 deletion caf_solution/landingzone.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "solution" {
source = "aztfmod/caf/azurerm"
version = "5.7.6"
version = "5.7.7"
# source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git?ref=main"

providers = {
Expand Down
55 changes: 30 additions & 25 deletions caf_solution/local.compute.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,36 @@ locals {
compute = merge(
var.compute,
{
aks_clusters = var.aks_clusters
aro_clusters = var.aro_clusters
availability_sets = var.availability_sets
azure_container_registries = var.azure_container_registries
bastion_hosts = var.bastion_hosts
batch_accounts = var.batch_accounts
batch_applications = var.batch_applications
batch_certificates = var.batch_certificates
batch_jobs = var.batch_jobs
batch_pools = var.batch_pools
container_groups = var.container_groups
dedicated_host_groups = var.dedicated_host_groups
dedicated_hosts = var.dedicated_hosts
machine_learning_compute_instance = var.machine_learning_compute_instance
proximity_placement_groups = var.proximity_placement_groups
runbooks = var.runbooks
virtual_machine_scale_sets = var.virtual_machine_scale_sets
virtual_machines = var.virtual_machines
vmware_clusters = var.vmware_clusters
vmware_express_route_authorizations = var.vmware_express_route_authorizations
vmware_private_clouds = var.vmware_private_clouds
wvd_application_groups = var.wvd_application_groups
wvd_applications = var.wvd_applications
wvd_host_pools = var.wvd_host_pools
wvd_workspaces = var.wvd_workspaces
aks_clusters = var.aks_clusters
aro_clusters = var.aro_clusters
availability_sets = var.availability_sets
azure_container_registries = var.azure_container_registries
bastion_hosts = var.bastion_hosts
batch_accounts = var.batch_accounts
batch_applications = var.batch_applications
batch_certificates = var.batch_certificates
batch_jobs = var.batch_jobs
batch_pools = var.batch_pools
container_apps = var.container_apps
container_app_dapr_components = var.container_app_dapr_components
container_app_environments = var.container_app_environments
container_app_environment_certificates = var.container_app_environment_certificates
container_app_environment_storages = var.container_app_environment_storages
container_groups = var.container_groups
dedicated_host_groups = var.dedicated_host_groups
dedicated_hosts = var.dedicated_hosts
machine_learning_compute_instance = var.machine_learning_compute_instance
proximity_placement_groups = var.proximity_placement_groups
runbooks = var.runbooks
virtual_machine_scale_sets = var.virtual_machine_scale_sets
virtual_machines = var.virtual_machines
vmware_clusters = var.vmware_clusters
vmware_express_route_authorizations = var.vmware_express_route_authorizations
vmware_private_clouds = var.vmware_private_clouds
wvd_application_groups = var.wvd_application_groups
wvd_applications = var.wvd_applications
wvd_host_pools = var.wvd_host_pools
wvd_workspaces = var.wvd_workspaces
}
)
}
15 changes: 15 additions & 0 deletions caf_solution/variables.compute.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,21 @@ variable "batch_jobs" {
variable "batch_pools" {
default = {}
}
variable "container_app_environments" {
default = {}
}
variable "container_app_environment_certificates" {
default = {}
}
variable "container_app_dapr_components" {
default = {}
}
variable "container_apps" {
default = {}
}
variable "container_app_environment_storages" {
default = {}
}
variable "container_groups" {
default = {}
}
Expand Down
2 changes: 1 addition & 1 deletion rover_on_ssh_host.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
version: '3.7'
services:
rover:
image: aztfmod/rover:1.5.6-2309.0507
image: aztfmod/rover:1.6.4-2311.2003

user: vscode

Expand Down
Loading