Provider upgrades for Microsoft.TimeSeriesInsights fix (#4097)

* changes made to fix the recent provider issues * Update deploy_tre.yml * Update deploy_tre.yml * update to missing values * Update deploy_tre.yml * Update Dockerfile.tmpl * Update Dockerfile.tmpl * Create config.sample.yaml * Update porter files * update certs template --------- Co-authored-by: danny-cooke-icl <[email protected]> Co-authored-by: tim-allen-ck <[email protected]>
microsoft · Sep 26, 2024 · 0af4c94 · 0af4c94
1 parent 55a1001
commit 0af4c94
Show file tree

Hide file tree

Showing 118 changed files with 835 additions and 505 deletions.
diff --git a/core/terraform/.terraform.lock.hcl b/core/terraform/.terraform.lock.hcl
diff --git a/core/terraform/airlock/main.tf b/core/terraform/airlock/main.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">= 3.16"
+      version = ">= 3.112"
     }
     azapi = {
       source  = "Azure/azapi"

diff --git a/core/terraform/appgateway/main.tf b/core/terraform/appgateway/main.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">= 3.8"
+      version = ">= 3.112"
     }
   }
 }
diff --git a/core/terraform/azure-monitor/main.tf b/core/terraform/azure-monitor/main.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">= 3.8"
+      version = ">= 3.112"
     }
   }
 }
diff --git a/core/terraform/main.tf b/core/terraform/main.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.108.0"
+      version = "=3.112.0"
     }
     random = {
       source  = "hashicorp/random"

diff --git a/core/terraform/network/main.tf b/core/terraform/network/main.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">= 3.8"
+      version = ">= 3.112"
     }
   }
 }
diff --git a/core/terraform/resource_processor/vmss_porter/main.tf b/core/terraform/resource_processor/vmss_porter/main.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">= 3.8"
+      version = ">= 3.112"
     }
     random = {
       source  = "hashicorp/random"

diff --git a/core/terraform/upgrade.sh b/core/terraform/upgrade.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+# This script is used to install the bundle directly without having to interact with Porter
+
+# This script assumes you have created an .env from the sample and the variables
+# will come from there.
+# shellcheck disable=SC2154
+terraform init -upgrade -reconfigure -input=false -backend=true \
+    -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \
+    -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \
+    -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \
+    -backend-config="key=${TF_VAR_tre_resource_id}-core"
diff --git a/core/version.txt b/core/version.txt
@@ -1 +1 @@
-__version__ = "0.10.7"
+__version__ = "0.10.8"
diff --git a/devops/terraform/.terraform.lock.hcl b/devops/terraform/.terraform.lock.hcl
diff --git a/devops/terraform/terraform.tf b/devops/terraform/terraform.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.51.0"
+      version = "3.112.0"
     }
   }
 }
diff --git a/devops/terraform/upgrade.sh b/devops/terraform/upgrade.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+# This script is used to install the bundle directly without having to interact with Porter
+
+# This script assumes you have created an .env from the sample and the variables
+# will come from there.
+# shellcheck disable=SC2154
+terraform init -upgrade -reconfigure -input=false -backend=true \
+    -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \
+    -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \
+    -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \
+    -backend-config="key=${TF_VAR_tre_resource_id}-devops"
diff --git a/devops/version.txt b/devops/version.txt
@@ -1 +1 @@
-__version__ = "0.5.1"
+__version__ = "0.5.2"
diff --git a/templates/shared_services/admin-vm/porter.yaml b/templates/shared_services/admin-vm/porter.yaml
@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-shared-service-admin-vm
-version: 0.4.3
+version: 0.4.4
 description: "An admin vm shared service"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

diff --git a/templates/shared_services/admin-vm/terraform/.terraform.lock.hcl b/templates/shared_services/admin-vm/terraform/.terraform.lock.hcl
diff --git a/templates/shared_services/admin-vm/terraform/main.tf b/templates/shared_services/admin-vm/terraform/main.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.23.0"
+      version = "=3.112.0"
     }
     random = {
       source  = "hashicorp/random"

diff --git a/templates/shared_services/admin-vm/terraform/upgrade.sh b/templates/shared_services/admin-vm/terraform/upgrade.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+# This script is used to install the bundle directly without having to interact with Porter
+
+# This script assumes you have created an .env from the sample and the variables
+# will come from there.
+# shellcheck disable=SC2154
+terraform init -upgrade -reconfigure -input=false -backend=true \
+    -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \
+    -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \
+    -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \
+    -backend-config="key=${TF_VAR_tre_resource_id}-shared-adminvm"
diff --git a/templates/shared_services/airlock_notifier/porter.yaml b/templates/shared_services/airlock_notifier/porter.yaml
@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-shared-service-airlock-notifier
-version: 1.0.1
+version: 1.0.2
 description: "A shared service notifying on Airlock Operations"
 registry: azuretre
 dockerfile: Dockerfile.tmpl