Skip to content

Commit c9b8f6b

Browse files
Dutta78Dutta78
committed
fix: replace dynamic secret_manager_config block with static block
1 parent 72eccd1 commit c9b8f6b

File tree

24 files changed

+41
-73
lines changed

24 files changed

+41
-73
lines changed

‎autogen/main/cluster.tf.tmpl‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -298,11 +298,8 @@ resource "google_container_cluster" "primary" {
298298
}
299299
}
300300

301-
dynamic "secret_manager_config" {
302-
for_each = var.enable_secret_manager_addon ? [var.enable_secret_manager_addon] : []
303-
content {
304-
enabled = secret_manager_config.value
305-
}
301+
secret_manager_config {
302+
enabled = var.enable_secret_manager_addon
306303
}
307304

308305
dynamic "pod_autoscaling" {

‎autogen/main/main.tf.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ locals {
172172
cluster_output_vertical_pod_autoscaling_enabled = google_container_cluster.primary.vertical_pod_autoscaling != null && length(google_container_cluster.primary.vertical_pod_autoscaling) == 1 ? google_container_cluster.primary.vertical_pod_autoscaling[0].enabled : false
173173
cluster_output_intranode_visbility_enabled = google_container_cluster.primary.enable_intranode_visibility
174174
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
175-
cluster_output_secret_manager_addon_enabled = google_container_cluster.primary.secret_manager_config != null && length(google_container_cluster.primary.secret_manager_config) == 1 ? google_container_cluster.primary.secret_manager_config[0].enabled : false
175+
cluster_output_secret_manager_addon_enabled = google_container_cluster.primary.secret_manager_config[0].enabled
176176

177177
{% if beta_cluster %}
178178
# BETA features

‎cluster.tf‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@ resource "google_container_cluster" "primary" {
227227
total_egress_bandwidth_tier = var.total_egress_bandwidth_tier
228228
}
229229
}
230-
231230
dynamic "rbac_binding_config" {
232231
for_each = var.rbac_binding_config.enable_insecure_binding_system_unauthenticated != null || var.rbac_binding_config.enable_insecure_binding_system_authenticated != null ? [var.rbac_binding_config] : []
233232
content {
@@ -236,11 +235,9 @@ resource "google_container_cluster" "primary" {
236235
}
237236
}
238237

239-
dynamic "secret_manager_config" {
240-
for_each = var.enable_secret_manager_addon ? [var.enable_secret_manager_addon] : []
241-
content {
242-
enabled = secret_manager_config.value
243-
}
238+
239+
secret_manager_config {
240+
enabled = var.enable_secret_manager_addon
244241
}
245242

246243
dynamic "pod_autoscaling" {

‎main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ locals {
124124
cluster_output_vertical_pod_autoscaling_enabled = google_container_cluster.primary.vertical_pod_autoscaling != null && length(google_container_cluster.primary.vertical_pod_autoscaling) == 1 ? google_container_cluster.primary.vertical_pod_autoscaling[0].enabled : false
125125
cluster_output_intranode_visbility_enabled = google_container_cluster.primary.enable_intranode_visibility
126126
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
127-
cluster_output_secret_manager_addon_enabled = google_container_cluster.primary.secret_manager_config != null && length(google_container_cluster.primary.secret_manager_config) == 1 ? google_container_cluster.primary.secret_manager_config[0].enabled : false
127+
cluster_output_secret_manager_addon_enabled = google_container_cluster.primary.secret_manager_config[0].enabled
128128

129129
cluster_output_node_pools_names = concat(
130130
[for np in google_container_node_pool.pools : np.name], [""],

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,9 @@ resource "google_container_cluster" "primary" {
156156
}
157157
}
158158

159-
dynamic "secret_manager_config" {
160-
for_each = var.enable_secret_manager_addon ? [var.enable_secret_manager_addon] : []
161-
content {
162-
enabled = secret_manager_config.value
163-
}
159+
160+
secret_manager_config {
161+
enabled = var.enable_secret_manager_addon
164162
}
165163

166164
dynamic "pod_autoscaling" {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ locals {
9696
cluster_output_vertical_pod_autoscaling_enabled = google_container_cluster.primary.vertical_pod_autoscaling != null && length(google_container_cluster.primary.vertical_pod_autoscaling) == 1 ? google_container_cluster.primary.vertical_pod_autoscaling[0].enabled : false
9797
cluster_output_intranode_visbility_enabled = google_container_cluster.primary.enable_intranode_visibility
9898
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
99-
cluster_output_secret_manager_addon_enabled = google_container_cluster.primary.secret_manager_config != null && length(google_container_cluster.primary.secret_manager_config) == 1 ? google_container_cluster.primary.secret_manager_config[0].enabled : false
99+
cluster_output_secret_manager_addon_enabled = google_container_cluster.primary.secret_manager_config[0].enabled
100100

101101
# BETA features
102102
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

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,9 @@ resource "google_container_cluster" "primary" {
156156
}
157157
}
158158

159-
dynamic "secret_manager_config" {
160-
for_each = var.enable_secret_manager_addon ? [var.enable_secret_manager_addon] : []
161-
content {
162-
enabled = secret_manager_config.value
163-
}
159+
160+
secret_manager_config {
161+
enabled = var.enable_secret_manager_addon
164162
}
165163

166164
dynamic "pod_autoscaling" {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ locals {
8989
cluster_output_vertical_pod_autoscaling_enabled = google_container_cluster.primary.vertical_pod_autoscaling != null && length(google_container_cluster.primary.vertical_pod_autoscaling) == 1 ? google_container_cluster.primary.vertical_pod_autoscaling[0].enabled : false
9090
cluster_output_intranode_visbility_enabled = google_container_cluster.primary.enable_intranode_visibility
9191
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
92-
cluster_output_secret_manager_addon_enabled = google_container_cluster.primary.secret_manager_config != null && length(google_container_cluster.primary.secret_manager_config) == 1 ? google_container_cluster.primary.secret_manager_config[0].enabled : false
92+
cluster_output_secret_manager_addon_enabled = google_container_cluster.primary.secret_manager_config[0].enabled
9393

9494
# BETA features
9595
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

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,9 @@ resource "google_container_cluster" "primary" {
249249
}
250250
}
251251

252-
dynamic "secret_manager_config" {
253-
for_each = var.enable_secret_manager_addon ? [var.enable_secret_manager_addon] : []
254-
content {
255-
enabled = secret_manager_config.value
256-
}
252+
253+
secret_manager_config {
254+
enabled = var.enable_secret_manager_addon
257255
}
258256

259257
dynamic "pod_autoscaling" {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ locals {
143143
cluster_output_vertical_pod_autoscaling_enabled = google_container_cluster.primary.vertical_pod_autoscaling != null && length(google_container_cluster.primary.vertical_pod_autoscaling) == 1 ? google_container_cluster.primary.vertical_pod_autoscaling[0].enabled : false
144144
cluster_output_intranode_visbility_enabled = google_container_cluster.primary.enable_intranode_visibility
145145
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
146-
cluster_output_secret_manager_addon_enabled = google_container_cluster.primary.secret_manager_config != null && length(google_container_cluster.primary.secret_manager_config) == 1 ? google_container_cluster.primary.secret_manager_config[0].enabled : false
146+
cluster_output_secret_manager_addon_enabled = google_container_cluster.primary.secret_manager_config[0].enabled
147147

148148
# BETA features
149149
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

0 commit comments

Comments
 (0)