From 59265f8c6e55df53ea8e4e2836086bba7c930e5c Mon Sep 17 00:00:00 2001 From: Angelo Fenoglio Date: Fri, 17 Jan 2025 20:21:45 -0300 Subject: [PATCH] Bump terraform version --- .../k8s-components/common-variables.tf | 134 +----------------- .../k8s-eks-demoapps/k8s-components/config.tf | 2 +- .../k8s-eks-demoapps/network/config.tf | 2 +- build.env | 2 +- 4 files changed, 4 insertions(+), 136 deletions(-) mode change 100644 => 120000 apps-devstg/us-east-1/k8s-eks-demoapps/k8s-components/common-variables.tf diff --git a/apps-devstg/us-east-1/k8s-eks-demoapps/k8s-components/common-variables.tf b/apps-devstg/us-east-1/k8s-eks-demoapps/k8s-components/common-variables.tf deleted file mode 100644 index fe03a7452..000000000 --- a/apps-devstg/us-east-1/k8s-eks-demoapps/k8s-components/common-variables.tf +++ /dev/null @@ -1,133 +0,0 @@ -#================================# -# Common variables # -#================================# - -# -# config/backend.config -# -#================================# -# Terraform AWS Backend Settings # -#================================# -variable "region" { - type = string - description = "AWS Region" -} - -variable "profile" { - type = string - description = "AWS Profile (required by the backend but also used for other resources)" -} - -variable "bucket" { - type = string - description = "AWS S3 TF State Backend Bucket" -} - -variable "dynamodb_table" { - type = string - description = "AWS DynamoDB TF Lock state table name" -} - -variable "encrypt" { - type = bool - description = "Enable AWS DynamoDB with server side encryption" -} - -# -# config/base.config -# -#=============================# -# Project Variables # -#=============================# -variable "project" { - type = string - description = "Project Name" -} - -variable "project_long" { - type = string - description = "Project Long Name" -} - -variable "environment" { - type = string - description = "Environment Name" -} - -# -# config/extra.config -# -#=============================# -# Accounts & Extra Vars # -#=============================# -variable "region_secondary" { - type = string - description = "AWS Scondary Region for HA" -} - -variable "accounts" { - type = map(any) - description = "Accounts descriptions" -} - -variable "vault_address" { - type = string - description = "Vault Address" -} - -variable "vault_token" { - type = string - description = "Vault Token" -} - -#=============================# -# AWS SSO Variables # -#=============================# -variable "sso_role" { - description = "SSO Role Name" -} - -variable "sso_enabled" { - type = string - description = "Enable SSO Service" -} - -variable "sso_region" { - type = string - description = "SSO Region" -} - -variable "sso_start_url" { - type = string - description = "SSO Start Url" -} - -#===========================================# -# Networking # -#===========================================# -variable "enable_tgw" { - description = "Enable Transit Gateway Support" - type = bool - default = false -} - -variable "enable_tgw_multi_region" { - description = "Enable Transit Gateway multi region support" - type = bool - default = false -} - -variable "tgw_cidrs" { - description = "CIDRs to be added as routes to public RT" - type = list(string) - default = [] -} - -#===========================================# -# Security compliance -#===========================================# -variable "enable_inspector" { - description = "Turn inspector on/off" - type = bool - default = false -} diff --git a/apps-devstg/us-east-1/k8s-eks-demoapps/k8s-components/common-variables.tf b/apps-devstg/us-east-1/k8s-eks-demoapps/k8s-components/common-variables.tf new file mode 120000 index 000000000..2f807a597 --- /dev/null +++ b/apps-devstg/us-east-1/k8s-eks-demoapps/k8s-components/common-variables.tf @@ -0,0 +1 @@ +../../../../config/common-variables.tf \ No newline at end of file diff --git a/apps-devstg/us-east-1/k8s-eks-demoapps/k8s-components/config.tf b/apps-devstg/us-east-1/k8s-eks-demoapps/k8s-components/config.tf index 222487c47..e0ca6a8ae 100644 --- a/apps-devstg/us-east-1/k8s-eks-demoapps/k8s-components/config.tf +++ b/apps-devstg/us-east-1/k8s-eks-demoapps/k8s-components/config.tf @@ -30,7 +30,7 @@ provider "helm" { # Backend Config (partial) #------------------------------------------------------------------------------ terraform { - required_version = "~> 1.3" + required_version = "~> 1.6" required_providers { aws = "~> 5.24" diff --git a/apps-devstg/us-east-1/k8s-eks-demoapps/network/config.tf b/apps-devstg/us-east-1/k8s-eks-demoapps/network/config.tf index 9efcf62ce..a5c7df304 100644 --- a/apps-devstg/us-east-1/k8s-eks-demoapps/network/config.tf +++ b/apps-devstg/us-east-1/k8s-eks-demoapps/network/config.tf @@ -16,7 +16,7 @@ provider "aws" { # Backend Config (partial) # terraform { - required_version = "~> 1.2" + required_version = "~> 1.6" required_providers { aws = "~> 4.11" diff --git a/build.env b/build.env index c44f462e0..1f02dad52 100644 --- a/build.env +++ b/build.env @@ -5,4 +5,4 @@ PROJECT=bb MFA_ENABLED=false # Terraform -TERRAFORM_IMAGE_TAG=1.3.5-0.2.1 +TERRAFORM_IMAGE_TAG=1.6.0-0.2.1