Skip to content

Commit f3bcb5c

Browse files
committed
feat: promote config connector to ga
follows on from promoting it in the provider here: GoogleCloudPlatform/magic-modules#6976
1 parent 6253812 commit f3bcb5c

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

autogen/main/cluster.tf.tmpl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,11 @@ resource "google_container_cluster" "primary" {
267267
enabled = gke_backup_agent_config.value.enabled
268268
}
269269
}
270+
271+
config_connector_config {
272+
enabled = var.config_connector
273+
}
274+
270275
{% endif %}
271276
{% if beta_cluster and autopilot_cluster != true %}
272277

@@ -286,10 +291,6 @@ resource "google_container_cluster" "primary" {
286291
kalm_config {
287292
enabled = var.kalm_config
288293
}
289-
290-
config_connector_config {
291-
enabled = var.config_connector
292-
}
293294
{% endif %}
294295
}
295296

autogen/main/variables.tf.tmpl

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -614,9 +614,7 @@ variable "node_metadata" {
614614
error_message = "The node_metadata value must be one of GKE_METADATA, GCE_METADATA, UNSPECIFIED, GKE_METADATA_SERVER or EXPOSE."
615615
}
616616
}
617-
{% endif %}
618617

619-
{% if autopilot_cluster != true %}
620618
variable "cluster_dns_provider" {
621619
type = string
622620
description = "Which in-cluster DNS provider should be used. PROVIDER_UNSPECIFIED (default) or PLATFORM_DEFAULT or CLOUD_DNS."
@@ -647,6 +645,12 @@ variable "gke_backup_agent_config" {
647645
default = false
648646
}
649647

648+
variable "config_connector" {
649+
type = bool
650+
description = "Whether ConfigConnector is enabled for this cluster."
651+
default = false
652+
}
653+
650654
{% endif %}
651655
variable "timeouts" {
652656
type = map(string)
@@ -703,12 +707,6 @@ variable "kalm_config" {
703707
default = false
704708
}
705709

706-
variable "config_connector" {
707-
type = bool
708-
description = "(Beta) Whether ConfigConnector is enabled for this cluster."
709-
default = false
710-
}
711-
712710
variable "cloudrun" {
713711
description = "(Beta) Enable CloudRun addon"
714712
default = false

autogen/safer-cluster/variables.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ variable "firewall_inbound_ports" {
464464

465465
variable "config_connector" {
466466
type = bool
467-
description = "(Beta) Whether ConfigConnector is enabled for this cluster."
467+
description = "Whether ConfigConnector is enabled for this cluster."
468468
default = false
469469
}
470470

0 commit comments

Comments
 (0)