Skip to content

Commit

Permalink
Merge pull request #120 from torumakabe:bump
Browse files Browse the repository at this point in the history
bump
  • Loading branch information
torumakabe authored Dec 6, 2024
2 parents fce6141 + 4d424d4 commit e91a305
Show file tree
Hide file tree
Showing 19 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-terraform-blue.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- name: "Setup Terraform"
uses: hashicorp/setup-terraform@v3
with:
terraform_version: 1.9.8
terraform_version: 1.10.1
terraform_wrapper: false

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

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

- name: "Terraform Format"
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ 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.8
- hashicorp/azurerm: 4.10.0
- [Terraform](https://www.terraform.io/docs/index.html): 1.10.1
- hashicorp/azurerm: 4.13.0
- State store: Local
- [TFLint](https://github.com/terraform-linters/tflint): 0.54.0
- [azurerm plugin](https://github.com/terraform-linters/tflint-ruleset-azurerm): 0.27.0
- [Azure/kubelogin](https://github.com/Azure/kubelogin): 0.1.4
- [Azure/kubelogin](https://github.com/Azure/kubelogin): 0.1.5
- Ubuntu: 22.04.5 LTS

### Privileges required for execution
Expand Down
2 changes: 1 addition & 1 deletion terraform/blue/aks/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ locals {
cluster_name = "${var.prefix}-aks-anti-dry-iac-${var.aks.switch}-${var.suffix}"

default = {
orchestrator_version = "1.31.1"
orchestrator_version = "1.31.2"
vm_size = "Standard_D2ds_v5"
os_disk_size_gb = 75
os_disk_type = "Ephemeral"
Expand Down
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.8"
required_version = "~> 1.10.1"

required_providers {
azurerm = {
Expand Down
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.8"
required_version = "~> 1.10.1"

required_providers {
azurerm = {
Expand Down
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.8"
required_version = "~> 1.10.1"
# Choose the backend according to your requirements
# backend "remote" {}

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

default = {
orchestrator_version = "1.31.1"
orchestrator_version = "1.31.2"
vm_size = "Standard_D2ds_v5"
os_disk_size_gb = 75
os_disk_type = "Ephemeral"
Expand Down
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.8"
required_version = "~> 1.10.1"

required_providers {
azurerm = {
Expand Down
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.8"
required_version = "~> 1.10.1"

required_providers {
azurerm = {
Expand Down
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.8"
required_version = "~> 1.10.1"
# Choose the backend according to your requirements
# backend "remote" {}

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 4.10.0"
version = "~> 4.13.0"
}
}
}
Expand Down
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.8"
required_version = "~> 1.10.1"
# Choose the backend according to your requirements
# backend "remote" {}

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 4.10.0"
version = "~> 4.13.0"
}

random = {
Expand Down
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.8
TF_VERSION := 1.10.1

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

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/torumakabe/aks-anti-dry-iac/test/e2e

go 1.23

toolchain go1.23.3
toolchain go1.23.4

require (
github.com/hashicorp/go-retryablehttp v0.7.7
Expand Down
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.8"
required_version = "~> 1.10.1"
}

module "blue" {
Expand Down
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.8"
required_version = "~> 1.10.1"
}

module "green" {
Expand Down
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.8"
required_version = "~> 1.10.1"
}

module "shared" {
Expand Down

0 comments on commit e91a305

Please sign in to comment.