Merge pull request #97 from torumakabe:bump

bump
torumakabe · Dec 8, 2023 · c0cab42 · c0cab42
2 parents c575f46 + fd54857
commit c0cab42
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 25 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.6.4
+ terraform_version: 1.6.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.6.4
+ terraform_version: 1.6.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.6.4
+ terraform_version: 1.6.5
  terraform_wrapper: false
 
  - name: "Terraform Format"

diff --git a/README.md b/README.md
@@ -29,14 +29,14 @@ 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.6.4
- - hashicorp/azurerm: 3.83.0
+- [Terraform](https://www.terraform.io/docs/index.html): 1.6.5
+ - hashicorp/azurerm: 3.84.0
  - Azure/azapi: 1.10.0
  - State store: Local
 - [TFLint](https://github.com/terraform-linters/tflint): 0.49.0
  - [azurerm plugin](https://github.com/terraform-linters/tflint-ruleset-azurerm): 0.25.1
-- [Azure/kubelogin](https://github.com/Azure/kubelogin): 0.0.33
-- Ubuntu: 22.04.2 LTS
+- [Azure/kubelogin](https://github.com/Azure/kubelogin): 0.0.34
+- Ubuntu: 22.04.3 LTS
 
 ### Privileges required for execution
 

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.8.3"
+ version: "4.8.4"
  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.28.0"
+ orchestrator_version = "1.28.3"
  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.6.4"
+ required_version = "~> 1.6.5"
 
  required_providers {
  azurerm = {

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

diff --git a/terraform/blue/main.tf b/terraform/blue/main.tf
@@ -1,12 +1,12 @@
 terraform {
- required_version = "~> 1.6.4"
+ required_version = "~> 1.6.5"
  # Choose the backend according to your requirements
  # backend "remote" {}
 
  required_providers {
  azurerm = {
  source = "hashicorp/azurerm"
- version = "~> 3.83.0"
+ version = "~> 3.84.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.28.0"
+ orchestrator_version = "1.28.3"
  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.6.4"
+ required_version = "~> 1.6.5"
 
  required_providers {
  azurerm = {

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

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

diff --git a/terraform/shared/main.tf b/terraform/shared/main.tf
@@ -1,12 +1,12 @@
 terraform {
- required_version = "~> 1.6.4"
+ required_version = "~> 1.6.5"
  # Choose the backend according to your requirements
  # backend "remote" {}
 
  required_providers {
  azurerm = {
  source = "hashicorp/azurerm"
- version = "~> 3.83.0"
+ version = "~> 3.84.0"
  }
 
  azapi = {

diff --git a/test/e2e/Makefile b/test/e2e/Makefile
@@ -1,6 +1,6 @@
 SHELL=/bin/bash
 
-TF_VERSION := 1.6.4
+TF_VERSION := 1.6.5
 
 # Before running this test, you must:
 # export GITHUB_TOKEN=your-token

diff --git a/test/e2e/go.mod b/test/e2e/go.mod
@@ -5,7 +5,7 @@ go 1.21
 require (
  github.com/hashicorp/go-retryablehttp v0.7.5
  github.com/hashicorp/go-version v1.6.0
- github.com/hashicorp/hc-install v0.6.1
+ github.com/hashicorp/hc-install v0.6.2
  github.com/hashicorp/terraform-exec v0.19.0
 )
 

diff --git a/test/e2e/go.sum b/test/e2e/go.sum
@@ -24,6 +24,7 @@ github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+
 github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow=
 github.com/go-git/go-git/v5 v5.9.0 h1:cD9SFA7sHVRdJ7AYck1ZaAa/yeuBvGPxwXDL8cxrObY=
 github.com/go-git/go-git/v5 v5.9.0/go.mod h1:RKIqga24sWdMGZF+1Ekv9kylsDz6LzdTSI2s/OsZWE0=
+github.com/go-git/go-git/v5 v5.10.1 h1:tu8/D8i+TWxgKpzQ3Vc43e+kkhXqtsZCKI/egajKnxk=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
@@ -38,6 +39,8 @@ github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mO
 github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/hc-install v0.6.1 h1:IGxShH7AVhPaSuSJpKtVi/EFORNjO+OYVJJrAtGG2mY=
 github.com/hashicorp/hc-install v0.6.1/go.mod h1:0fW3jpg+wraYSnFDJ6Rlie3RvLf1bIqVIkzoon4KoVE=
+github.com/hashicorp/hc-install v0.6.2 h1:V1k+Vraqz4olgZ9UzKiAcbman9i9scg9GgSt/U3mw/M=
+github.com/hashicorp/hc-install v0.6.2/go.mod h1:2JBpd+NCFKiHiu/yYCGaPyPHhZLxXTpz8oreHa/a3Ps=
 github.com/hashicorp/terraform-exec v0.19.0 h1:FpqZ6n50Tk95mItTSS9BjeOVUb4eg81SpgVtZNNtFSM=
 github.com/hashicorp/terraform-exec v0.19.0/go.mod h1:tbxUpe3JKruE9Cuf65mycSIT8KiNPZ0FkuTE3H4urQg=
 github.com/hashicorp/terraform-json v0.18.0 h1:pCjgJEqqDESv4y0Tzdqfxr/edOIGkjs8keY42xfNBwU=
@@ -53,6 +56,7 @@ github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
 github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/skeema/knownhosts v1.2.0 h1:h9r9cf0+u7wSE+M183ZtMGgOJKiL96brpaz5ekfJCpM=
 github.com/skeema/knownhosts v1.2.0/go.mod h1:g4fPeYpque7P0xefxtGzV81ihjC8sX2IqpAoNkjxbMo=
+github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 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=

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