Merge pull request #116 from torumakabe:bump

bump
torumakabe · Aug 26, 2024 · c248e5c · c248e5c
2 parents 666430d + 6ecc5ab
commit c248e5c
Show file tree

Hide file tree

Showing 18 changed files with 37 additions and 37 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.4
+          terraform_version: 1.9.5
           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.4
+          terraform_version: 1.9.5
           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.4
+          terraform_version: 1.9.5
           terraform_wrapper: false
 
       - name: "Terraform Format"

diff --git 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.4
-  - hashicorp/azurerm: 3.116.0
+- [Terraform](https://www.terraform.io/docs/index.html): 1.9.5
+  - hashicorp/azurerm: 4.0.1
   - 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/terraform/blue/aks/main.tf b/terraform/blue/aks/main.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.9.4"
+  required_version = "~> 1.9.5"
 
   required_providers {
     azurerm = {
@@ -137,7 +137,7 @@ resource "azurerm_kubernetes_cluster" "default" {
       hours = [1]
     }
   }
-  node_os_channel_upgrade = "NodeImage"
+  node_os_upgrade_channel = "NodeImage"
   maintenance_window_node_os {
     frequency   = "Weekly"
     interval    = 1
@@ -180,8 +180,6 @@ resource "azurerm_kubernetes_cluster" "default" {
 
   role_based_access_control_enabled = true
   azure_active_directory_role_based_access_control {
-    # will be depricated from AzureRM v4
-    managed                = true
     admin_group_object_ids = var.aks.aad.admin_group_object_ids
     azure_rbac_enabled     = true
   }
@@ -214,8 +212,9 @@ resource "azurerm_kubernetes_cluster" "default" {
   key_vault_secrets_provider {
     secret_rotation_enabled = true
   }
-  image_cleaner_enabled = true
-  cost_analysis_enabled = true
+  image_cleaner_enabled        = true
+  image_cleaner_interval_hours = 24
+  cost_analysis_enabled        = true
 
   lifecycle {
     ignore_changes = [

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

diff --git a/terraform/blue/main.tf b/terraform/blue/main.tf
@@ -1,19 +1,19 @@
 terraform {
-  required_version = "~> 1.9.4"
+  required_version = "~> 1.9.5"
   # Choose the backend according to your requirements
   # backend "remote" {}
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.116.0"
+      version = "~> 4.0.1"
     }
   }
 }
 
 provider "azurerm" {
-  use_oidc                   = true
-  skip_provider_registration = true
+  use_oidc                        = true
+  resource_provider_registrations = "none"
   features {
     resource_group {
       prevent_deletion_if_contains_resources = false

diff --git a/terraform/green/aks/main.tf b/terraform/green/aks/main.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.9.4"
+  required_version = "~> 1.9.5"
 
   required_providers {
     azurerm = {
@@ -137,7 +137,7 @@ resource "azurerm_kubernetes_cluster" "default" {
       hours = [1]
     }
   }
-  node_os_channel_upgrade = "NodeImage"
+  node_os_upgrade_channel = "NodeImage"
   maintenance_window_node_os {
     frequency   = "Weekly"
     interval    = 1
@@ -180,8 +180,6 @@ resource "azurerm_kubernetes_cluster" "default" {
 
   role_based_access_control_enabled = true
   azure_active_directory_role_based_access_control {
-    # will be depricated from AzureRM v4
-    managed                = true
     admin_group_object_ids = var.aks.aad.admin_group_object_ids
     azure_rbac_enabled     = true
   }
@@ -214,8 +212,9 @@ resource "azurerm_kubernetes_cluster" "default" {
   key_vault_secrets_provider {
     secret_rotation_enabled = true
   }
-  image_cleaner_enabled = true
-  cost_analysis_enabled = true
+  image_cleaner_enabled        = true
+  image_cleaner_interval_hours = 24
+  cost_analysis_enabled        = true
 
   lifecycle {
     ignore_changes = [

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

diff --git a/terraform/green/main.tf b/terraform/green/main.tf
@@ -1,19 +1,19 @@
 terraform {
-  required_version = "~> 1.9.4"
+  required_version = "~> 1.9.5"
   # Choose the backend according to your requirements
   # backend "remote" {}
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.116.0"
+      version = "~> 4.0.1"
     }
   }
 }
 
 provider "azurerm" {
-  use_oidc                   = true
-  skip_provider_registration = true
+  use_oidc                        = true
+  resource_provider_registrations = "none"
   features {
     resource_group {
       prevent_deletion_if_contains_resources = false

diff --git a/terraform/shared/main.tf b/terraform/shared/main.tf
@@ -1,12 +1,12 @@
 terraform {
-  required_version = "~> 1.9.4"
+  required_version = "~> 1.9.5"
   # Choose the backend according to your requirements
   # backend "remote" {}
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.116.0"
+      version = "~> 4.0.1"
     }
 
     random = {
@@ -77,8 +77,8 @@ module "subnet_addrs" {
 }
 
 provider "azurerm" {
-  use_oidc                   = true
-  skip_provider_registration = true
+  use_oidc                        = true
+  resource_provider_registrations = "none"
   features {
     resource_group {
       prevent_deletion_if_contains_resources = false

diff --git a/test/e2e/Makefile b/test/e2e/Makefile
@@ -1,6 +1,6 @@
 SHELL=/bin/bash
 
-TF_VERSION := 1.9.4
+TF_VERSION := 1.9.5
 
 # 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.4", "specify Terraform version")
+	tfVer              = flag.String("tf-version", "1.9.5", "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
@@ -14,7 +14,7 @@ require (
 require (
 	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/cloudflare/circl v1.4.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

diff --git a/test/e2e/go.sum b/test/e2e/go.sum
@@ -8,6 +8,8 @@ github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew
 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/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=

diff --git a/test/fixtures/blue/main.tf b/test/fixtures/blue/main.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.9.4"
+  required_version = "~> 1.9.5"
 }
 
 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.4"
+  required_version = "~> 1.9.5"
 }
 
 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.4"
+  required_version = "~> 1.9.5"
 }
 
 module "shared" {