Skip to content

Commit a6210fc

Browse files
legal90legal90
authored
fix: Fix the value of output "identity_service_enabled" in beta modules (#1982)
1 parent c48dc6e commit a6210fc

File tree

14 files changed

+21
-7
lines changed

14 files changed

+21
-7
lines changed

‎autogen/main/main.tf.tmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ locals {
168168
cluster_output_istio_disabled = google_container_cluster.primary.addons_config[0].istio_config != null && length(google_container_cluster.primary.addons_config[0].istio_config) == 1 ? google_container_cluster.primary.addons_config[0].istio_config[0].disabled : false
169169
cluster_output_pod_security_policy_enabled = google_container_cluster.primary.pod_security_policy_config != null && length(google_container_cluster.primary.pod_security_policy_config) == 1 ? google_container_cluster.primary.pod_security_policy_config[0].enabled : false
170170
cluster_output_intranode_visbility_enabled = google_container_cluster.primary.enable_intranode_visibility
171+
cluster_output_identity_service_enabled = google_container_cluster.primary.identity_service_config != null && length(google_container_cluster.primary.identity_service_config) == 1 ? google_container_cluster.primary.identity_service_config[0].enabled : false
171172

172173
# /BETA features
173174
{% endif %}
@@ -237,6 +238,7 @@ locals {
237238
{% endif %}
238239
cluster_pod_security_policy_enabled = local.cluster_output_pod_security_policy_enabled
239240
cluster_intranode_visibility_enabled = local.cluster_output_intranode_visbility_enabled
241+
cluster_identity_service_enabled = local.cluster_output_identity_service_enabled
240242

241243
# /BETA features
242244
{% endif %}

‎autogen/main/outputs.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ output "intranode_visibility_enabled" {
231231

232232
output "identity_service_enabled" {
233233
description = "Whether Identity Service is enabled"
234-
value = local.cluster_pod_security_policy_enabled
234+
value = local.cluster_identity_service_enabled
235235
}
236236
{% endif %}
237237

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ locals {
9292
cluster_output_istio_disabled = google_container_cluster.primary.addons_config[0].istio_config != null && length(google_container_cluster.primary.addons_config[0].istio_config) == 1 ? google_container_cluster.primary.addons_config[0].istio_config[0].disabled : false
9393
cluster_output_pod_security_policy_enabled = google_container_cluster.primary.pod_security_policy_config != null && length(google_container_cluster.primary.pod_security_policy_config) == 1 ? google_container_cluster.primary.pod_security_policy_config[0].enabled : false
9494
cluster_output_intranode_visbility_enabled = google_container_cluster.primary.enable_intranode_visibility
95+
cluster_output_identity_service_enabled = google_container_cluster.primary.identity_service_config != null && length(google_container_cluster.primary.identity_service_config) == 1 ? google_container_cluster.primary.identity_service_config[0].enabled : false
9596

9697
# /BETA features
9798

@@ -129,6 +130,7 @@ locals {
129130
cluster_istio_enabled = !local.cluster_output_istio_disabled
130131
cluster_pod_security_policy_enabled = local.cluster_output_pod_security_policy_enabled
131132
cluster_intranode_visibility_enabled = local.cluster_output_intranode_visbility_enabled
133+
cluster_identity_service_enabled = local.cluster_output_identity_service_enabled
132134

133135
# /BETA features
134136

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ output "intranode_visibility_enabled" {
186186

187187
output "identity_service_enabled" {
188188
description = "Whether Identity Service is enabled"
189-
value = local.cluster_pod_security_policy_enabled
189+
value = local.cluster_identity_service_enabled
190190
}
191191

192192
output "fleet_membership" {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ locals {
9191
cluster_output_istio_disabled = google_container_cluster.primary.addons_config[0].istio_config != null && length(google_container_cluster.primary.addons_config[0].istio_config) == 1 ? google_container_cluster.primary.addons_config[0].istio_config[0].disabled : false
9292
cluster_output_pod_security_policy_enabled = google_container_cluster.primary.pod_security_policy_config != null && length(google_container_cluster.primary.pod_security_policy_config) == 1 ? google_container_cluster.primary.pod_security_policy_config[0].enabled : false
9393
cluster_output_intranode_visbility_enabled = google_container_cluster.primary.enable_intranode_visibility
94+
cluster_output_identity_service_enabled = google_container_cluster.primary.identity_service_config != null && length(google_container_cluster.primary.identity_service_config) == 1 ? google_container_cluster.primary.identity_service_config[0].enabled : false
9495

9596
# /BETA features
9697

@@ -128,6 +129,7 @@ locals {
128129
cluster_istio_enabled = !local.cluster_output_istio_disabled
129130
cluster_pod_security_policy_enabled = local.cluster_output_pod_security_policy_enabled
130131
cluster_intranode_visibility_enabled = local.cluster_output_intranode_visbility_enabled
132+
cluster_identity_service_enabled = local.cluster_output_identity_service_enabled
131133

132134
# /BETA features
133135

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ output "intranode_visibility_enabled" {
176176

177177
output "identity_service_enabled" {
178178
description = "Whether Identity Service is enabled"
179-
value = local.cluster_pod_security_policy_enabled
179+
value = local.cluster_identity_service_enabled
180180
}
181181

182182
output "fleet_membership" {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ locals {
140140
cluster_output_istio_disabled = google_container_cluster.primary.addons_config[0].istio_config != null && length(google_container_cluster.primary.addons_config[0].istio_config) == 1 ? google_container_cluster.primary.addons_config[0].istio_config[0].disabled : false
141141
cluster_output_pod_security_policy_enabled = google_container_cluster.primary.pod_security_policy_config != null && length(google_container_cluster.primary.pod_security_policy_config) == 1 ? google_container_cluster.primary.pod_security_policy_config[0].enabled : false
142142
cluster_output_intranode_visbility_enabled = google_container_cluster.primary.enable_intranode_visibility
143+
cluster_output_identity_service_enabled = google_container_cluster.primary.identity_service_config != null && length(google_container_cluster.primary.identity_service_config) == 1 ? google_container_cluster.primary.identity_service_config[0].enabled : false
143144

144145
# /BETA features
145146

@@ -194,6 +195,7 @@ locals {
194195
cluster_telemetry_type_is_set = var.cluster_telemetry_type != null
195196
cluster_pod_security_policy_enabled = local.cluster_output_pod_security_policy_enabled
196197
cluster_intranode_visibility_enabled = local.cluster_output_intranode_visbility_enabled
198+
cluster_identity_service_enabled = local.cluster_output_identity_service_enabled
197199

198200
# /BETA features
199201

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ output "intranode_visibility_enabled" {
212212

213213
output "identity_service_enabled" {
214214
description = "Whether Identity Service is enabled"
215-
value = local.cluster_pod_security_policy_enabled
215+
value = local.cluster_identity_service_enabled
216216
}
217217

218218
output "fleet_membership" {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ locals {
140140
cluster_output_istio_disabled = google_container_cluster.primary.addons_config[0].istio_config != null && length(google_container_cluster.primary.addons_config[0].istio_config) == 1 ? google_container_cluster.primary.addons_config[0].istio_config[0].disabled : false
141141
cluster_output_pod_security_policy_enabled = google_container_cluster.primary.pod_security_policy_config != null && length(google_container_cluster.primary.pod_security_policy_config) == 1 ? google_container_cluster.primary.pod_security_policy_config[0].enabled : false
142142
cluster_output_intranode_visbility_enabled = google_container_cluster.primary.enable_intranode_visibility
143+
cluster_output_identity_service_enabled = google_container_cluster.primary.identity_service_config != null && length(google_container_cluster.primary.identity_service_config) == 1 ? google_container_cluster.primary.identity_service_config[0].enabled : false
143144

144145
# /BETA features
145146

@@ -194,6 +195,7 @@ locals {
194195
cluster_telemetry_type_is_set = var.cluster_telemetry_type != null
195196
cluster_pod_security_policy_enabled = local.cluster_output_pod_security_policy_enabled
196197
cluster_intranode_visibility_enabled = local.cluster_output_intranode_visbility_enabled
198+
cluster_identity_service_enabled = local.cluster_output_identity_service_enabled
197199

198200
# /BETA features
199201

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ output "intranode_visibility_enabled" {
212212

213213
output "identity_service_enabled" {
214214
description = "Whether Identity Service is enabled"
215-
value = local.cluster_pod_security_policy_enabled
215+
value = local.cluster_identity_service_enabled
216216
}
217217

218218
output "fleet_membership" {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ locals {
139139
cluster_output_istio_disabled = google_container_cluster.primary.addons_config[0].istio_config != null && length(google_container_cluster.primary.addons_config[0].istio_config) == 1 ? google_container_cluster.primary.addons_config[0].istio_config[0].disabled : false
140140
cluster_output_pod_security_policy_enabled = google_container_cluster.primary.pod_security_policy_config != null && length(google_container_cluster.primary.pod_security_policy_config) == 1 ? google_container_cluster.primary.pod_security_policy_config[0].enabled : false
141141
cluster_output_intranode_visbility_enabled = google_container_cluster.primary.enable_intranode_visibility
142+
cluster_output_identity_service_enabled = google_container_cluster.primary.identity_service_config != null && length(google_container_cluster.primary.identity_service_config) == 1 ? google_container_cluster.primary.identity_service_config[0].enabled : false
142143

143144
# /BETA features
144145

@@ -193,6 +194,7 @@ locals {
193194
cluster_telemetry_type_is_set = var.cluster_telemetry_type != null
194195
cluster_pod_security_policy_enabled = local.cluster_output_pod_security_policy_enabled
195196
cluster_intranode_visibility_enabled = local.cluster_output_intranode_visbility_enabled
197+
cluster_identity_service_enabled = local.cluster_output_identity_service_enabled
196198

197199
# /BETA features
198200

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ output "intranode_visibility_enabled" {
202202

203203
output "identity_service_enabled" {
204204
description = "Whether Identity Service is enabled"
205-
value = local.cluster_pod_security_policy_enabled
205+
value = local.cluster_identity_service_enabled
206206
}
207207

208208
output "fleet_membership" {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ locals {
139139
cluster_output_istio_disabled = google_container_cluster.primary.addons_config[0].istio_config != null && length(google_container_cluster.primary.addons_config[0].istio_config) == 1 ? google_container_cluster.primary.addons_config[0].istio_config[0].disabled : false
140140
cluster_output_pod_security_policy_enabled = google_container_cluster.primary.pod_security_policy_config != null && length(google_container_cluster.primary.pod_security_policy_config) == 1 ? google_container_cluster.primary.pod_security_policy_config[0].enabled : false
141141
cluster_output_intranode_visbility_enabled = google_container_cluster.primary.enable_intranode_visibility
142+
cluster_output_identity_service_enabled = google_container_cluster.primary.identity_service_config != null && length(google_container_cluster.primary.identity_service_config) == 1 ? google_container_cluster.primary.identity_service_config[0].enabled : false
142143

143144
# /BETA features
144145

@@ -193,6 +194,7 @@ locals {
193194
cluster_telemetry_type_is_set = var.cluster_telemetry_type != null
194195
cluster_pod_security_policy_enabled = local.cluster_output_pod_security_policy_enabled
195196
cluster_intranode_visibility_enabled = local.cluster_output_intranode_visbility_enabled
197+
cluster_identity_service_enabled = local.cluster_output_identity_service_enabled
196198

197199
# /BETA features
198200

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ output "intranode_visibility_enabled" {
202202

203203
output "identity_service_enabled" {
204204
description = "Whether Identity Service is enabled"
205-
value = local.cluster_pod_security_policy_enabled
205+
value = local.cluster_identity_service_enabled
206206
}
207207

208208
output "fleet_membership" {

0 commit comments

Comments
 (0)