Merge pull request #112 from torumakabe:bump

bump
torumakabe · Jun 17, 2024 · de47822 · de47822
2 parents c6dd1bb + e5a7bdc
commit de47822
Show file tree

Hide file tree

Showing 19 changed files with 40 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.8.4
+ terraform_version: 1.8.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.8.4
+ terraform_version: 1.8.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.8.4
+ terraform_version: 1.8.5
  terraform_wrapper: false
 
  - name: "Terraform Format"

diff --git 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.8.4
- - hashicorp/azurerm: 3.106.0
+- [Terraform](https://www.terraform.io/docs/index.html): 1.8.5
+ - hashicorp/azurerm: 3.108.0
  - State store: Local
 - [TFLint](https://github.com/terraform-linters/tflint): 0.51.1
  - [azurerm plugin](https://github.com/terraform-linters/tflint-ruleset-azurerm): 0.26.0
 - [Azure/kubelogin](https://github.com/Azure/kubelogin): 0.1.3
-- Ubuntu: 22.04.3 LTS
+- Ubuntu: 22.04.4 LTS
 
 ### Privileges required for execution
 

diff --git 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.1 # {"$imagepolicy": "flux-system:session-checker"}
+ image: ghcr.io/torumakabe/session-checker:v1.3.2 # {"$imagepolicy": "flux-system:session-checker"}
  imagePullPolicy: IfNotPresent
  command: ["/session-checker"]
  volumeMounts:

diff --git a/terraform/blue/aks/main.tf b/terraform/blue/aks/main.tf
@@ -1,5 +1,5 @@
 terraform {
- required_version = "~> 1.8.4"
+ required_version = "~> 1.8.5"
 
  required_providers {
  azurerm = {
@@ -191,7 +191,7 @@ resource "azurerm_kubernetes_cluster" "default" {
  network_plugin_mode = "overlay"
  service_cidr = "10.0.0.0/16"
  dns_service_ip = "10.0.0.10"
- ebpf_data_plane  = "cilium"
+ network_data_plane = "cilium"
  network_policy = "cilium"
 
  load_balancer_sku = "standard"

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

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

diff --git a/terraform/green/aks/main.tf b/terraform/green/aks/main.tf
@@ -1,5 +1,5 @@
 terraform {
- required_version = "~> 1.8.4"
+ required_version = "~> 1.8.5"
 
  required_providers {
  azurerm = {
@@ -191,7 +191,7 @@ resource "azurerm_kubernetes_cluster" "default" {
  network_plugin_mode = "overlay"
  service_cidr = "10.0.0.0/16"
  dns_service_ip = "10.0.0.10"
- ebpf_data_plane  = "cilium"
+ network_data_plane = "cilium"
  network_policy = "cilium"
 
  load_balancer_sku = "standard"

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

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

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

diff --git a/test/e2e/Makefile b/test/e2e/Makefile
@@ -1,6 +1,6 @@
 SHELL=/bin/bash
 
-TF_VERSION := 1.8.4
+TF_VERSION := 1.8.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.8.4", "specify Terraform version")
+ tfVer = flag.String("tf-version", "1.8.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,12 +14,12 @@ require (
 require (
  github.com/ProtonMail/go-crypto v1.1.0-alpha.2-proton // indirect
  github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
- github.com/cloudflare/circl v1.3.8 // 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
- golang.org/x/crypto v0.23.0 // indirect
- golang.org/x/mod v0.17.0 // indirect
- golang.org/x/sys v0.20.0 // indirect
- golang.org/x/text v0.15.0 // indirect
+ golang.org/x/crypto v0.24.0 // indirect
+ golang.org/x/mod v0.18.0 // indirect
+ golang.org/x/sys v0.21.0 // indirect
+ golang.org/x/text v0.16.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.8 h1:j+V8jJt09PoeMFIu2uh5JUyEaIHTXVOHslFoLNAKqwI=
 github.com/cloudflare/circl v1.3.8/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU=
+github.com/cloudflare/circl v1.3.9 h1:QFrlgFYf2Qpi8bSpVPK1HBvWpx16v/1TZivyo7pGuBE=
+github.com/cloudflare/circl v1.3.9/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=
@@ -70,16 +72,25 @@ 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=
 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=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
 golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
+golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
 golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
 golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
diff --git a/test/fixtures/blue/main.tf b/test/fixtures/blue/main.tf
@@ -1,5 +1,5 @@
 terraform {
- required_version = "~> 1.8.4"
+ required_version = "~> 1.8.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.8.4"
+ required_version = "~> 1.8.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.8.4"
+ required_version = "~> 1.8.5"
 }
 
 module "shared" {