Skip to content

Commit ae63848

Browse files
Tolseeericyzapeabodybharathkkbg-awmalik
authored
feat: promote config_connector_config to ga (terraform-google-modules#1559)
Co-authored-by: Eric Zhao <zhaoe@google.com> Co-authored-by: Andrew Peabody <andrewpeabody@google.com> Co-authored-by: Bharath KKB <bharathkrishnakb@gmail.com> Co-authored-by: Awais Malik <malik.awais@gmail.com>
1 parent 3ccb19a commit ae63848

File tree

31 files changed

+95
-59
lines changed

31 files changed

+95
-59
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ Then perform the following commands on the root folder:
141141
| cluster\_dns\_scope | The scope of access to cluster DNS records. DNS\_SCOPE\_UNSPECIFIED (default) or CLUSTER\_SCOPE or VPC\_SCOPE. | `string` | `"DNS_SCOPE_UNSPECIFIED"` | no |
142142
| cluster\_ipv4\_cidr | The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR. | `string` | `null` | no |
143143
| cluster\_resource\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | `map(string)` | `{}` | no |
144+
| config\_connector | Whether ConfigConnector is enabled for this cluster. | `bool` | `false` | no |
144145
| configure\_ip\_masq | Enables the installation of ip masquerading, which is usually no longer required when using aliasied IP addresses. IP masquerading uses a kubectl call, so when you have a private cluster, you will need access to the API server. | `bool` | `false` | no |
145146
| create\_service\_account | Defines if service account specified to run nodes should be created. | `bool` | `true` | no |
146147
| database\_encryption | Application-layer Secrets Encryption settings. The object format is {state = string, key\_name = string}. Valid values of state are: "ENCRYPTED"; "DECRYPTED". key\_name is the name of a CloudKMS key. | `list(object({ state = string, key_name = string }))` | <pre>[<br> {<br> "key_name": "",<br> "state": "DECRYPTED"<br> }<br>]</pre> | no |

‎autogen/main/cluster.tf.tmpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,10 @@ resource "google_container_cluster" "primary" {
286286
enabled = gke_backup_agent_config.value.enabled
287287
}
288288
}
289+
290+
config_connector_config {
291+
enabled = var.config_connector
292+
}
289293
{% endif %}
290294
{% if beta_cluster and autopilot_cluster != true %}
291295

@@ -305,10 +309,6 @@ resource "google_container_cluster" "primary" {
305309
kalm_config {
306310
enabled = var.kalm_config
307311
}
308-
309-
config_connector_config {
310-
enabled = var.config_connector
311-
}
312312
{% endif %}
313313
}
314314
{% if autopilot_cluster != true %}

‎autogen/main/variables.tf.tmpl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,12 @@ variable "enable_kubernetes_alpha" {
711711
description = "Whether to enable Kubernetes Alpha features for this cluster. Note that when this option is enabled, the cluster cannot be upgraded and will be automatically deleted after 30 days."
712712
default = false
713713
}
714+
715+
variable "config_connector" {
716+
type = bool
717+
description = "Whether ConfigConnector is enabled for this cluster."
718+
default = false
719+
}
714720
{% endif %}
715721
{% if beta_cluster %}
716722
{% if autopilot_cluster != true %}
@@ -733,12 +739,6 @@ variable "kalm_config" {
733739
default = false
734740
}
735741

736-
variable "config_connector" {
737-
type = bool
738-
description = "(Beta) Whether ConfigConnector is enabled for this cluster."
739-
default = false
740-
}
741-
742742
variable "cloudrun" {
743743
description = "(Beta) Enable CloudRun addon"
744744
type = bool

‎autogen/safer-cluster/variables.tf.tmpl‎

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

454454
variable "config_connector" {
455455
type = bool
456-
description = "(Beta) Whether ConfigConnector is enabled for this cluster."
456+
description = "Whether ConfigConnector is enabled for this cluster."
457457
default = false
458458
}
459459

‎cluster.tf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,10 @@ resource "google_container_cluster" "primary" {
201201
enabled = gke_backup_agent_config.value.enabled
202202
}
203203
}
204+
205+
config_connector_config {
206+
enabled = var.config_connector
207+
}
204208
}
205209

206210
datapath_provider = var.datapath_provider

‎modules/beta-private-cluster-update-variant/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Then perform the following commands on the root folder:
176176
| cluster\_ipv4\_cidr | The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR. | `string` | `null` | no |
177177
| cluster\_resource\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | `map(string)` | `{}` | no |
178178
| cluster\_telemetry\_type | Available options include ENABLED, DISABLED, and SYSTEM\_ONLY | `string` | `null` | no |
179-
| config\_connector | (Beta) Whether ConfigConnector is enabled for this cluster. | `bool` | `false` | no |
179+
| config\_connector | Whether ConfigConnector is enabled for this cluster. | `bool` | `false` | no |
180180
| configure\_ip\_masq | Enables the installation of ip masquerading, which is usually no longer required when using aliasied IP addresses. IP masquerading uses a kubectl call, so when you have a private cluster, you will need access to the API server. | `bool` | `false` | no |
181181
| create\_service\_account | Defines if service account specified to run nodes should be created. | `bool` | `true` | no |
182182
| database\_encryption | Application-layer Secrets Encryption settings. The object format is {state = string, key\_name = string}. Valid values of state are: "ENCRYPTED"; "DECRYPTED". key\_name is the name of a CloudKMS key. | `list(object({ state = string, key_name = string }))` | <pre>[<br> {<br> "key_name": "",<br> "state": "DECRYPTED"<br> }<br>]</pre> | no |

‎modules/beta-private-cluster-update-variant/cluster.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,10 @@ resource "google_container_cluster" "primary" {
234234
}
235235
}
236236

237+
config_connector_config {
238+
enabled = var.config_connector
239+
}
240+
237241
istio_config {
238242
disabled = !var.istio
239243
auth = var.istio_auth
@@ -250,10 +254,6 @@ resource "google_container_cluster" "primary" {
250254
kalm_config {
251255
enabled = var.kalm_config
252256
}
253-
254-
config_connector_config {
255-
enabled = var.config_connector
256-
}
257257
}
258258

259259
datapath_provider = var.datapath_provider

‎modules/beta-private-cluster-update-variant/variables.tf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,12 @@ variable "enable_kubernetes_alpha" {
674674
default = false
675675
}
676676

677+
variable "config_connector" {
678+
type = bool
679+
description = "Whether ConfigConnector is enabled for this cluster."
680+
default = false
681+
}
682+
677683
variable "istio" {
678684
description = "(Beta) Enable Istio addon"
679685
type = bool
@@ -692,12 +698,6 @@ variable "kalm_config" {
692698
default = false
693699
}
694700

695-
variable "config_connector" {
696-
type = bool
697-
description = "(Beta) Whether ConfigConnector is enabled for this cluster."
698-
default = false
699-
}
700-
701701
variable "cloudrun" {
702702
description = "(Beta) Enable CloudRun addon"
703703
type = bool

‎modules/beta-private-cluster/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ Then perform the following commands on the root folder:
154154
| cluster\_ipv4\_cidr | The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR. | `string` | `null` | no |
155155
| cluster\_resource\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | `map(string)` | `{}` | no |
156156
| cluster\_telemetry\_type | Available options include ENABLED, DISABLED, and SYSTEM\_ONLY | `string` | `null` | no |
157-
| config\_connector | (Beta) Whether ConfigConnector is enabled for this cluster. | `bool` | `false` | no |
157+
| config\_connector | Whether ConfigConnector is enabled for this cluster. | `bool` | `false` | no |
158158
| configure\_ip\_masq | Enables the installation of ip masquerading, which is usually no longer required when using aliasied IP addresses. IP masquerading uses a kubectl call, so when you have a private cluster, you will need access to the API server. | `bool` | `false` | no |
159159
| create\_service\_account | Defines if service account specified to run nodes should be created. | `bool` | `true` | no |
160160
| database\_encryption | Application-layer Secrets Encryption settings. The object format is {state = string, key\_name = string}. Valid values of state are: "ENCRYPTED"; "DECRYPTED". key\_name is the name of a CloudKMS key. | `list(object({ state = string, key_name = string }))` | <pre>[<br> {<br> "key_name": "",<br> "state": "DECRYPTED"<br> }<br>]</pre> | no |

‎modules/beta-private-cluster/cluster.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,10 @@ resource "google_container_cluster" "primary" {
234234
}
235235
}
236236

237+
config_connector_config {
238+
enabled = var.config_connector
239+
}
240+
237241
istio_config {
238242
disabled = !var.istio
239243
auth = var.istio_auth
@@ -250,10 +254,6 @@ resource "google_container_cluster" "primary" {
250254
kalm_config {
251255
enabled = var.kalm_config
252256
}
253-
254-
config_connector_config {
255-
enabled = var.config_connector
256-
}
257257
}
258258

259259
datapath_provider = var.datapath_provider

0 commit comments

Comments
 (0)