Skip to content

Commit c675006

Browse files
feat: add secret manager add-on config
Co-authored-by: Jayanta Dutta <jayanta.dutta@billhop.com>
1 parent 654868e commit c675006

File tree

4 files changed

+20
-0
lines changed

4 files changed

+20
-0
lines changed

autogen/main/cluster.tf.tmpl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,13 @@ resource "google_container_cluster" "primary" {
221221
{% if beta_cluster %}
222222
enable_intranode_visibility = var.enable_intranode_visibility
223223

224+
dynamic "secret_manager_config" {
225+
for_each = var.enable_secret_manager_addon ? [var.enable_secret_manager_addon] : []
226+
content {
227+
enabled = secret_manager_config.value
228+
}
229+
}
230+
224231
dynamic "pod_security_policy_config" {
225232
for_each = var.enable_pod_security_policy ? [var.enable_pod_security_policy] : []
226233
content {

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_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
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_secret_manager_addon_enabled = local.cluster_output_secret_manager_addon_enabled
240242

241243
# /BETA features
242244
{% endif %}

autogen/main/outputs.tf.tmpl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,11 @@ output "identity_service_enabled" {
233233
description = "Whether Identity Service is enabled"
234234
value = local.cluster_pod_security_policy_enabled
235235
}
236+
237+
output "secret_manager_addon_enabled" {
238+
description = "Whether Secret Manager add-on is enabled"
239+
value = local.cluster_secret_manager_addon_enabled
240+
}
236241
{% endif %}
237242

238243
output "fleet_membership" {

autogen/main/variables.tf.tmpl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -855,6 +855,12 @@ variable "enable_pod_security_policy" {
855855
default = false
856856
}
857857

858+
variable "enable_secret_manager_addon" {
859+
description = "(Beta) Enable the Secret Manager add-on for this cluster"
860+
type = bool
861+
default = false
862+
}
863+
858864
variable "sandbox_enabled" {
859865
type = bool
860866
description = "(Beta) Enable GKE Sandbox (Do not forget to set `image_type` = `COS_CONTAINERD` to use it)."

0 commit comments

Comments
 (0)