Merge pull request #512 from Azure/AL-2310

Update components november 2023
Azure · Nov 27, 2023 · 6102521 · 6102521
2 parents 2a092d4 + 576bdf5
commit 6102521
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 36 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:1.5.6-2309.0507
+      image: aztfmod/rover:1.6.4-2311.2003
       user: vscode
 
       labels:

diff --git 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.5.6-2309.0507
+      image: aztfmod/rover:1.6.4-2311.2003
       options: --user 0
 
     steps:
@@ -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:
@@ -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:
@@ -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:
@@ -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:

diff --git a/caf_launchpad/dynamic_secrets.tf b/caf_launchpad/dynamic_secrets.tf
@@ -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, {})
 

diff --git a/caf_launchpad/landingzone.tf b/caf_launchpad/landingzone.tf
@@ -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 = {

diff --git a/caf_solution/dynamic_secrets.tf b/caf_solution/dynamic_secrets.tf
@@ -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 => {

diff --git a/caf_solution/landingzone.tf b/caf_solution/landingzone.tf
@@ -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 = {

diff --git a/caf_solution/local.compute.tf b/caf_solution/local.compute.tf
@@ -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
     }
   )
 }
diff --git a/caf_solution/variables.compute.tf b/caf_solution/variables.compute.tf
@@ -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 = {}
 }

diff --git 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.5.6-2309.0507
+    image: aztfmod/rover:1.6.4-2311.2003
 
     user: vscode