Skip to content

Commit 86d21b4

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

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
@@ -283,6 +283,11 @@ resource "google_container_cluster" "primary" {
283283
enabled = gke_backup_agent_config.value.enabled
284284
}
285285
}
286+
287+
config_connector_config {
288+
enabled = var.config_connector
289+
}
290+
286291
{% endif %}
287292
{% if beta_cluster and autopilot_cluster != true %}
288293

@@ -302,10 +307,6 @@ resource "google_container_cluster" "primary" {
302307
kalm_config {
303308
enabled = var.kalm_config
304309
}
305-
306-
config_connector_config {
307-
enabled = var.config_connector
308-
}
309310
{% endif %}
310311
}
311312
{% if autopilot_cluster != true %}

autogen/main/variables.tf.tmpl

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -623,9 +623,7 @@ variable "node_metadata" {
623623
error_message = "The node_metadata value must be one of GKE_METADATA, GCE_METADATA, UNSPECIFIED, GKE_METADATA_SERVER or EXPOSE."
624624
}
625625
}
626-
{% endif %}
627626

628-
{% if autopilot_cluster != true %}
629627
variable "cluster_dns_provider" {
630628
type = string
631629
description = "Which in-cluster DNS provider should be used. PROVIDER_UNSPECIFIED (default) or PLATFORM_DEFAULT or CLOUD_DNS."
@@ -656,6 +654,12 @@ variable "gke_backup_agent_config" {
656654
default = false
657655
}
658656

657+
variable "config_connector" {
658+
type = bool
659+
description = "Whether ConfigConnector is enabled for this cluster."
660+
default = false
661+
}
662+
659663
{% endif %}
660664
variable "timeouts" {
661665
type = map(string)
@@ -712,12 +716,6 @@ variable "kalm_config" {
712716
default = false
713717
}
714718

715-
variable "config_connector" {
716-
type = bool
717-
description = "(Beta) Whether ConfigConnector is enabled for this cluster."
718-
default = false
719-
}
720-
721719
variable "cloudrun" {
722720
description = "(Beta) Enable CloudRun addon"
723721
default = false

autogen/safer-cluster/variables.tf.tmpl

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

469469
variable "config_connector" {
470470
type = bool
471-
description = "(Beta) Whether ConfigConnector is enabled for this cluster."
471+
description = "Whether ConfigConnector is enabled for this cluster."
472472
default = false
473473
}
474474

0 commit comments

Comments
 (0)