From 3bb727e23e72ab4849636b7abe540be82b4e2b1c Mon Sep 17 00:00:00 2001 From: Toru Makabe <993850+torumakabe@users.noreply.github.com> Date: Tue, 29 Oct 2024 10:06:01 +0900 Subject: [PATCH] bump --- .github/workflows/ci-terraform-blue.yaml | 2 +- .github/workflows/ci-terraform-green.yaml | 2 +- .github/workflows/ci-terraform-shared.yaml | 2 +- README.md | 6 ++-- flux/infrastructure/base/nginx/release.yaml | 2 +- terraform/blue/aks/locals.tf | 2 +- terraform/blue/aks/main.tf | 4 +-- terraform/blue/apps/main.tf | 2 +- terraform/blue/main.tf | 4 +-- terraform/green/aks/locals.tf | 2 +- terraform/green/aks/main.tf | 4 +-- terraform/green/apps/main.tf | 2 +- terraform/green/main.tf | 4 +-- terraform/shared/main.tf | 4 +-- test/e2e/Makefile | 2 +- test/e2e/e2e_test.go | 2 +- test/e2e/go.mod | 12 ++++---- test/e2e/go.sum | 32 +++++++-------------- test/fixtures/blue/main.tf | 2 +- test/fixtures/green/main.tf | 2 +- test/fixtures/shared/main.tf | 2 +- 21 files changed, 42 insertions(+), 54 deletions(-) diff --git a/.github/workflows/ci-terraform-blue.yaml b/.github/workflows/ci-terraform-blue.yaml index 7c067b5..e2343ad 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.6 + terraform_version: 1.9.8 terraform_wrapper: false - name: "Terraform Format" diff --git a/.github/workflows/ci-terraform-green.yaml b/.github/workflows/ci-terraform-green.yaml index 8902dfc..ea442bb 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.6 + terraform_version: 1.9.8 terraform_wrapper: false - name: "Terraform Format" diff --git a/.github/workflows/ci-terraform-shared.yaml b/.github/workflows/ci-terraform-shared.yaml index 2e2fa8c..94af23e 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.6 + terraform_version: 1.9.8 terraform_wrapper: false - name: "Terraform Format" diff --git a/README.md b/README.md index 053e8a4..41470a1 100644 --- a/README.md +++ b/README.md @@ -29,13 +29,13 @@ 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.6 - - hashicorp/azurerm: 4.3.0 +- [Terraform](https://www.terraform.io/docs/index.html): 1.9.8 + - hashicorp/azurerm: 4.7.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 - [Azure/kubelogin](https://github.com/Azure/kubelogin): 0.1.4 -- Ubuntu: 22.04.4 LTS +- Ubuntu: 22.04.5 LTS ### Privileges required for execution diff --git a/flux/infrastructure/base/nginx/release.yaml b/flux/infrastructure/base/nginx/release.yaml index b942c61..337f4a0 100644 --- a/flux/infrastructure/base/nginx/release.yaml +++ b/flux/infrastructure/base/nginx/release.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: ingress-nginx namespace: flux-system - version: "4.11.2" + version: "4.11.3" interval: 5m install: remediation: diff --git a/terraform/blue/aks/locals.tf b/terraform/blue/aks/locals.tf index 57bdf9a..ad84ccb 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.4" + orchestrator_version = "1.31.1" 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 ecb870d..76e2dea 100644 --- a/terraform/blue/aks/main.tf +++ b/terraform/blue/aks/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.9.6" + required_version = "~> 1.9.8" required_providers { azurerm = { @@ -17,7 +17,7 @@ resource "azurerm_resource_group" "aks" { /* data "azurerm_kubernetes_service_versions" "current" { location = azurerm_resource_group.aks.location - version_prefix = "1.30" + version_prefix = "1.31" include_preview = false } */ diff --git a/terraform/blue/apps/main.tf b/terraform/blue/apps/main.tf index 280078a..cfa7b78 100644 --- a/terraform/blue/apps/main.tf +++ b/terraform/blue/apps/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.9.6" + required_version = "~> 1.9.8" required_providers { azurerm = { diff --git a/terraform/blue/main.tf b/terraform/blue/main.tf index b9b4f51..90522af 100644 --- a/terraform/blue/main.tf +++ b/terraform/blue/main.tf @@ -1,12 +1,12 @@ terraform { - required_version = "~> 1.9.6" + required_version = "~> 1.9.8" # Choose the backend according to your requirements # backend "remote" {} required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 4.3.0" + version = "~> 4.7.0" } } } diff --git a/terraform/green/aks/locals.tf b/terraform/green/aks/locals.tf index 57bdf9a..ad84ccb 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.4" + orchestrator_version = "1.31.1" 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 ecb870d..76e2dea 100644 --- a/terraform/green/aks/main.tf +++ b/terraform/green/aks/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.9.6" + required_version = "~> 1.9.8" required_providers { azurerm = { @@ -17,7 +17,7 @@ resource "azurerm_resource_group" "aks" { /* data "azurerm_kubernetes_service_versions" "current" { location = azurerm_resource_group.aks.location - version_prefix = "1.30" + version_prefix = "1.31" include_preview = false } */ diff --git a/terraform/green/apps/main.tf b/terraform/green/apps/main.tf index 280078a..cfa7b78 100644 --- a/terraform/green/apps/main.tf +++ b/terraform/green/apps/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.9.6" + required_version = "~> 1.9.8" required_providers { azurerm = { diff --git a/terraform/green/main.tf b/terraform/green/main.tf index b9b4f51..90522af 100644 --- a/terraform/green/main.tf +++ b/terraform/green/main.tf @@ -1,12 +1,12 @@ terraform { - required_version = "~> 1.9.6" + required_version = "~> 1.9.8" # Choose the backend according to your requirements # backend "remote" {} required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 4.3.0" + version = "~> 4.7.0" } } } diff --git a/terraform/shared/main.tf b/terraform/shared/main.tf index 29957c0..759cda3 100644 --- a/terraform/shared/main.tf +++ b/terraform/shared/main.tf @@ -1,12 +1,12 @@ terraform { - required_version = "~> 1.9.6" + required_version = "~> 1.9.8" # Choose the backend according to your requirements # backend "remote" {} required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 4.3.0" + version = "~> 4.7.0" } random = { diff --git a/test/e2e/Makefile b/test/e2e/Makefile index 0649012..11ccb4c 100644 --- a/test/e2e/Makefile +++ b/test/e2e/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash -TF_VERSION := 1.9.6 +TF_VERSION := 1.9.8 # 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 c1d5aa0..5bbde78 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.6", "specify Terraform version") + tfVer = flag.String("tf-version", "1.9.8", "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 9592a6a..5d5b8e2 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.1 +toolchain go1.23.2 require ( github.com/hashicorp/go-retryablehttp v0.7.7 @@ -12,14 +12,14 @@ require ( ) require ( - github.com/ProtonMail/go-crypto v1.1.0-alpha.5-proton // indirect + github.com/ProtonMail/go-crypto v1.1.0-beta.0-proton // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect - github.com/cloudflare/circl v1.4.0 // indirect + github.com/cloudflare/circl v1.5.0 // indirect 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.27.0 // indirect + golang.org/x/crypto v0.28.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 + golang.org/x/sys v0.26.0 // indirect + golang.org/x/text v0.19.0 // indirect ) diff --git a/test/e2e/go.sum b/test/e2e/go.sum index f573d2d..dab6829 100644 --- a/test/e2e/go.sum +++ b/test/e2e/go.sum @@ -2,14 +2,12 @@ dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= -github.com/ProtonMail/go-crypto v1.1.0-alpha.5-proton h1:KVBEgU3CJpmzLChnLiSuEyCuhGhcMt3eOST+7A+ckto= -github.com/ProtonMail/go-crypto v1.1.0-alpha.5-proton/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= +github.com/ProtonMail/go-crypto v1.1.0-beta.0-proton h1:ZGewsAoeSirbUS5cO8L0FMQA+iSop9xR1nmFYifDBPo= +github.com/ProtonMail/go-crypto v1.1.0-beta.0-proton/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY= github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= -github.com/cloudflare/circl v1.3.9 h1:QFrlgFYf2Qpi8bSpVPK1HBvWpx16v/1TZivyo7pGuBE= -github.com/cloudflare/circl v1.3.9/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU= -github.com/cloudflare/circl v1.4.0 h1:BV7h5MgrktNzytKmWjpOtdYrf0lkkbF8YMlBGPhJQrY= -github.com/cloudflare/circl v1.4.0/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU= +github.com/cloudflare/circl v1.5.0 h1:hxIWksrX6XN5a1L2TI/h53AGPhNHoUBo+TD1ms9+pys= +github.com/cloudflare/circl v1.5.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -36,8 +34,6 @@ github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISH github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= 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= @@ -62,26 +58,18 @@ github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= 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/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= +golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= 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/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.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 b3d8273..01af3a2 100644 --- a/test/fixtures/blue/main.tf +++ b/test/fixtures/blue/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.9.6" + required_version = "~> 1.9.8" } module "blue" { diff --git a/test/fixtures/green/main.tf b/test/fixtures/green/main.tf index 64e0c4f..060b9ba 100644 --- a/test/fixtures/green/main.tf +++ b/test/fixtures/green/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.9.6" + required_version = "~> 1.9.8" } module "green" { diff --git a/test/fixtures/shared/main.tf b/test/fixtures/shared/main.tf index 629dc68..a7ac226 100644 --- a/test/fixtures/shared/main.tf +++ b/test/fixtures/shared/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.9.6" + required_version = "~> 1.9.8" } module "shared" {