Skip to content

Commit 13e5a52

Browse files
kopachevskykopachevsky
committed
Ensure that GA modules don't depend on beta functionality
Beta functionality removed fully from public and private cluster modules and related exampled. As long node_pool example used taints that in beta, it switched to public-cluster-beta module from root one. Fixes #181
1 parent ed58124 commit 13e5a52

File tree

36 files changed

+44
-157
lines changed

36 files changed

+44
-157
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77
Extending the adopted spec, each change should have a link to its corresponding pull request appended.
88

99
## [Unreleased]
10+
11+
### Changed
12+
13+
* All Beta functionality removed from non-beta clusters, some properties like node_pool taints available only in beta cluster now [#228]
14+
1015
### Added
1116

1217
* Support for Intranode Visbiility (IV) and Veritical Pod Autoscaling (VPA) beta features [#216]
@@ -167,6 +172,7 @@ Extending the adopted spec, each change should have a link to its corresponding
167172
[v0.3.0]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v0.2.0...v0.3.0
168173
[v0.2.0]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v0.1.0...v0.2.0
169174

175+
[#228]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/228
170176
[#216]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/216
171177
[#214]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/214
172178
[#210]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/210

‎README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ In either case, upgrading to module version `v1.0.0` will trigger a recreation o
161161
| node\_pools\_metadata | Map of maps containing node metadata by node-pool name | map(map(string)) | `<map>` | no |
162162
| node\_pools\_oauth\_scopes | Map of lists containing node oauth scopes by node-pool name | map(list(string)) | `<map>` | no |
163163
| node\_pools\_tags | Map of lists containing node network tags by node-pool name | map(list(string)) | `<map>` | no |
164-
| node\_pools\_taints | Map of lists containing node taints by node-pool name | object | `<map>` | no |
165164
| node\_version | The Kubernetes version of the node pools. Defaults kubernetes_version (master) variable and can be overridden for individual node pools by setting the `version` key on them. Must be empyty or set the same as master at cluster creation. | string | `""` | no |
166165
| non\_masquerade\_cidrs | List of strings in CIDR notation that specify the IP address ranges that do not use IP masquerading. | list(string) | `<list>` | no |
167166
| project\_id | The project ID to host the cluster in (required) | string | n/a | yes |

‎autogen/auth.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
Retrieve authentication token
2121
*****************************************/
2222
data "google_client_config" "default" {
23-
{% if private_cluster or beta_cluster %}
23+
{% if beta_cluster %}
2424
provider = google-beta
2525
{% else %}
2626
provider = google

‎autogen/cluster_regional.tf

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
Create regional cluster
2121
*****************************************/
2222
resource "google_container_cluster" "primary" {
23-
{% if private_cluster or beta_cluster %}
23+
{% if beta_cluster %}
2424
provider = google-beta
2525
{% else %}
2626
provider = google
@@ -193,7 +193,11 @@ resource "google_container_cluster" "primary" {
193193
Create regional node pools
194194
*****************************************/
195195
resource "google_container_node_pool" "pools" {
196+
{% if beta_cluster %}
196197
provider = google-beta
198+
{% else %}
199+
provider = google
200+
{% endif %}
197201
count = var.regional ? length(var.node_pools) : 0
198202
name = var.node_pools[count.index]["name"]
199203
project = var.project_id
@@ -249,6 +253,7 @@ resource "google_container_node_pool" "pools" {
249253
"disable-legacy-endpoints" = var.disable_legacy_metadata_endpoints
250254
},
251255
)
256+
{% if beta_cluster %}
252257
dynamic "taint" {
253258
for_each = concat(
254259
var.node_pools_taints["all"],
@@ -260,6 +265,7 @@ resource "google_container_node_pool" "pools" {
260265
value = taint.value.value
261266
}
262267
}
268+
{% endif %}
263269
tags = concat(
264270
["gke-${var.name}"],
265271
["gke-${var.name}-${var.node_pools[count.index]["name"]}"],

‎autogen/cluster_zonal.tf

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
Create zonal cluster
2121
*****************************************/
2222
resource "google_container_cluster" "zonal_primary" {
23-
{% if private_cluster or beta_cluster %}
23+
{% if beta_cluster %}
2424
provider = google-beta
2525
{% else %}
2626
provider = google
@@ -189,7 +189,11 @@ resource "google_container_cluster" "zonal_primary" {
189189
Create zonal node pools
190190
*****************************************/
191191
resource "google_container_node_pool" "zonal_pools" {
192+
{% if beta_cluster %}
192193
provider = google-beta
194+
{% else %}
195+
provider = google
196+
{% endif %}
193197
count = var.regional ? 0 : length(var.node_pools)
194198
name = var.node_pools[count.index]["name"]
195199
project = var.project_id
@@ -244,6 +248,7 @@ resource "google_container_node_pool" "zonal_pools" {
244248
"disable-legacy-endpoints" = var.disable_legacy_metadata_endpoints
245249
},
246250
)
251+
{% if beta_cluster %}
247252
dynamic "taint" {
248253
for_each = concat(
249254
var.node_pools_taints["all"],
@@ -255,7 +260,7 @@ resource "google_container_node_pool" "zonal_pools" {
255260
value = taint.value.value
256261
}
257262
}
258-
263+
{% endif %}
259264
tags = concat(
260265
["gke-${var.name}"],
261266
["gke-${var.name}-${var.node_pools[count.index]["name"]}"],

‎autogen/main.tf

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
Get available zones in region
2121
*****************************************/
2222
data "google_compute_zones" "available" {
23-
{% if private_cluster or beta_cluster %}
23+
{% if beta_cluster %}
2424
provider = google-beta
2525
{% else %}
2626
provider = google
@@ -309,7 +309,11 @@ locals {
309309
Get available container engine versions
310310
*****************************************/
311311
data "google_container_engine_versions" "region" {
312+
{% if beta_cluster %}
312313
provider = google-beta
314+
{% else %}
315+
provider = google
316+
{% endif %}
313317
region = var.region
314318
project = var.project_id
315319
}

‎autogen/networks.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
{{ autogeneration_note }}
1818

1919
data "google_compute_network" "gke_network" {
20-
{% if private_cluster or beta_cluster %}
20+
{% if beta_cluster %}
2121
provider = google-beta
2222
{% else %}
2323
provider = google
@@ -28,7 +28,7 @@ data "google_compute_network" "gke_network" {
2828
}
2929

3030
data "google_compute_subnetwork" "gke_subnetwork" {
31-
{% if private_cluster or beta_cluster %}
31+
{% if beta_cluster %}
3232
provider = google-beta
3333
{% else %}
3434
provider = google

‎autogen/variables.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ variable "node_pools_metadata" {
178178
}
179179
}
180180

181+
{% if beta_cluster %}
181182
variable "node_pools_taints" {
182183
type = map(list(object({key=string,value=string,effect=string})))
183184
description = "Map of lists containing node taints by node-pool name"
@@ -187,6 +188,7 @@ variable "node_pools_taints" {
187188
default-node-pool = []
188189
}
189190
}
191+
{% endif %}
190192

191193
variable "node_pools_tags" {
192194
type = map(list(string))

‎cluster_regional.tf

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ resource "google_container_cluster" "primary" {
129129
Create regional node pools
130130
*****************************************/
131131
resource "google_container_node_pool" "pools" {
132-
provider = google-beta
132+
provider = google
133133
count = var.regional ? length(var.node_pools) : 0
134134
name = var.node_pools[count.index]["name"]
135135
project = var.project_id
@@ -182,17 +182,6 @@ resource "google_container_node_pool" "pools" {
182182
"disable-legacy-endpoints" = var.disable_legacy_metadata_endpoints
183183
},
184184
)
185-
dynamic "taint" {
186-
for_each = concat(
187-
var.node_pools_taints["all"],
188-
var.node_pools_taints[var.node_pools[count.index]["name"]],
189-
)
190-
content {
191-
effect = taint.value.effect
192-
key = taint.value.key
193-
value = taint.value.value
194-
}
195-
}
196185
tags = concat(
197186
["gke-${var.name}"],
198187
["gke-${var.name}-${var.node_pools[count.index]["name"]}"],

‎cluster_zonal.tf

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ resource "google_container_cluster" "zonal_primary" {
126126
Create zonal node pools
127127
*****************************************/
128128
resource "google_container_node_pool" "zonal_pools" {
129-
provider = google-beta
129+
provider = google
130130
count = var.regional ? 0 : length(var.node_pools)
131131
name = var.node_pools[count.index]["name"]
132132
project = var.project_id
@@ -178,18 +178,6 @@ resource "google_container_node_pool" "zonal_pools" {
178178
"disable-legacy-endpoints" = var.disable_legacy_metadata_endpoints
179179
},
180180
)
181-
dynamic "taint" {
182-
for_each = concat(
183-
var.node_pools_taints["all"],
184-
var.node_pools_taints[var.node_pools[count.index]["name"]],
185-
)
186-
content {
187-
effect = taint.value.effect
188-
key = taint.value.key
189-
value = taint.value.value
190-
}
191-
}
192-
193181
tags = concat(
194182
["gke-${var.name}"],
195183
["gke-${var.name}-${var.node_pools[count.index]["name"]}"],

‎examples/deploy_service/main.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ provider "google" {
2323
region = var.region
2424
}
2525

26-
provider "google-beta" {
27-
version = "~> 2.9.0"
28-
region = var.region
29-
}
30-
3126
provider "kubernetes" {
3227
load_config_file = false
3328
host = "https://${module.gke.endpoint}"

‎examples/disable_client_cert/main.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ provider "google" {
2323
region = var.region
2424
}
2525

26-
provider "google-beta" {
27-
version = "~> 2.9.0"
28-
region = var.region
29-
}
30-
3126
module "gke" {
3227
source = "../../"
3328

‎examples/node_pool/main.tf

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,8 @@ provider "google" {
2323
region = var.region
2424
}
2525

26-
provider "google-beta" {
27-
version = "~> 2.9.0"
28-
region = var.region
29-
}
30-
3126
module "gke" {
32-
source = "../../"
27+
source = "../../modules/beta-public-cluster/"
3328
project_id = var.project_id
3429
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
3530
regional = false

‎examples/shared_vpc/main.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ provider "google" {
2323
region = var.region
2424
}
2525

26-
provider "google-beta" {
27-
version = "~> 2.9.0"
28-
region = var.region
29-
}
30-
3126
module "gke" {
3227
source = "../../"
3328
project_id = var.project_id

‎examples/simple_regional/main.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ provider "google" {
2323
region = var.region
2424
}
2525

26-
provider "google-beta" {
27-
version = "~> 2.9.0"
28-
region = var.region
29-
}
30-
3126
module "gke" {
3227
source = "../../"
3328
project_id = var.project_id

‎examples/simple_regional_beta/main.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@ provider "google" {
2424
region = var.region
2525
}
2626

27-
provider "google-beta" {
28-
version = "~> 2.9.0"
29-
credentials = file(var.credentials_path)
30-
region = var.region
31-
}
32-
3327
module "gke" {
3428
source = "../../modules/beta-public-cluster/"
3529
project_id = var.project_id

‎examples/simple_regional_private/main.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ locals {
1818
cluster_type = "simple-regional-private"
1919
}
2020

21-
provider "google-beta" {
22-
version = "~> 2.9.0"
23-
region = var.region
24-
}
25-
2621
data "google_compute_subnetwork" "subnetwork" {
2722
name = var.subnetwork
2823
project = var.project_id

‎examples/simple_zonal/main.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ provider "google" {
2323
region = var.region
2424
}
2525

26-
provider "google-beta" {
27-
version = "~> 2.9.0"
28-
region = var.region
29-
}
30-
3126
module "gke" {
3227
source = "../../"
3328
project_id = var.project_id

‎examples/simple_zonal_private/main.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ locals {
1818
cluster_type = "simple-regional-private"
1919
}
2020

21-
provider "google-beta" {
22-
version = "~> 2.9.0"
23-
region = var.region
24-
}
25-
2621
data "google_compute_subnetwork" "subnetwork" {
2722
name = var.subnetwork
2823
project = var.project_id

‎examples/stub_domains/main.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ provider "google" {
2323
region = var.region
2424
}
2525

26-
provider "google-beta" {
27-
version = "~> 2.9.0"
28-
region = var.region
29-
}
30-
3126
module "gke" {
3227
source = "../../"
3328
project_id = var.project_id

‎examples/stub_domains_private/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
provider "google-beta" {
17+
provider "google" {
1818
version = "~> 2.9.0"
1919
region = var.region
2020
}

‎examples/stub_domains_upstream_nameservers/main.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ provider "google" {
2323
region = var.region
2424
}
2525

26-
provider "google-beta" {
27-
version = "~> 2.9.0"
28-
region = var.region
29-
}
30-
3126
module "gke" {
3227
source = "../../"
3328
project_id = var.project_id

‎examples/upstream_nameservers/main.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ provider "google" {
2323
region = var.region
2424
}
2525

26-
provider "google-beta" {
27-
version = "~> 2.9.0"
28-
region = var.region
29-
}
30-
3126
module "gke" {
3227
source = "../../"
3328
project_id = var.project_id

‎main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ locals {
257257
Get available container engine versions
258258
*****************************************/
259259
data "google_container_engine_versions" "region" {
260-
provider = google-beta
260+
provider = google
261261
region = var.region
262262
project = var.project_id
263263
}

‎modules/beta-private-cluster/cluster_zonal.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ resource "google_container_node_pool" "zonal_pools" {
239239
value = taint.value.value
240240
}
241241
}
242-
243242
tags = concat(
244243
["gke-${var.name}"],
245244
["gke-${var.name}-${var.node_pools[count.index]["name"]}"],

0 commit comments

Comments
 (0)