Skip to content

Commit

Permalink
Merge pull request #117 from torumakabe:bump
Browse files Browse the repository at this point in the history
bump
torumakabe authored Oct 1, 2024
2 parents c248e5c + aac62c8 commit a6af243
Showing 22 changed files with 40 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-terraform-blue.yaml
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@ jobs:
- name: "Setup Terraform"
uses: hashicorp/setup-terraform@v3
with:
terraform_version: 1.9.5
terraform_version: 1.9.6
terraform_wrapper: false

- name: "Terraform Format"
2 changes: 1 addition & 1 deletion .github/workflows/ci-terraform-green.yaml
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@ jobs:
- name: "Setup Terraform"
uses: hashicorp/setup-terraform@v3
with:
terraform_version: 1.9.5
terraform_version: 1.9.6
terraform_wrapper: false

- name: "Terraform Format"
2 changes: 1 addition & 1 deletion .github/workflows/ci-terraform-shared.yaml
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ jobs:
- name: "Setup Terraform"
uses: hashicorp/setup-terraform@v3
with:
terraform_version: 1.9.5
terraform_version: 1.9.6
terraform_wrapper: false

- name: "Terraform Format"
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.5
- hashicorp/azurerm: 4.0.1
- [Terraform](https://www.terraform.io/docs/index.html): 1.9.6
- hashicorp/azurerm: 4.3.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
2 changes: 1 addition & 1 deletion flux/apps/base/demoapp/deployment.yaml
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ spec:
serviceAccountName: demoapp-sa
containers:
- name: session-checker
image: ghcr.io/torumakabe/session-checker:v1.3.2 # {"$imagepolicy": "flux-system:session-checker"}
image: ghcr.io/torumakabe/session-checker:v1.3.3 # {"$imagepolicy": "flux-system:session-checker"}
imagePullPolicy: IfNotPresent
command: ["/session-checker"]
volumeMounts:
2 changes: 1 addition & 1 deletion flux/infrastructure/base/chaos-mesh/release.yaml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ spec:
kind: HelmRepository
name: chaos-mesh
namespace: flux-system
version: "2.6.3"
version: "2.7.0"
interval: 5m
install:
remediation:
2 changes: 1 addition & 1 deletion terraform/blue/aks/locals.tf
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ locals {
cluster_name = "${var.prefix}-aks-anti-dry-iac-${var.aks.switch}-${var.suffix}"

default = {
orchestrator_version = "1.30.3"
orchestrator_version = "1.30.4"
vm_size = "Standard_D2ds_v5"
os_disk_size_gb = 75
os_disk_type = "Ephemeral"
2 changes: 1 addition & 1 deletion terraform/blue/aks/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = "~> 1.9.5"
required_version = "~> 1.9.6"

required_providers {
azurerm = {
2 changes: 1 addition & 1 deletion terraform/blue/apps/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = "~> 1.9.5"
required_version = "~> 1.9.6"

required_providers {
azurerm = {
4 changes: 2 additions & 2 deletions terraform/blue/main.tf
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
terraform {
required_version = "~> 1.9.5"
required_version = "~> 1.9.6"
# Choose the backend according to your requirements
# backend "remote" {}

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 4.0.1"
version = "~> 4.3.0"
}
}
}
2 changes: 1 addition & 1 deletion terraform/green/aks/locals.tf
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ locals {
cluster_name = "${var.prefix}-aks-anti-dry-iac-${var.aks.switch}-${var.suffix}"

default = {
orchestrator_version = "1.30.3"
orchestrator_version = "1.30.4"
vm_size = "Standard_D2ds_v5"
os_disk_size_gb = 75
os_disk_type = "Ephemeral"
2 changes: 1 addition & 1 deletion terraform/green/aks/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = "~> 1.9.5"
required_version = "~> 1.9.6"

required_providers {
azurerm = {
2 changes: 1 addition & 1 deletion terraform/green/apps/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = "~> 1.9.5"
required_version = "~> 1.9.6"

required_providers {
azurerm = {
4 changes: 2 additions & 2 deletions terraform/green/main.tf
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
terraform {
required_version = "~> 1.9.5"
required_version = "~> 1.9.6"
# Choose the backend according to your requirements
# backend "remote" {}

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 4.0.1"
version = "~> 4.3.0"
}
}
}
4 changes: 2 additions & 2 deletions terraform/shared/main.tf
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
terraform {
required_version = "~> 1.9.5"
required_version = "~> 1.9.6"
# Choose the backend according to your requirements
# backend "remote" {}

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 4.0.1"
version = "~> 4.3.0"
}

random = {
2 changes: 1 addition & 1 deletion test/e2e/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SHELL=/bin/bash

TF_VERSION := 1.9.5
TF_VERSION := 1.9.6

# Before running this test, you must:
# export GITHUB_TOKEN=your-token
2 changes: 1 addition & 1 deletion test/e2e/e2e_test.go
Original file line number Diff line number Diff line change
@@ -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.5", "specify Terraform version")
tfVer = flag.String("tf-version", "1.9.6", "specify Terraform version")
chaosTestManifests = flag.String("chaostest-manifest", "../chaos/manifests/*.yaml", "specify chaos test manifest file path")
)

12 changes: 6 additions & 6 deletions test/e2e/go.mod
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@ module github.com/torumakabe/aks-anti-dry-iac/test/e2e

go 1.23

toolchain go1.23.0
toolchain go1.23.1

require (
github.com/hashicorp/go-retryablehttp v0.7.7
github.com/hashicorp/go-version v1.7.0
github.com/hashicorp/hc-install v0.8.0
github.com/hashicorp/hc-install v0.9.0
github.com/hashicorp/terraform-exec v0.21.0
)

@@ -18,8 +18,8 @@ require (
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.26.0 // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/crypto v0.27.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
)
10 changes: 10 additions & 0 deletions test/e2e/go.sum
Original file line number Diff line number Diff line change
@@ -38,6 +38,8 @@ github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKe
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=
github.com/hashicorp/terraform-exec v0.21.0/go.mod h1:1PPeMYou+KDUSSeRE9szMZ/oHf4fYUmB923Wzbq1ICg=
github.com/hashicorp/terraform-json v0.22.1 h1:xft84GZR0QzjPVWs4lRUwvTcPnegqlyS7orfb5Ltvec=
@@ -62,16 +64,24 @@ 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/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/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=
2 changes: 1 addition & 1 deletion test/fixtures/blue/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = "~> 1.9.5"
required_version = "~> 1.9.6"
}

module "blue" {
2 changes: 1 addition & 1 deletion test/fixtures/green/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = "~> 1.9.5"
required_version = "~> 1.9.6"
}

module "green" {
2 changes: 1 addition & 1 deletion test/fixtures/shared/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = "~> 1.9.5"
required_version = "~> 1.9.6"
}

module "shared" {

0 comments on commit a6af243

Please sign in to comment.