Commit ca201a96 authored by Marcel Chacon's avatar Marcel Chacon
Browse files

Upgrade multiple environments to Terraform v0.14

parent 19979486
......@@ -3,7 +3,6 @@
provider "google" {
project = "env-zero"
region = "us-east1"
version = "~> 3.44"
}
// Use Terraform Remote State backed by Google Cloud Storage
......
terraform {
required_version = ">= 0.13"
required_version = ">= 0.14"
required_providers {
google = {
source = "hashicorp/google"
source = "hashicorp/google"
version = "~> 3.44"
}
}
}
......@@ -9,8 +9,7 @@ terraform {
## AWS
provider "aws" {
region = "us-west-1"
version = "2.45.0"
region = "us-west-1"
}
#######
......
terraform {
required_providers {
aws = {
source = "hashicorp/aws"
source = "hashicorp/aws"
version = "2.45.0"
}
}
required_version = ">= 0.13"
required_version = ">= 0.14"
}
......@@ -9,14 +9,12 @@ terraform {
## AWS
provider "aws" {
region = "us-east-1"
version = "~> 2.27.0"
region = "us-east-1"
}
## CloudFlare
provider "cloudflare" {
version = "= 2.23.0"
email = var.cloudflare_email
api_key = var.cloudflare_api_key
account_id = var.cloudflare_account_id
......@@ -24,7 +22,6 @@ provider "cloudflare" {
## Local
provider "local" {
version = "~> 1.4.0"
}
variable "gitlab_com_zone_id" {
......@@ -38,13 +35,11 @@ variable "gitlab_net_zone_id" {
provider "google" {
project = var.project
region = var.region
version = "~> 3.44"
}
provider "google-beta" {
project = var.project
region = var.region
version = "~> 3.44"
}
##################################
......
terraform {
required_version = ">= 0.13"
required_version = ">= 0.14"
required_providers {
aws = {
source = "hashicorp/aws"
source = "hashicorp/aws"
version = "~> 2.27.0"
}
cloudflare = {
source = "cloudflare/cloudflare"
source = "cloudflare/cloudflare"
version = "= 2.23.0"
}
google = {
source = "hashicorp/google"
source = "hashicorp/google"
version = "~> 3.44"
}
google-beta = {
source = "hashicorp/google-beta"
source = "hashicorp/google-beta"
version = "~> 3.44"
}
local = {
source = "hashicorp/local"
source = "hashicorp/local"
version = "~> 1.4.0"
}
}
}
......@@ -15,7 +15,6 @@ provider "aws" {
## CloudFlare
provider "cloudflare" {
version = "= 2.23.0"
email = var.cloudflare_email
api_key = var.cloudflare_api_key
account_id = var.cloudflare_account_id
......
variable "redirects" {
type = map
type = map(any)
default = {
"gitlab.org." = {
......@@ -28,7 +28,7 @@ variable "redirects" {
}
variable "apex_redirects" {
type = map
type = map(any)
default = {
"gitlab.org" = "https://about.gitlab.com/"
......@@ -43,7 +43,7 @@ variable "apex_redirects" {
# to support TLS you can ommit the entry and we'll use nonssl.global.fastly.net
# by default
variable "tls_domains" {
type = map
type = map(any)
default = {
"www.gitlab.org" = "h3.shared.global.fastly.net"
......@@ -56,7 +56,7 @@ variable "tls_domains" {
}
variable "tls_apex_domains_ips" {
type = map
type = map(any)
default = {
"gitlab.org" = [
......
......@@ -4,11 +4,12 @@ terraform {
source = "hashicorp/aws"
}
cloudflare = {
source = "cloudflare/cloudflare"
source = "cloudflare/cloudflare"
version = "= 2.23.0"
}
fastly = {
source = "fastly/fastly"
}
}
required_version = ">= 0.13"
required_version = ">= 0.14"
}
......@@ -9,13 +9,11 @@ terraform {
## AWS
provider "aws" {
region = "us-east-1"
version = "~> 2.27.0"
region = "us-east-1"
}
## CloudFlare
provider "cloudflare" {
version = "= 2.23.0"
email = var.cloudflare_email
api_key = var.cloudflare_api_key
account_id = var.cloudflare_account_id
......@@ -23,14 +21,12 @@ provider "cloudflare" {
## Local
provider "local" {
version = "~> 1.4.0"
}
## Google
provider "google" {
project = var.project
region = var.region
version = "~> 3.44"
}
##################################
......
terraform {
required_version = ">= 0.13"
required_version = ">= 0.14"
required_providers {
aws = {
source = "hashicorp/aws"
source = "hashicorp/aws"
version = "~> 2.27.0"
}
cloudflare = {
source = "cloudflare/cloudflare"
source = "cloudflare/cloudflare"
version = "= 2.23.0"
}
google = {
source = "hashicorp/google"
source = "hashicorp/google"
version = "~> 3.44"
}
local = {
source = "hashicorp/local"
source = "hashicorp/local"
version = "~> 1.4.0"
}
}
}
......@@ -8,24 +8,21 @@ terraform {
}
provider "aws" {
region = "us-east-1"
version = "~> 2.27.0"
region = "us-east-1"
}
provider "google" {
project = var.project
region = var.region
version = "~> 3.42"
}
provider "google-beta" {
project = var.project
region = var.region
version = "~> 3.44"
}
provider "cloudflare" {
version = "= 2.23.0"
email = var.cloudflare_email
api_key = var.cloudflare_api_key
account_id = var.cloudflare_account_id
......
terraform {
required_providers {
aws = {
source = "hashicorp/aws"
source = "hashicorp/aws"
version = "~> 2.27.0"
}
cloudflare = {
source = "cloudflare/cloudflare"
source = "cloudflare/cloudflare"
version = "= 2.23.0"
}
google = {
source = "hashicorp/google"
source = "hashicorp/google"
version = "~> 3.44"
}
google-beta = {
source = "hashicorp/google-beta"
source = "hashicorp/google-beta"
version = "~> 3.44"
}
}
required_version = ">= 0.13"
required_version = ">= 0.14"
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment