diff --git a/.github/workflows/ci-terraform-blue.yaml b/.github/workflows/ci-terraform-blue.yaml index dc81a65..7c067b5 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.5 + terraform_version: 1.9.6 terraform_wrapper: false - name: "Terraform Format" diff --git a/.github/workflows/ci-terraform-green.yaml b/.github/workflows/ci-terraform-green.yaml index 8e02411..8902dfc 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.5 + terraform_version: 1.9.6 terraform_wrapper: false - name: "Terraform Format" diff --git a/.github/workflows/ci-terraform-shared.yaml b/.github/workflows/ci-terraform-shared.yaml index 83dfe12..2e2fa8c 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.5 + terraform_version: 1.9.6 terraform_wrapper: false - name: "Terraform Format" diff --git a/README.md b/README.md index 6f25b71..053e8a4 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,8 @@ 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.5 - - hashicorp/azurerm: 4.0.1 +- [Terraform](https://www.terraform.io/docs/index.html): 1.9.6 + - hashicorp/azurerm: 4.3.0 - State store: Local - [TFLint](https://github.com/terraform-linters/tflint): 0.53.0 - [azurerm plugin](https://github.com/terraform-linters/tflint-ruleset-azurerm): 0.27.0 diff --git a/flux/apps/base/demoapp/deployment.yaml b/flux/apps/base/demoapp/deployment.yaml index 7d1ac6a..7665efa 100644 --- a/flux/apps/base/demoapp/deployment.yaml +++ b/flux/apps/base/demoapp/deployment.yaml @@ -16,7 +16,7 @@ spec: serviceAccountName: demoapp-sa containers: - name: session-checker - image: ghcr.io/torumakabe/session-checker:v1.3.2 # {"$imagepolicy": "flux-system:session-checker"} + image: ghcr.io/torumakabe/session-checker:v1.3.3 # {"$imagepolicy": "flux-system:session-checker"} imagePullPolicy: IfNotPresent command: ["/session-checker"] volumeMounts: diff --git a/flux/infrastructure/base/chaos-mesh/release.yaml b/flux/infrastructure/base/chaos-mesh/release.yaml index d1278f0..6bfa7e8 100644 --- a/flux/infrastructure/base/chaos-mesh/release.yaml +++ b/flux/infrastructure/base/chaos-mesh/release.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: chaos-mesh namespace: flux-system - version: "2.6.3" + version: "2.7.0" interval: 5m install: remediation: diff --git a/terraform/blue/aks/locals.tf b/terraform/blue/aks/locals.tf index a2d13ed..57bdf9a 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.30.3" + orchestrator_version = "1.30.4" 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 53b9bd1..ecb870d 100644 --- a/terraform/blue/aks/main.tf +++ b/terraform/blue/aks/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" required_providers { azurerm = { diff --git a/terraform/blue/apps/main.tf b/terraform/blue/apps/main.tf index a53e697..280078a 100644 --- a/terraform/blue/apps/main.tf +++ b/terraform/blue/apps/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" required_providers { azurerm = { diff --git a/terraform/blue/main.tf b/terraform/blue/main.tf index 48c7981..b9b4f51 100644 --- a/terraform/blue/main.tf +++ b/terraform/blue/main.tf @@ -1,12 +1,12 @@ terraform { - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" # Choose the backend according to your requirements # backend "remote" {} required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 4.0.1" + version = "~> 4.3.0" } } } diff --git a/terraform/green/aks/locals.tf b/terraform/green/aks/locals.tf index a2d13ed..57bdf9a 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.30.3" + orchestrator_version = "1.30.4" 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 53b9bd1..ecb870d 100644 --- a/terraform/green/aks/main.tf +++ b/terraform/green/aks/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" required_providers { azurerm = { diff --git a/terraform/green/apps/main.tf b/terraform/green/apps/main.tf index a53e697..280078a 100644 --- a/terraform/green/apps/main.tf +++ b/terraform/green/apps/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" required_providers { azurerm = { diff --git a/terraform/green/main.tf b/terraform/green/main.tf index 48c7981..b9b4f51 100644 --- a/terraform/green/main.tf +++ b/terraform/green/main.tf @@ -1,12 +1,12 @@ terraform { - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" # Choose the backend according to your requirements # backend "remote" {} required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 4.0.1" + version = "~> 4.3.0" } } } diff --git a/terraform/shared/main.tf b/terraform/shared/main.tf index ca2da6d..29957c0 100644 --- a/terraform/shared/main.tf +++ b/terraform/shared/main.tf @@ -1,12 +1,12 @@ terraform { - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" # Choose the backend according to your requirements # backend "remote" {} required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 4.0.1" + version = "~> 4.3.0" } random = { diff --git a/test/e2e/Makefile b/test/e2e/Makefile index dedb5de..0649012 100644 --- a/test/e2e/Makefile +++ b/test/e2e/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash -TF_VERSION := 1.9.5 +TF_VERSION := 1.9.6 # 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 0eabd61..c1d5aa0 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.5", "specify Terraform version") + tfVer = flag.String("tf-version", "1.9.6", "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 319d066..9592a6a 100644 --- a/test/e2e/go.mod +++ b/test/e2e/go.mod @@ -2,12 +2,12 @@ module github.com/torumakabe/aks-anti-dry-iac/test/e2e go 1.23 -toolchain go1.23.0 +toolchain go1.23.1 require ( github.com/hashicorp/go-retryablehttp v0.7.7 github.com/hashicorp/go-version v1.7.0 - github.com/hashicorp/hc-install v0.8.0 + github.com/hashicorp/hc-install v0.9.0 github.com/hashicorp/terraform-exec v0.21.0 ) @@ -18,8 +18,8 @@ require ( github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/terraform-json v0.22.1 // indirect github.com/zclconf/go-cty v1.15.0 // indirect - golang.org/x/crypto v0.26.0 // indirect - golang.org/x/mod v0.20.0 // indirect - golang.org/x/sys v0.24.0 // indirect - golang.org/x/text v0.17.0 // indirect + golang.org/x/crypto v0.27.0 // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/text v0.18.0 // indirect ) diff --git a/test/e2e/go.sum b/test/e2e/go.sum index d07354e..f573d2d 100644 --- a/test/e2e/go.sum +++ b/test/e2e/go.sum @@ -38,6 +38,8 @@ github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKe github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/hc-install v0.8.0 h1:LdpZeXkZYMQhoKPCecJHlKvUkQFixN/nvyR1CdfOLjI= github.com/hashicorp/hc-install v0.8.0/go.mod h1:+MwJYjDfCruSD/udvBmRB22Nlkwwkwf5sAB6uTIhSaU= +github.com/hashicorp/hc-install v0.9.0 h1:2dIk8LcvANwtv3QZLckxcjyF5w8KVtiMxu6G6eLhghE= +github.com/hashicorp/hc-install v0.9.0/go.mod h1:+6vOP+mf3tuGgMApVYtmsnDoKWMDcFXeTxCACYZ8SFg= github.com/hashicorp/terraform-exec v0.21.0 h1:uNkLAe95ey5Uux6KJdua6+cv8asgILFVWkd/RG0D2XQ= github.com/hashicorp/terraform-exec v0.21.0/go.mod h1:1PPeMYou+KDUSSeRE9szMZ/oHf4fYUmB923Wzbq1ICg= github.com/hashicorp/terraform-json v0.22.1 h1:xft84GZR0QzjPVWs4lRUwvTcPnegqlyS7orfb5Ltvec= @@ -62,16 +64,24 @@ github.com/zclconf/go-cty v1.15.0 h1:tTCRWxsexYUmtt/wVxgDClUe+uQusuI443uL6e+5sXQ github.com/zclconf/go-cty v1.15.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= +golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= diff --git a/test/fixtures/blue/main.tf b/test/fixtures/blue/main.tf index 3d9e744..b3d8273 100644 --- a/test/fixtures/blue/main.tf +++ b/test/fixtures/blue/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } module "blue" { diff --git a/test/fixtures/green/main.tf b/test/fixtures/green/main.tf index 0ec617d..64e0c4f 100644 --- a/test/fixtures/green/main.tf +++ b/test/fixtures/green/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } module "green" { diff --git a/test/fixtures/shared/main.tf b/test/fixtures/shared/main.tf index 76c6f4b..629dc68 100644 --- a/test/fixtures/shared/main.tf +++ b/test/fixtures/shared/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } module "shared" {