diff --git a/.github/workflows/ci-terraform-blue.yaml b/.github/workflows/ci-terraform-blue.yaml index c922f77..790b91b 100644 --- a/.github/workflows/ci-terraform-blue.yaml +++ b/.github/workflows/ci-terraform-blue.yaml @@ -67,7 +67,7 @@ jobs: - name: "Setup Terraform" uses: hashicorp/setup-terraform@v3 with: - terraform_version: 1.9.8 + terraform_version: 1.10.1 terraform_wrapper: false - name: "Terraform Format" diff --git a/.github/workflows/ci-terraform-green.yaml b/.github/workflows/ci-terraform-green.yaml index 9c6a89c..42388bf 100644 --- a/.github/workflows/ci-terraform-green.yaml +++ b/.github/workflows/ci-terraform-green.yaml @@ -67,7 +67,7 @@ jobs: - name: "Setup Terraform" uses: hashicorp/setup-terraform@v3 with: - terraform_version: 1.9.8 + terraform_version: 1.10.1 terraform_wrapper: false - name: "Terraform Format" diff --git a/.github/workflows/ci-terraform-shared.yaml b/.github/workflows/ci-terraform-shared.yaml index 966dc92..701f8b0 100644 --- a/.github/workflows/ci-terraform-shared.yaml +++ b/.github/workflows/ci-terraform-shared.yaml @@ -31,7 +31,7 @@ jobs: - name: "Setup Terraform" uses: hashicorp/setup-terraform@v3 with: - terraform_version: 1.9.8 + terraform_version: 1.10.1 terraform_wrapper: false - name: "Terraform Format" diff --git a/README.md b/README.md index 51f6d15..bf19158 100644 --- a/README.md +++ b/README.md @@ -29,12 +29,12 @@ DRY is a great concept, and you should be aware that it will come true in the fu Prerequisites & tested -- [Terraform](https://www.terraform.io/docs/index.html): 1.9.8 - - hashicorp/azurerm: 4.10.0 +- [Terraform](https://www.terraform.io/docs/index.html): 1.10.1 + - hashicorp/azurerm: 4.13.0 - State store: Local - [TFLint](https://github.com/terraform-linters/tflint): 0.54.0 - [azurerm plugin](https://github.com/terraform-linters/tflint-ruleset-azurerm): 0.27.0 -- [Azure/kubelogin](https://github.com/Azure/kubelogin): 0.1.4 +- [Azure/kubelogin](https://github.com/Azure/kubelogin): 0.1.5 - Ubuntu: 22.04.5 LTS ### Privileges required for execution diff --git a/terraform/blue/aks/locals.tf b/terraform/blue/aks/locals.tf index ad84ccb..b38c07c 100644 --- a/terraform/blue/aks/locals.tf +++ b/terraform/blue/aks/locals.tf @@ -15,7 +15,7 @@ locals { cluster_name = "${var.prefix}-aks-anti-dry-iac-${var.aks.switch}-${var.suffix}" default = { - orchestrator_version = "1.31.1" + orchestrator_version = "1.31.2" vm_size = "Standard_D2ds_v5" os_disk_size_gb = 75 os_disk_type = "Ephemeral" diff --git a/terraform/blue/aks/main.tf b/terraform/blue/aks/main.tf index 76e2dea..b8244cc 100644 --- a/terraform/blue/aks/main.tf +++ b/terraform/blue/aks/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.9.8" + required_version = "~> 1.10.1" required_providers { azurerm = { diff --git a/terraform/blue/apps/main.tf b/terraform/blue/apps/main.tf index cfa7b78..c70e9bf 100644 --- a/terraform/blue/apps/main.tf +++ b/terraform/blue/apps/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.9.8" + required_version = "~> 1.10.1" required_providers { azurerm = { diff --git a/terraform/blue/main.tf b/terraform/blue/main.tf index 9d0bb57..b6a10a7 100644 --- a/terraform/blue/main.tf +++ b/terraform/blue/main.tf @@ -1,12 +1,12 @@ terraform { - required_version = "~> 1.9.8" + required_version = "~> 1.10.1" # Choose the backend according to your requirements # backend "remote" {} required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 4.10.0" + version = "~> 4.13.0" } } } diff --git a/terraform/green/aks/locals.tf b/terraform/green/aks/locals.tf index ad84ccb..b38c07c 100644 --- a/terraform/green/aks/locals.tf +++ b/terraform/green/aks/locals.tf @@ -15,7 +15,7 @@ locals { cluster_name = "${var.prefix}-aks-anti-dry-iac-${var.aks.switch}-${var.suffix}" default = { - orchestrator_version = "1.31.1" + orchestrator_version = "1.31.2" vm_size = "Standard_D2ds_v5" os_disk_size_gb = 75 os_disk_type = "Ephemeral" diff --git a/terraform/green/aks/main.tf b/terraform/green/aks/main.tf index 76e2dea..b8244cc 100644 --- a/terraform/green/aks/main.tf +++ b/terraform/green/aks/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.9.8" + required_version = "~> 1.10.1" required_providers { azurerm = { diff --git a/terraform/green/apps/main.tf b/terraform/green/apps/main.tf index cfa7b78..c70e9bf 100644 --- a/terraform/green/apps/main.tf +++ b/terraform/green/apps/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.9.8" + required_version = "~> 1.10.1" required_providers { azurerm = { diff --git a/terraform/green/main.tf b/terraform/green/main.tf index 9d0bb57..b6a10a7 100644 --- a/terraform/green/main.tf +++ b/terraform/green/main.tf @@ -1,12 +1,12 @@ terraform { - required_version = "~> 1.9.8" + required_version = "~> 1.10.1" # Choose the backend according to your requirements # backend "remote" {} required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 4.10.0" + version = "~> 4.13.0" } } } diff --git a/terraform/shared/main.tf b/terraform/shared/main.tf index 09c9ecb..be70f51 100644 --- a/terraform/shared/main.tf +++ b/terraform/shared/main.tf @@ -1,12 +1,12 @@ terraform { - required_version = "~> 1.9.8" + required_version = "~> 1.10.1" # Choose the backend according to your requirements # backend "remote" {} required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 4.10.0" + version = "~> 4.13.0" } random = { diff --git a/test/e2e/Makefile b/test/e2e/Makefile index 11ccb4c..66e43f6 100644 --- a/test/e2e/Makefile +++ b/test/e2e/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash -TF_VERSION := 1.9.8 +TF_VERSION := 1.10.1 # Before running this test, you must: # export GITHUB_TOKEN=your-token diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 5bbde78..ce688f6 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -46,7 +46,7 @@ type endpointTestConfig struct { var ( scope = flag.String("scope", "all", "specify test scope [blue/green/all]") - tfVer = flag.String("tf-version", "1.9.8", "specify Terraform version") + tfVer = flag.String("tf-version", "1.10.1", "specify Terraform version") chaosTestManifests = flag.String("chaostest-manifest", "../chaos/manifests/*.yaml", "specify chaos test manifest file path") ) diff --git a/test/e2e/go.mod b/test/e2e/go.mod index 8ca2a61..27352d8 100644 --- a/test/e2e/go.mod +++ b/test/e2e/go.mod @@ -2,7 +2,7 @@ module github.com/torumakabe/aks-anti-dry-iac/test/e2e go 1.23 -toolchain go1.23.3 +toolchain go1.23.4 require ( github.com/hashicorp/go-retryablehttp v0.7.7 diff --git a/test/fixtures/blue/main.tf b/test/fixtures/blue/main.tf index 01af3a2..63e3bdf 100644 --- a/test/fixtures/blue/main.tf +++ b/test/fixtures/blue/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.9.8" + required_version = "~> 1.10.1" } module "blue" { diff --git a/test/fixtures/green/main.tf b/test/fixtures/green/main.tf index 060b9ba..6966be4 100644 --- a/test/fixtures/green/main.tf +++ b/test/fixtures/green/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.9.8" + required_version = "~> 1.10.1" } module "green" { diff --git a/test/fixtures/shared/main.tf b/test/fixtures/shared/main.tf index a7ac226..341ba91 100644 --- a/test/fixtures/shared/main.tf +++ b/test/fixtures/shared/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.9.8" + required_version = "~> 1.10.1" } module "shared" {