Skip to content

Commit 2dc2031

Browse files
committed
Promote backup agent config to ga
1 parent bcd5e03 commit 2dc2031

File tree

6 files changed

+19
-3
lines changed

6 files changed

+19
-3
lines changed

modules/beta-private-cluster/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ variable "config_connector" {
667667

668668
variable "gke_backup_agent_config" {
669669
type = bool
670-
description = "(Beta) Whether Backup for GKE agent is enabled for this cluster."
670+
description = "Whether Backup for GKE agent is enabled for this cluster."
671671
default = false
672672
}
673673

modules/beta-private-cluster/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ terraform {
2121
required_providers {
2222
google-beta = {
2323
source = "hashicorp/google-beta"
24-
version = ">= 4.45.0, < 5.0"
24+
version = ">= 4.47.0, < 5.0"
2525
}
2626
kubernetes = {
2727
source = "hashicorp/kubernetes"

modules/private-cluster/cluster.tf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,14 @@ resource "google_container_cluster" "primary" {
150150
enabled = gce_persistent_disk_csi_driver_config.value.enabled
151151
}
152152
}
153+
154+
dynamic "gke_backup_agent_config" {
155+
for_each = local.gke_backup_agent_config
156+
157+
content {
158+
enabled = gke_backup_agent_config.value.enabled
159+
}
160+
}
153161
}
154162

155163
datapath_provider = var.datapath_provider

modules/private-cluster/main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ locals {
8484
}]
8585
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
8686

87+
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
88+
8789
cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{
8890
security_group = var.authenticator_security_group
8991
}]

modules/private-cluster/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -588,3 +588,9 @@ variable "timeouts" {
588588
error_message = "Only create, update, delete timeouts can be specified."
589589
}
590590
}
591+
592+
variable "gke_backup_agent_config" {
593+
type = bool
594+
description = "Whether Backup for GKE agent is enabled for this cluster."
595+
default = false
596+
}

modules/private-cluster/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ terraform {
2121
required_providers {
2222
google = {
2323
source = "hashicorp/google"
24-
version = ">= 4.45.0, < 5.0"
24+
version = ">= 4.47.0, < 5.0"
2525
}
2626
kubernetes = {
2727
source = "hashicorp/kubernetes"

0 commit comments

Comments
 (0)