Skip to content

Commit 9c2191e

Browse files
wyardleywyardley
authored
fix: allow changing enable_identity_service value in place (#2132)
1 parent 0094924 commit 9c2191e

File tree

23 files changed

+23
-23
lines changed

23 files changed

+23
-23
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ Then perform the following commands on the root folder:
166166
| enable\_confidential\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |
167167
| enable\_cost\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |
168168
| enable\_default\_node\_pools\_metadata | Whether to enable the default node pools metadata key-value pairs such as `cluster_name` and `node_pool` | `bool` | `true` | no |
169-
| enable\_identity\_service | Enable the Identity Service component, which allows customers to use external identity providers with the K8S API. | `bool` | `false` | no |
169+
| enable\_identity\_service | (Optional) Enable the Identity Service component, which allows customers to use external identity providers with the K8S API. | `bool` | `false` | no |
170170
| 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 |
171171
| enable\_kubernetes\_alpha | Whether to enable Kubernetes Alpha features for this cluster. Note that when this option is enabled, the cluster cannot be upgraded and will be automatically deleted after 30 days. | `bool` | `false` | no |
172172
| enable\_l4\_ilb\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |

‎autogen/main/cluster.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ resource "google_container_cluster" "primary" {
219219
{% if autopilot_cluster != true %}
220220

221221
dynamic "identity_service_config" {
222-
for_each = var.enable_identity_service ? [var.enable_identity_service] : []
222+
for_each = var.enable_identity_service !=null ? [var.enable_identity_service] : []
223223
content {
224224
enabled = identity_service_config.value
225225
}

‎autogen/main/variables.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ variable "enable_gcfs" {
960960
{% if autopilot_cluster != true %}
961961
variable "enable_identity_service" {
962962
type = bool
963-
description = "Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
963+
description = "(Optional) Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
964964
default = false
965965
}
966966
{% endif %}

‎cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ resource "google_container_cluster" "primary" {
174174
}
175175

176176
dynamic "identity_service_config" {
177-
for_each = var.enable_identity_service ? [var.enable_identity_service] : []
177+
for_each = var.enable_identity_service != null ? [var.enable_identity_service] : []
178178
content {
179179
enabled = identity_service_config.value
180180
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ Then perform the following commands on the root folder:
204204
| enable\_default\_node\_pools\_metadata | Whether to enable the default node pools metadata key-value pairs such as `cluster_name` and `node_pool` | `bool` | `true` | no |
205205
| enable\_fqdn\_network\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |
206206
| enable\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `false` | no |
207-
| enable\_identity\_service | Enable the Identity Service component, which allows customers to use external identity providers with the K8S API. | `bool` | `false` | no |
207+
| enable\_identity\_service | (Optional) Enable the Identity Service component, which allows customers to use external identity providers with the K8S API. | `bool` | `false` | no |
208208
| 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 |
209209
| enable\_kubernetes\_alpha | Whether to enable Kubernetes Alpha features for this cluster. Note that when this option is enabled, the cluster cannot be upgraded and will be automatically deleted after 30 days. | `bool` | `false` | no |
210210
| enable\_l4\_ilb\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ resource "google_container_cluster" "primary" {
181181
}
182182

183183
dynamic "identity_service_config" {
184-
for_each = var.enable_identity_service ? [var.enable_identity_service] : []
184+
for_each = var.enable_identity_service != null ? [var.enable_identity_service] : []
185185
content {
186186
enabled = identity_service_config.value
187187
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ variable "enable_gcfs" {
910910

911911
variable "enable_identity_service" {
912912
type = bool
913-
description = "Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
913+
description = "(Optional) Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
914914
default = false
915915
}
916916

‎modules/beta-private-cluster/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ Then perform the following commands on the root folder:
182182
| enable\_default\_node\_pools\_metadata | Whether to enable the default node pools metadata key-value pairs such as `cluster_name` and `node_pool` | `bool` | `true` | no |
183183
| enable\_fqdn\_network\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |
184184
| enable\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `false` | no |
185-
| enable\_identity\_service | Enable the Identity Service component, which allows customers to use external identity providers with the K8S API. | `bool` | `false` | no |
185+
| enable\_identity\_service | (Optional) Enable the Identity Service component, which allows customers to use external identity providers with the K8S API. | `bool` | `false` | no |
186186
| 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 |
187187
| enable\_kubernetes\_alpha | Whether to enable Kubernetes Alpha features for this cluster. Note that when this option is enabled, the cluster cannot be upgraded and will be automatically deleted after 30 days. | `bool` | `false` | no |
188188
| enable\_l4\_ilb\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ resource "google_container_cluster" "primary" {
181181
}
182182

183183
dynamic "identity_service_config" {
184-
for_each = var.enable_identity_service ? [var.enable_identity_service] : []
184+
for_each = var.enable_identity_service != null ? [var.enable_identity_service] : []
185185
content {
186186
enabled = identity_service_config.value
187187
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ variable "enable_gcfs" {
910910

911911
variable "enable_identity_service" {
912912
type = bool
913-
description = "Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
913+
description = "(Optional) Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
914914
default = false
915915
}
916916

‎modules/beta-public-cluster-update-variant/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ Then perform the following commands on the root folder:
197197
| enable\_default\_node\_pools\_metadata | Whether to enable the default node pools metadata key-value pairs such as `cluster_name` and `node_pool` | `bool` | `true` | no |
198198
| enable\_fqdn\_network\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |
199199
| enable\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `false` | no |
200-
| enable\_identity\_service | Enable the Identity Service component, which allows customers to use external identity providers with the K8S API. | `bool` | `false` | no |
200+
| enable\_identity\_service | (Optional) Enable the Identity Service component, which allows customers to use external identity providers with the K8S API. | `bool` | `false` | no |
201201
| 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 |
202202
| enable\_kubernetes\_alpha | Whether to enable Kubernetes Alpha features for this cluster. Note that when this option is enabled, the cluster cannot be upgraded and will be automatically deleted after 30 days. | `bool` | `false` | no |
203203
| enable\_l4\_ilb\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |

‎modules/beta-public-cluster-update-variant/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ resource "google_container_cluster" "primary" {
181181
}
182182

183183
dynamic "identity_service_config" {
184-
for_each = var.enable_identity_service ? [var.enable_identity_service] : []
184+
for_each = var.enable_identity_service != null ? [var.enable_identity_service] : []
185185
content {
186186
enabled = identity_service_config.value
187187
}

‎modules/beta-public-cluster-update-variant/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ variable "enable_gcfs" {
874874

875875
variable "enable_identity_service" {
876876
type = bool
877-
description = "Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
877+
description = "(Optional) Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
878878
default = false
879879
}
880880

‎modules/beta-public-cluster/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ Then perform the following commands on the root folder:
175175
| enable\_default\_node\_pools\_metadata | Whether to enable the default node pools metadata key-value pairs such as `cluster_name` and `node_pool` | `bool` | `true` | no |
176176
| enable\_fqdn\_network\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |
177177
| enable\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `false` | no |
178-
| enable\_identity\_service | Enable the Identity Service component, which allows customers to use external identity providers with the K8S API. | `bool` | `false` | no |
178+
| enable\_identity\_service | (Optional) Enable the Identity Service component, which allows customers to use external identity providers with the K8S API. | `bool` | `false` | no |
179179
| 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 |
180180
| enable\_kubernetes\_alpha | Whether to enable Kubernetes Alpha features for this cluster. Note that when this option is enabled, the cluster cannot be upgraded and will be automatically deleted after 30 days. | `bool` | `false` | no |
181181
| enable\_l4\_ilb\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |

‎modules/beta-public-cluster/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ resource "google_container_cluster" "primary" {
181181
}
182182

183183
dynamic "identity_service_config" {
184-
for_each = var.enable_identity_service ? [var.enable_identity_service] : []
184+
for_each = var.enable_identity_service != null ? [var.enable_identity_service] : []
185185
content {
186186
enabled = identity_service_config.value
187187
}

‎modules/beta-public-cluster/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ variable "enable_gcfs" {
874874

875875
variable "enable_identity_service" {
876876
type = bool
877-
description = "Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
877+
description = "(Optional) Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
878878
default = false
879879
}
880880

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ Then perform the following commands on the root folder:
195195
| enable\_confidential\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |
196196
| enable\_cost\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |
197197
| enable\_default\_node\_pools\_metadata | Whether to enable the default node pools metadata key-value pairs such as `cluster_name` and `node_pool` | `bool` | `true` | no |
198-
| enable\_identity\_service | Enable the Identity Service component, which allows customers to use external identity providers with the K8S API. | `bool` | `false` | no |
198+
| enable\_identity\_service | (Optional) Enable the Identity Service component, which allows customers to use external identity providers with the K8S API. | `bool` | `false` | no |
199199
| 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 |
200200
| enable\_kubernetes\_alpha | Whether to enable Kubernetes Alpha features for this cluster. Note that when this option is enabled, the cluster cannot be upgraded and will be automatically deleted after 30 days. | `bool` | `false` | no |
201201
| enable\_l4\_ilb\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ resource "google_container_cluster" "primary" {
174174
}
175175

176176
dynamic "identity_service_config" {
177-
for_each = var.enable_identity_service ? [var.enable_identity_service] : []
177+
for_each = var.enable_identity_service != null ? [var.enable_identity_service] : []
178178
content {
179179
enabled = identity_service_config.value
180180
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@ variable "enable_l4_ilb_subsetting" {
827827

828828
variable "enable_identity_service" {
829829
type = bool
830-
description = "Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
830+
description = "(Optional) Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
831831
default = false
832832
}
833833

‎modules/private-cluster/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ Then perform the following commands on the root folder:
173173
| enable\_confidential\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |
174174
| enable\_cost\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |
175175
| enable\_default\_node\_pools\_metadata | Whether to enable the default node pools metadata key-value pairs such as `cluster_name` and `node_pool` | `bool` | `true` | no |
176-
| enable\_identity\_service | Enable the Identity Service component, which allows customers to use external identity providers with the K8S API. | `bool` | `false` | no |
176+
| enable\_identity\_service | (Optional) Enable the Identity Service component, which allows customers to use external identity providers with the K8S API. | `bool` | `false` | no |
177177
| 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 |
178178
| enable\_kubernetes\_alpha | Whether to enable Kubernetes Alpha features for this cluster. Note that when this option is enabled, the cluster cannot be upgraded and will be automatically deleted after 30 days. | `bool` | `false` | no |
179179
| enable\_l4\_ilb\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |

‎modules/private-cluster/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ resource "google_container_cluster" "primary" {
174174
}
175175

176176
dynamic "identity_service_config" {
177-
for_each = var.enable_identity_service ? [var.enable_identity_service] : []
177+
for_each = var.enable_identity_service != null ? [var.enable_identity_service] : []
178178
content {
179179
enabled = identity_service_config.value
180180
}

‎modules/private-cluster/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@ variable "enable_l4_ilb_subsetting" {
827827

828828
variable "enable_identity_service" {
829829
type = bool
830-
description = "Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
830+
description = "(Optional) Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
831831
default = false
832832
}
833833

‎variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ variable "enable_l4_ilb_subsetting" {
791791

792792
variable "enable_identity_service" {
793793
type = bool
794-
description = "Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
794+
description = "(Optional) Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
795795
default = false
796796
}
797797

0 commit comments

Comments
 (0)