Skip to content

Commit bd3a4e6

Browse files
Dutta78Dutta78
committed
fix: replace dynamic secret_manager_config block with static block
1 parent 1b69e34 commit bd3a4e6

File tree

25 files changed

+133
-72
lines changed

25 files changed

+133
-72
lines changed

‎autogen/main/cluster.tf.tmpl

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -274,11 +274,8 @@ resource "google_container_cluster" "primary" {
274274
}
275275
}
276276

277-
dynamic "secret_manager_config" {
278-
for_each = var.enable_secret_manager_addon ? [var.enable_secret_manager_addon] : []
279-
content {
280-
enabled = secret_manager_config.value
281-
}
277+
secret_manager_config {
278+
enabled = var.enable_secret_manager_addon
282279
}
283280

284281
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: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,11 +213,8 @@ resource "google_container_cluster" "primary" {
213213
}
214214
}
215215

216-
dynamic "secret_manager_config" {
217-
for_each = var.enable_secret_manager_addon ? [var.enable_secret_manager_addon] : []
218-
content {
219-
enabled = secret_manager_config.value
220-
}
216+
secret_manager_config {
217+
enabled = var.enable_secret_manager_addon
221218
}
222219

223220
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: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,8 @@ resource "google_container_cluster" "primary" {
133133
}
134134
}
135135

136-
dynamic "secret_manager_config" {
137-
for_each = var.enable_secret_manager_addon ? [var.enable_secret_manager_addon] : []
138-
content {
139-
enabled = secret_manager_config.value
140-
}
136+
secret_manager_config {
137+
enabled = var.enable_secret_manager_addon
141138
}
142139

143140
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: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,8 @@ resource "google_container_cluster" "primary" {
133133
}
134134
}
135135

136-
dynamic "secret_manager_config" {
137-
for_each = var.enable_secret_manager_addon ? [var.enable_secret_manager_addon] : []
138-
content {
139-
enabled = secret_manager_config.value
140-
}
136+
secret_manager_config {
137+
enabled = var.enable_secret_manager_addon
141138
}
142139

143140
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: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,8 @@ resource "google_container_cluster" "primary" {
226226
}
227227
}
228228

229-
dynamic "secret_manager_config" {
230-
for_each = var.enable_secret_manager_addon ? [var.enable_secret_manager_addon] : []
231-
content {
232-
enabled = secret_manager_config.value
233-
}
229+
secret_manager_config {
230+
enabled = var.enable_secret_manager_addon
234231
}
235232

236233
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)