Skip to content

Commit f5033c1

Browse files
aaron-laneaaron-lane
authored
Merge branch 'master' into ds/fix-documentation
2 parents 751b8b2 + b4aec9b commit f5033c1

File tree

18 files changed

+55
-28
lines changed

18 files changed

+55
-28
lines changed

‎autogen/cluster_regional.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ resource "google_container_cluster" "primary" {
9898
Create regional node pools
9999
*****************************************/
100100
resource "google_container_node_pool" "pools" {
101-
provider = "{% if private_cluster %}google-beta{%else %}google{% endif %}"
101+
provider = "google-beta"
102102
count = "${var.regional ? length(var.node_pools) : 0}"
103103
name = "${lookup(var.node_pools[count.index], "name")}"
104104
project = "${var.project_id}"
@@ -121,7 +121,7 @@ resource "google_container_node_pool" "pools" {
121121
image_type = "${lookup(var.node_pools[count.index], "image_type", "COS")}"
122122
machine_type = "${lookup(var.node_pools[count.index], "machine_type", "n1-standard-2")}"
123123
labels = "${merge(map("cluster_name", var.name), map("node_pool", lookup(var.node_pools[count.index], "name")), var.node_pools_labels["all"], var.node_pools_labels[lookup(var.node_pools[count.index], "name")])}"
124-
metadata = "${merge(map("cluster_name", var.name), map("node_pool", lookup(var.node_pools[count.index], "name")), var.node_pools_metadata["all"], var.node_pools_metadata[lookup(var.node_pools[count.index], "name")])}"
124+
metadata = "${merge(map("cluster_name", var.name), map("node_pool", lookup(var.node_pools[count.index], "name")), var.node_pools_metadata["all"], var.node_pools_metadata[lookup(var.node_pools[count.index], "name")], map("disable-legacy-endpoints", var.disable_legacy_metadata_endpoints))}"
125125
taint = "${concat(var.node_pools_taints["all"], var.node_pools_taints[lookup(var.node_pools[count.index], "name")])}"
126126
tags = ["${concat(list("gke-${var.name}"), list("gke-${var.name}-${lookup(var.node_pools[count.index], "name")}"), var.node_pools_tags["all"], var.node_pools_tags[lookup(var.node_pools[count.index], "name")])}"]
127127

‎autogen/cluster_zonal.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ resource "google_container_cluster" "zonal_primary" {
9898
Create zonal node pools
9999
*****************************************/
100100
resource "google_container_node_pool" "zonal_pools" {
101-
provider = "{% if private_cluster %}google-beta{%else %}google{% endif %}"
101+
provider = "google-beta"
102102
count = "${var.regional ? 0 : length(var.node_pools)}"
103103
name = "${lookup(var.node_pools[count.index], "name")}"
104104
project = "${var.project_id}"
@@ -121,7 +121,7 @@ resource "google_container_node_pool" "zonal_pools" {
121121
image_type = "${lookup(var.node_pools[count.index], "image_type", "COS")}"
122122
machine_type = "${lookup(var.node_pools[count.index], "machine_type", "n1-standard-2")}"
123123
labels = "${merge(map("cluster_name", var.name), map("node_pool", lookup(var.node_pools[count.index], "name")), var.node_pools_labels["all"], var.node_pools_labels[lookup(var.node_pools[count.index], "name")])}"
124-
metadata = "${merge(map("cluster_name", var.name), map("node_pool", lookup(var.node_pools[count.index], "name")), var.node_pools_metadata["all"], var.node_pools_metadata[lookup(var.node_pools[count.index], "name")])}"
124+
metadata = "${merge(map("cluster_name", var.name), map("node_pool", lookup(var.node_pools[count.index], "name")), var.node_pools_metadata["all"], var.node_pools_metadata[lookup(var.node_pools[count.index], "name")], map("disable-legacy-endpoints", var.disable_legacy_metadata_endpoints))}"
125125
taint = "${concat(var.node_pools_taints["all"], var.node_pools_taints[lookup(var.node_pools[count.index], "name")])}"
126126
tags = ["${concat(list("gke-${var.name}"), list("gke-${var.name}-${lookup(var.node_pools[count.index], "name")}"), var.node_pools_tags["all"], var.node_pools_tags[lookup(var.node_pools[count.index], "name")])}"]
127127

‎autogen/variables.tf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,12 @@ variable "remove_default_node_pool" {
124124
default = false
125125
}
126126

127+
variable "disable_legacy_metadata_endpoints" {
128+
description = "Disable the /0.1/ and /v1beta1/ metadata server endpoints on the node. Changing this value will cause all node pools to be recreated."
129+
default = "true"
130+
}
131+
132+
127133
variable "node_pools" {
128134
type = "list"
129135
description = "List of maps containing node pools"

‎cluster_regional.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ resource "google_container_cluster" "primary" {
9191
Create regional node pools
9292
*****************************************/
9393
resource "google_container_node_pool" "pools" {
94-
provider = "google"
94+
provider = "google-beta"
9595
count = "${var.regional ? length(var.node_pools) : 0}"
9696
name = "${lookup(var.node_pools[count.index], "name")}"
9797
project = "${var.project_id}"
@@ -114,7 +114,7 @@ resource "google_container_node_pool" "pools" {
114114
image_type = "${lookup(var.node_pools[count.index], "image_type", "COS")}"
115115
machine_type = "${lookup(var.node_pools[count.index], "machine_type", "n1-standard-2")}"
116116
labels = "${merge(map("cluster_name", var.name), map("node_pool", lookup(var.node_pools[count.index], "name")), var.node_pools_labels["all"], var.node_pools_labels[lookup(var.node_pools[count.index], "name")])}"
117-
metadata = "${merge(map("cluster_name", var.name), map("node_pool", lookup(var.node_pools[count.index], "name")), var.node_pools_metadata["all"], var.node_pools_metadata[lookup(var.node_pools[count.index], "name")])}"
117+
metadata = "${merge(map("cluster_name", var.name), map("node_pool", lookup(var.node_pools[count.index], "name")), var.node_pools_metadata["all"], var.node_pools_metadata[lookup(var.node_pools[count.index], "name")], map("disable-legacy-endpoints", var.disable_legacy_metadata_endpoints))}"
118118
taint = "${concat(var.node_pools_taints["all"], var.node_pools_taints[lookup(var.node_pools[count.index], "name")])}"
119119
tags = ["${concat(list("gke-${var.name}"), list("gke-${var.name}-${lookup(var.node_pools[count.index], "name")}"), var.node_pools_tags["all"], var.node_pools_tags[lookup(var.node_pools[count.index], "name")])}"]
120120

‎cluster_zonal.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ resource "google_container_cluster" "zonal_primary" {
9191
Create zonal node pools
9292
*****************************************/
9393
resource "google_container_node_pool" "zonal_pools" {
94-
provider = "google"
94+
provider = "google-beta"
9595
count = "${var.regional ? 0 : length(var.node_pools)}"
9696
name = "${lookup(var.node_pools[count.index], "name")}"
9797
project = "${var.project_id}"
@@ -114,7 +114,7 @@ resource "google_container_node_pool" "zonal_pools" {
114114
image_type = "${lookup(var.node_pools[count.index], "image_type", "COS")}"
115115
machine_type = "${lookup(var.node_pools[count.index], "machine_type", "n1-standard-2")}"
116116
labels = "${merge(map("cluster_name", var.name), map("node_pool", lookup(var.node_pools[count.index], "name")), var.node_pools_labels["all"], var.node_pools_labels[lookup(var.node_pools[count.index], "name")])}"
117-
metadata = "${merge(map("cluster_name", var.name), map("node_pool", lookup(var.node_pools[count.index], "name")), var.node_pools_metadata["all"], var.node_pools_metadata[lookup(var.node_pools[count.index], "name")])}"
117+
metadata = "${merge(map("cluster_name", var.name), map("node_pool", lookup(var.node_pools[count.index], "name")), var.node_pools_metadata["all"], var.node_pools_metadata[lookup(var.node_pools[count.index], "name")], map("disable-legacy-endpoints", var.disable_legacy_metadata_endpoints))}"
118118
taint = "${concat(var.node_pools_taints["all"], var.node_pools_taints[lookup(var.node_pools[count.index], "name")])}"
119119
tags = ["${concat(list("gke-${var.name}"), list("gke-${var.name}-${lookup(var.node_pools[count.index], "name")}"), var.node_pools_tags["all"], var.node_pools_tags[lookup(var.node_pools[count.index], "name")])}"]
120120

‎examples/deploy_service/main.tf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ locals {
1919
}
2020

2121
provider "google" {
22+
version = "~> 2.2"
2223
credentials = "${file(var.credentials_path)}"
2324
region = "${var.region}"
24-
version = "~> 1.20"
2525
}
2626

2727
provider "google-beta" {
28+
version = "~> 2.2"
2829
credentials = "${file(var.credentials_path)}"
2930
region = "${var.region}"
3031
}

‎examples/node_pool/main.tf‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,30 @@ locals {
1919
}
2020

2121
provider "google" {
22-
version = "~> 1.20"
22+
version = "~> 2.2"
2323
credentials = "${file(var.credentials_path)}"
2424
region = "${var.region}"
2525
}
2626

2727
provider "google-beta" {
28+
version = "~> 2.2"
2829
credentials = "${file(var.credentials_path)}"
2930
region = "${var.region}"
3031
}
3132

3233
module "gke" {
33-
source = "../../"
34-
project_id = "${var.project_id}"
35-
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
36-
regional = "false"
37-
region = "${var.region}"
38-
zones = "${var.zones}"
39-
network = "${var.network}"
40-
subnetwork = "${var.subnetwork}"
41-
ip_range_pods = "${var.ip_range_pods}"
42-
ip_range_services = "${var.ip_range_services}"
43-
remove_default_node_pool = "true"
34+
source = "../../"
35+
project_id = "${var.project_id}"
36+
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
37+
regional = "false"
38+
region = "${var.region}"
39+
zones = "${var.zones}"
40+
network = "${var.network}"
41+
subnetwork = "${var.subnetwork}"
42+
ip_range_pods = "${var.ip_range_pods}"
43+
ip_range_services = "${var.ip_range_services}"
44+
remove_default_node_pool = "true"
45+
disable_legacy_metadata_endpoints = "false"
4446

4547
node_pools = [
4648
{

‎examples/shared_vpc/main.tf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ locals {
1919
}
2020

2121
provider "google" {
22-
version = "~> 1.20"
22+
version = "~> 2.2"
2323
credentials = "${file(var.credentials_path)}"
2424
region = "${var.region}"
2525
}
2626

2727
provider "google-beta" {
28+
version = "~> 2.2"
2829
credentials = "${file(var.credentials_path)}"
2930
region = "${var.region}"
3031
}

‎examples/simple_regional/main.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ locals {
1919
}
2020

2121
provider "google" {
22+
version = "~> 2.2"
2223
credentials = "${file(var.credentials_path)}"
2324
region = "${var.region}"
2425
}
2526

2627
provider "google-beta" {
28+
version = "~> 2.2"
2729
credentials = "${file(var.credentials_path)}"
2830
region = "${var.region}"
2931
}

‎examples/simple_regional_private/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google-beta" {
22-
version = "~> 1.20"
22+
version = "~> 2.2"
2323
credentials = "${file(var.credentials_path)}"
2424
region = "${var.region}"
2525
}

0 commit comments

Comments
 (0)