flip/convox
1
0
Fork 0
mirror of https://github.com/FlipsideCrypto/convox.git synced 2026-02-06 10:56:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gcp: upgrade provider and use REGULAR channel for GKE (#84)

Browse Source
This commit is contained in:
David Dollar 2020-01-28 11:16:23 -05:00 committed by GitHub
parent 35e563770f
commit 9dbc425d88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
terraform/api/gcp/main.tf
View File

@ -3,7 +3,7 @@ terraform {
}
provider "google" {
version = "~> 2.12"
version = "~> 3.5.0"
}
provider "kubernetes" {

20
terraform/cluster/gcp/main.tf
View File

@ -1,13 +1,9 @@
terraform {
required_version = ">= 0.12.0"
}
provider "google" {
version = "~> 2.19"
version = "~> 3.5.0"
}
provider "google-beta" {
version = "~> 2.19"
version = "~> 3.5.0"
}
provider "local" {
@ -20,11 +16,6 @@ provider "random" {
data "google_client_config" "current" {}
data "google_container_engine_versions" "available" {
location = data.google_client_config.current.region
version_prefix = "1.14."
}
data "google_project" "current" {}
resource "random_string" "password" {
@ -41,8 +32,10 @@ resource "google_container_cluster" "rack" {
remove_default_node_pool = true
initial_node_count = 1
logging_service = "logging.googleapis.com"
min_master_version = data.google_container_engine_versions.available.latest_master_version
release_channel {
channel = "REGULAR"
}
workload_identity_config {
identity_namespace = "${data.google_project.current.project_id}.svc.id.goog"
@ -67,7 +60,6 @@ resource "google_container_node_pool" "rack" {
location = google_container_cluster.rack.location
cluster = google_container_cluster.rack.name
initial_node_count = 1
version = data.google_container_engine_versions.available.latest_master_version
autoscaling {
min_node_count = 1

7
terraform/rack/gcp/main.tf
View File

@ -1,10 +1,5 @@
terraform {
required_version = ">= 0.12.0"
}
provider "google" {
version = "~> 2.12"
version = "~> 3.5.0"
}
provider "kubernetes" {

6
terraform/router/gcp/main.tf
View File

@ -1,9 +1,5 @@
terraform {
required_version = ">= 0.12.0"
}
provider "google" {
version = "~> 2.12"
version = "~> 3.5.0"
}
provider "http" {

4
terraform/system/gcp/main.tf
View File

@ -3,14 +3,14 @@ terraform {
}
provider "google" {
version = "~> 2.19"
version = "~> 3.5.0"
project = module.project.id
region = module.project.region
}
provider "google-beta" {
version = "~> 2.19"
version = "~> 3.5.0"
project = module.project.id
region = module.project.region

2
terraform/system/gcp/project/main.tf
View File

@ -1,5 +1,5 @@
provider "google" {
version = "~> 2.18"
version = "~> 3.5.0"
alias = "direct"
}