Merge pull request #114 from torumakabe:bump

bump
torumakabe · Jul 23, 2024 · 58583af · 58583af
2 parents bd24994 + 8b21796
commit 58583af
Show file tree

Hide file tree

Showing 22 changed files with 33 additions and 29 deletions.
diff --git 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.1
+          terraform_version: 1.9.2
           terraform_wrapper: false
 
       - name: "Terraform Format"

diff --git 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.1
+          terraform_version: 1.9.2
           terraform_wrapper: false
 
       - name: "Terraform Format"

diff --git 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.1
+          terraform_version: 1.9.2
           terraform_wrapper: false
 
       - name: "Terraform Format"

diff --git a/README.md b/README.md
@@ -29,11 +29,11 @@ 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.1
-  - hashicorp/azurerm: 3.111.0
+- [Terraform](https://www.terraform.io/docs/index.html): 1.9.2
+  - hashicorp/azurerm: 3.113.0
   - State store: Local
 - [TFLint](https://github.com/terraform-linters/tflint): 0.52.0
-  - [azurerm plugin](https://github.com/terraform-linters/tflint-ruleset-azurerm): 0.26.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
 

diff --git 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.10.1"
+      version: "4.11.1"
   interval: 5m
   install:
     remediation:

diff --git 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.29.4"
+      orchestrator_version = "1.30.0"
       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
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.9.1"
+  required_version = "~> 1.9.2"
 
   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.29"
+  version_prefix  = "1.30"
   include_preview = false
 }
 */

diff --git a/terraform/blue/apps/main.tf b/terraform/blue/apps/main.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.9.1"
+  required_version = "~> 1.9.2"
 
   required_providers {
     azurerm = {

diff --git a/terraform/blue/main.tf b/terraform/blue/main.tf
@@ -1,12 +1,12 @@
 terraform {
-  required_version = "~> 1.9.1"
+  required_version = "~> 1.9.2"
   # Choose the backend according to your requirements
   # backend "remote" {}
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.111.0"
+      version = "~> 3.113.0"
     }
   }
 }

diff --git 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.29.4"
+      orchestrator_version = "1.30.0"
       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
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.9.1"
+  required_version = "~> 1.9.2"
 
   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.29"
+  version_prefix  = "1.30"
   include_preview = false
 }
 */

diff --git a/terraform/green/apps/main.tf b/terraform/green/apps/main.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.9.1"
+  required_version = "~> 1.9.2"
 
   required_providers {
     azurerm = {

diff --git a/terraform/green/main.tf b/terraform/green/main.tf
@@ -1,12 +1,12 @@
 terraform {
-  required_version = "~> 1.9.1"
+  required_version = "~> 1.9.2"
   # Choose the backend according to your requirements
   # backend "remote" {}
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.111.0"
+      version = "~> 3.113.0"
     }
   }
 }

diff --git a/terraform/shared/main.tf b/terraform/shared/main.tf
@@ -1,12 +1,12 @@
 terraform {
-  required_version = "~> 1.9.1"
+  required_version = "~> 1.9.2"
   # Choose the backend according to your requirements
   # backend "remote" {}
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.111.0"
+      version = "~> 3.113.0"
     }
 
     random = {

diff --git a/test/e2e/Makefile b/test/e2e/Makefile
@@ -1,6 +1,6 @@
 SHELL=/bin/bash
 
-TF_VERSION := 1.9.1
+TF_VERSION := 1.9.2
 
 # 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
@@ -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.1", "specify Terraform version")
+	tfVer              = flag.String("tf-version", "1.9.2", "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
@@ -12,12 +12,12 @@ require (
 )
 
 require (
-	github.com/ProtonMail/go-crypto v1.1.0-alpha.3-proton // indirect
+	github.com/ProtonMail/go-crypto v1.1.0-alpha.5-proton // indirect
 	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
 	github.com/cloudflare/circl v1.3.9 // 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.14.4 // indirect
+	github.com/zclconf/go-cty v1.15.0 // indirect
 	golang.org/x/crypto v0.25.0 // indirect
 	golang.org/x/mod v0.19.0 // indirect
 	golang.org/x/sys v0.22.0 // indirect

diff --git a/test/e2e/go.sum b/test/e2e/go.sum
@@ -6,6 +6,8 @@ github.com/ProtonMail/go-crypto v1.1.0-alpha.2-proton h1:HKz85FwoXx86kVtTvFke7rg
 github.com/ProtonMail/go-crypto v1.1.0-alpha.2-proton/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
 github.com/ProtonMail/go-crypto v1.1.0-alpha.3-proton h1:0RXAi0EJFs81j+MMsqvHNuAUGWzeVfCO9LnHAfoQ8NA=
 github.com/ProtonMail/go-crypto v1.1.0-alpha.3-proton/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
+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/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.8 h1:j+V8jJt09PoeMFIu2uh5JUyEaIHTXVOHslFoLNAKqwI=
@@ -72,6 +74,8 @@ 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.14.4 h1:uXXczd9QDGsgu0i/QFR/hzI5NYCHLf6NQw/atrbnhq8=
 github.com/zclconf/go-cty v1.14.4/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
+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.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=

diff --git a/test/fixtures/blue/main.tf b/test/fixtures/blue/main.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.9.1"
+  required_version = "~> 1.9.2"
 }
 
 module "blue" {

diff --git a/test/fixtures/green/main.tf b/test/fixtures/green/main.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.9.1"
+  required_version = "~> 1.9.2"
 }
 
 module "green" {

diff --git a/test/fixtures/shared/main.tf b/test/fixtures/shared/main.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.9.1"
+  required_version = "~> 1.9.2"
 }
 
 module "shared" {

diff --git a/test/integration/.tflint.hcl b/test/integration/.tflint.hcl
@@ -1,6 +1,6 @@
 plugin "azurerm" {
     enabled = true
-    version = "0.26.0"
+    version = "0.27.0"
     source  = "github.com/terraform-linters/tflint-ruleset-azurerm"
 }