Skip to content

Commit 6d6ecd6

Browse files
authored
update gcp terraform config (google#2387)
* use gke version 1.19 * Changed cpu type to e2 * updated cluster name to match ci env * added terrafrom change
1 parent b48ce37 commit 6d6ecd6

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## HEAD
44

5+
* GCP terraform script updated. GKE 1.19 and updated CPU type to E2
6+
57
### Dependency updates
68
* Upgraded to etcd v3 in order to allow grpc to be upgraded (#2195)
79
* etcd was `v0.5.0-alpha.5`, now `v3.5.0-alpha.0`

deployment/main.tf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ variable "region" {
99

1010
provider "google" {
1111
project = var.gcp_project
12-
version = "~> v3.0.0-beta.1"
12+
version = "~> 3.0.0-beta.1"
1313
}
1414

1515
provider "google-beta" {
1616
project = var.gcp_project
17-
version = "~> v3.0.0-beta.1"
17+
version = "~> 3.0.0-beta.1"
1818
}
1919

2020
# Enable required API in the project
@@ -32,20 +32,20 @@ resource "google_project_service" "spanner-api" {
3232
## Force recent version for Kubernetes master
3333
data "google_container_engine_versions" "gke-ver" {
3434
location = var.region
35-
version_prefix = "1.14."
35+
version_prefix = "1.19."
3636
}
3737

3838
resource "google_container_cluster" "trillian-cluster" {
3939
provider = google-beta
40-
name = "cluster"
40+
name = "trillian-opensource-ci"
4141
location = var.region
4242
node_version = data.google_container_engine_versions.gke-ver.latest_node_version
4343
min_master_version = data.google_container_engine_versions.gke-ver.latest_node_version
4444

4545
initial_node_count = 3
4646

4747
node_config {
48-
machine_type = "n1-standard-2"
48+
machine_type = "e2-standard-2"
4949
image_type = "COS"
5050

5151
workload_metadata_config {

0 commit comments

Comments
 (0)