Skip to content

Commit 5ea026b

Browse files
authored
Merge pull request #300 from Dev25/shielded_nodes
Add Shielded Nodes beta field
2 parents ce90c83 + 28f2470 commit 5ea026b

File tree

12 files changed

+35
-0
lines changed

12 files changed

+35
-0
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ Extending the adopted spec, each change should have a link to its corresponding
88

99
## [Unreleased]
1010

11+
### Added
12+
13+
* Support for Shielded Nodes beta feature via `enabled_shielded_nodes` variable. [#300]
14+
1115
## [v5.1.1] - 2019-10-25
1216

1317
### Fixed

autogen/cluster.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ resource "google_container_cluster" "primary" {
6565
enable_binary_authorization = var.enable_binary_authorization
6666
enable_intranode_visibility = var.enable_intranode_visibility
6767
default_max_pods_per_node = var.default_max_pods_per_node
68+
enable_shielded_nodes = var.enable_shielded_nodes
6869

6970
vertical_pod_autoscaling {
7071
enabled = var.enable_vertical_pod_autoscaling

autogen/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,4 +427,10 @@ variable "release_channel" {
427427
description = "(Beta) The release channel of this cluster. Accepted values are `UNSPECIFIED`, `RAPID`, `REGULAR` and `STABLE`. Defaults to `UNSPECIFIED`."
428428
default = null
429429
}
430+
431+
variable "enable_shielded_nodes" {
432+
type = bool
433+
description = "Enable Shielded Nodes features on all nodes in this cluster"
434+
default = false
435+
}
430436
{% endif %}

modules/beta-private-cluster-update-variant/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ In either case, upgrading to module version `v1.0.0` will trigger a recreation o
153153
| enable\_intranode\_visibility | Whether Intra-node visibility is enabled for this cluster. This makes same node pod to pod traffic visible for VPC network | bool | `"false"` | no |
154154
| enable\_private\_endpoint | (Beta) Whether the master's internal IP address is used as the cluster endpoint | bool | `"false"` | no |
155155
| enable\_private\_nodes | (Beta) Whether nodes have internal IP addresses only | bool | `"false"` | no |
156+
| enable\_shielded\_nodes | Enable Shielded Nodes features on all nodes in this cluster | bool | `"false"` | no |
156157
| enable\_vertical\_pod\_autoscaling | Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it | bool | `"false"` | no |
157158
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer role. | bool | `"false"` | no |
158159
| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | bool | `"true"` | no |

modules/beta-private-cluster-update-variant/cluster.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ resource "google_container_cluster" "primary" {
5858
enable_binary_authorization = var.enable_binary_authorization
5959
enable_intranode_visibility = var.enable_intranode_visibility
6060
default_max_pods_per_node = var.default_max_pods_per_node
61+
enable_shielded_nodes = var.enable_shielded_nodes
6162

6263
vertical_pod_autoscaling {
6364
enabled = var.enable_vertical_pod_autoscaling

modules/beta-private-cluster-update-variant/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,3 +422,9 @@ variable "release_channel" {
422422
description = "(Beta) The release channel of this cluster. Accepted values are `UNSPECIFIED`, `RAPID`, `REGULAR` and `STABLE`. Defaults to `UNSPECIFIED`."
423423
default = null
424424
}
425+
426+
variable "enable_shielded_nodes" {
427+
type = bool
428+
description = "Enable Shielded Nodes features on all nodes in this cluster"
429+
default = false
430+
}

modules/beta-private-cluster/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ In either case, upgrading to module version `v1.0.0` will trigger a recreation o
153153
| enable\_intranode\_visibility | Whether Intra-node visibility is enabled for this cluster. This makes same node pod to pod traffic visible for VPC network | bool | `"false"` | no |
154154
| enable\_private\_endpoint | (Beta) Whether the master's internal IP address is used as the cluster endpoint | bool | `"false"` | no |
155155
| enable\_private\_nodes | (Beta) Whether nodes have internal IP addresses only | bool | `"false"` | no |
156+
| enable\_shielded\_nodes | Enable Shielded Nodes features on all nodes in this cluster | bool | `"false"` | no |
156157
| enable\_vertical\_pod\_autoscaling | Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it | bool | `"false"` | no |
157158
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer role. | bool | `"false"` | no |
158159
| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | bool | `"true"` | no |

modules/beta-private-cluster/cluster.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ resource "google_container_cluster" "primary" {
5858
enable_binary_authorization = var.enable_binary_authorization
5959
enable_intranode_visibility = var.enable_intranode_visibility
6060
default_max_pods_per_node = var.default_max_pods_per_node
61+
enable_shielded_nodes = var.enable_shielded_nodes
6162

6263
vertical_pod_autoscaling {
6364
enabled = var.enable_vertical_pod_autoscaling

modules/beta-private-cluster/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,3 +422,9 @@ variable "release_channel" {
422422
description = "(Beta) The release channel of this cluster. Accepted values are `UNSPECIFIED`, `RAPID`, `REGULAR` and `STABLE`. Defaults to `UNSPECIFIED`."
423423
default = null
424424
}
425+
426+
variable "enable_shielded_nodes" {
427+
type = bool
428+
description = "Enable Shielded Nodes features on all nodes in this cluster"
429+
default = false
430+
}

modules/beta-public-cluster/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ In either case, upgrading to module version `v1.0.0` will trigger a recreation o
145145
| disable\_legacy\_metadata\_endpoints | Disable the /0.1/ and /v1beta1/ metadata server endpoints on the node. Changing this value will cause all node pools to be recreated. | bool | `"true"` | no |
146146
| enable\_binary\_authorization | Enable BinAuthZ Admission controller | string | `"false"` | no |
147147
| enable\_intranode\_visibility | Whether Intra-node visibility is enabled for this cluster. This makes same node pod to pod traffic visible for VPC network | bool | `"false"` | no |
148+
| enable\_shielded\_nodes | Enable Shielded Nodes features on all nodes in this cluster | bool | `"false"` | no |
148149
| enable\_vertical\_pod\_autoscaling | Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it | bool | `"false"` | no |
149150
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer role. | bool | `"false"` | no |
150151
| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | bool | `"true"` | no |

modules/beta-public-cluster/cluster.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ resource "google_container_cluster" "primary" {
5858
enable_binary_authorization = var.enable_binary_authorization
5959
enable_intranode_visibility = var.enable_intranode_visibility
6060
default_max_pods_per_node = var.default_max_pods_per_node
61+
enable_shielded_nodes = var.enable_shielded_nodes
6162

6263
vertical_pod_autoscaling {
6364
enabled = var.enable_vertical_pod_autoscaling

modules/beta-public-cluster/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,3 +398,9 @@ variable "release_channel" {
398398
description = "(Beta) The release channel of this cluster. Accepted values are `UNSPECIFIED`, `RAPID`, `REGULAR` and `STABLE`. Defaults to `UNSPECIFIED`."
399399
default = null
400400
}
401+
402+
variable "enable_shielded_nodes" {
403+
type = bool
404+
description = "Enable Shielded Nodes features on all nodes in this cluster"
405+
default = false
406+
}

0 commit comments

Comments
 (0)