Merge pull request #201 from DFE-Digital/1839-bug-conflictingpublicne…

…tworkaccessandvirtualnetworkconfiguration 1839-bug-conflictingpublicnetworkaccessandvirtualnetworkconfiguration
DFE-Digital · Aug 22, 2024 · 6171aa6 · 6171aa6
2 parents 67cb45b + 180cc31
commit 6171aa6
Show file tree

Hide file tree

Showing 9 changed files with 99 additions and 52 deletions.
diff --git a/.github/workflows/aks_deploy.yml b/.github/workflows/aks_deploy.yml
@@ -200,6 +200,7 @@ jobs:
         with:
           docker-repository: ghcr.io/dfe-digital/teaching-school-hub-finder
           github-token: ${{ secrets.GITHUB_TOKEN }}
+          context: .
 
   permit-merge:
     name: Permit merge

diff --git a/.gitignore b/.gitignore
@@ -30,6 +30,7 @@ tmp/pids/*
 .terraform
 terraform/application/vendor
 terraform/domains/environment_domains/vendor
+terraform/domains/infrastructure/vendor/
 terraform.tfstate*
 bin/terrafile
 

diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1 @@
+terraform 1.5.4
diff --git a/terraform/application/.terraform.lock.hcl b/terraform/application/.terraform.lock.hcl
diff --git a/terraform/application/terraform.tf b/terraform/application/terraform.tf
@@ -3,15 +3,15 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.62.1"
+      version = "3.116.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "2.21.1"
+      version = "2.32.0"
     }
     statuscake = {
       source  = "StatusCakeDev/statuscake"
-      version = "2.1.0"
+      version = "2.2.2"
     }
   }
   backend "azurerm" {

diff --git a/terraform/domains/environment_domains/.terraform.lock.hcl b/terraform/domains/environment_domains/.terraform.lock.hcl
diff --git a/terraform/domains/environment_domains/terraform.tf b/terraform/domains/environment_domains/terraform.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.62.1"
+      version = "3.116.0"
     }
   }
   backend "azurerm" {

diff --git a/terraform/domains/infrastructure/.terraform.lock.hcl b/terraform/domains/infrastructure/.terraform.lock.hcl
diff --git a/terraform/domains/infrastructure/terraform.tf b/terraform/domains/infrastructure/terraform.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.62.1"
+      version = "3.116.0"
     }
   }
   backend "azurerm" {