Skip to content

Commit 2893498

Browse files
TolseeTolsee
committed
Update autogen
1 parent 1a08c58 commit 2893498

File tree

39 files changed

+120
-95
lines changed

39 files changed

+120
-95
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ Then perform the following commands on the root folder:
156156
| firewall\_inbound\_ports | List of TCP ports for admission/webhook controllers. Either flag `add_master_webhook_firewall_rules` or `add_cluster_firewall_rules` (also adds egress rules) must be set to `true` for inbound-ports firewall rules to be applied. | `list(string)` | <pre>[<br> "8443",<br> "9443",<br> "15017"<br>]</pre> | no |
157157
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
158158
| gce\_pd\_csi\_driver | Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |
159+
| gke\_backup\_agent\_config | Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
159160
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles. | `bool` | `false` | no |
160161
| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |
161162
| http\_load\_balancing | Enable httpload balancer addon | `bool` | `true` | no |

‎autogen/main/cluster.tf.tmpl

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,13 @@ resource "google_container_cluster" "primary" {
255255
enabled = gce_persistent_disk_csi_driver_config.value.enabled
256256
}
257257
}
258+
dynamic "gke_backup_agent_config" {
259+
for_each = local.gke_backup_agent_config
260+
261+
content {
262+
enabled = gke_backup_agent_config.value.enabled
263+
}
264+
}
258265
{% endif %}
259266
{% if beta_cluster and autopilot_cluster != true %}
260267

@@ -278,14 +285,6 @@ resource "google_container_cluster" "primary" {
278285
config_connector_config {
279286
enabled = var.config_connector
280287
}
281-
282-
dynamic "gke_backup_agent_config" {
283-
for_each = local.gke_backup_agent_config
284-
285-
content {
286-
enabled = gke_backup_agent_config.value.enabled
287-
}
288-
}
289288
{% endif %}
290289
}
291290

‎autogen/main/main.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ locals {
101101
provider = null
102102
}]
103103
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
104+
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
104105
{% endif %}
105106
{% if beta_cluster and autopilot_cluster != true %}
106107
cluster_cloudrun_config_load_balancer_config = (var.cloudrun && var.cloudrun_load_balancer_type != "") ? {
@@ -115,7 +116,6 @@ locals {
115116
)
116117
] : []
117118
cluster_cloudrun_enabled = var.cloudrun
118-
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
119119
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus
120120
{% endif %}
121121

‎autogen/main/variables.tf.tmpl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -635,6 +635,11 @@ variable "gce_pd_csi_driver" {
635635
default = true
636636
}
637637

638+
variable "gke_backup_agent_config" {
639+
type = bool
640+
description = "Whether Backup for GKE agent is enabled for this cluster."
641+
default = false
642+
}
638643
{% endif %}
639644
variable "timeouts" {
640645
type = map(string)
@@ -645,6 +650,7 @@ variable "timeouts" {
645650
error_message = "Only create, update, delete timeouts can be specified."
646651
}
647652
}
653+
648654
{% if beta_cluster %}
649655
{% if autopilot_cluster != true %}
650656

@@ -697,12 +703,6 @@ variable "config_connector" {
697703
default = false
698704
}
699705

700-
variable "gke_backup_agent_config" {
701-
type = bool
702-
description = "(Beta) Whether Backup for GKE agent is enabled for this cluster."
703-
default = false
704-
}
705-
706706
variable "cloudrun" {
707707
description = "(Beta) Enable CloudRun addon"
708708
default = false

‎autogen/main/versions.tf.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ terraform {
2424
required_providers {
2525
google-beta = {
2626
source = "hashicorp/google-beta"
27-
version = ">= 4.45.0, < 5.0"
27+
version = ">= 4.47.0, < 5.0"
2828
}
2929
kubernetes = {
3030
source = "hashicorp/kubernetes"
@@ -38,7 +38,7 @@ terraform {
3838
required_providers {
3939
google = {
4040
source = "hashicorp/google"
41-
version = ">= 4.45.0, < 5.0"
41+
version = ">= 4.47.0, < 5.0"
4242
}
4343
kubernetes = {
4444
source = "hashicorp/kubernetes"

‎cluster.tf

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

155162
datapath_provider = var.datapath_provider

‎main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ locals {
8383
provider = null
8484
}]
8585
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
86+
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
8687

8788
cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{
8889
security_group = var.authenticator_security_group

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,7 @@ variable "timeouts" {
417417
}
418418
}
419419

420+
420421
variable "monitoring_enable_managed_prometheus" {
421422
type = bool
422423
description = "(Beta) Configuration for Managed Service for Prometheus. Whether or not the managed collection is enabled."

‎modules/beta-autopilot-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/beta-autopilot-public-cluster/variables.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,7 @@ variable "timeouts" {
387387
}
388388
}
389389

390+
390391
variable "monitoring_enable_managed_prometheus" {
391392
type = bool
392393
description = "(Beta) Configuration for Managed Service for Prometheus. Whether or not the managed collection is enabled."

‎modules/beta-autopilot-public-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/beta-private-cluster-update-variant/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ Then perform the following commands on the root folder:
202202
| firewall\_inbound\_ports | List of TCP ports for admission/webhook controllers. Either flag `add_master_webhook_firewall_rules` or `add_cluster_firewall_rules` (also adds egress rules) must be set to `true` for inbound-ports firewall rules to be applied. | `list(string)` | <pre>[<br> "8443",<br> "9443",<br> "15017"<br>]</pre> | no |
203203
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
204204
| gce\_pd\_csi\_driver | Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |
205-
| gke\_backup\_agent\_config | (Beta) Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
205+
| gke\_backup\_agent\_config | Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
206206
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles. | `bool` | `false` | no |
207207
| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |
208208
| http\_load\_balancing | Enable httpload balancer addon | `bool` | `true` | no |

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,13 @@ resource "google_container_cluster" "primary" {
206206
enabled = gce_persistent_disk_csi_driver_config.value.enabled
207207
}
208208
}
209+
dynamic "gke_backup_agent_config" {
210+
for_each = local.gke_backup_agent_config
211+
212+
content {
213+
enabled = gke_backup_agent_config.value.enabled
214+
}
215+
}
209216

210217
istio_config {
211218
disabled = !var.istio
@@ -227,14 +234,6 @@ resource "google_container_cluster" "primary" {
227234
config_connector_config {
228235
enabled = var.config_connector
229236
}
230-
231-
dynamic "gke_backup_agent_config" {
232-
for_each = local.gke_backup_agent_config
233-
234-
content {
235-
enabled = gke_backup_agent_config.value.enabled
236-
}
237-
}
238237
}
239238

240239
datapath_provider = var.datapath_provider

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ locals {
8484
provider = null
8585
}]
8686
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
87+
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
8788
cluster_cloudrun_config_load_balancer_config = (var.cloudrun && var.cloudrun_load_balancer_type != "") ? {
8889
load_balancer_type = var.cloudrun_load_balancer_type
8990
} : {}
@@ -96,7 +97,6 @@ locals {
9697
)
9798
] : []
9899
cluster_cloudrun_enabled = var.cloudrun
99-
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
100100
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus
101101

102102
cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,11 @@ variable "gce_pd_csi_driver" {
608608
default = true
609609
}
610610

611+
variable "gke_backup_agent_config" {
612+
type = bool
613+
description = "Whether Backup for GKE agent is enabled for this cluster."
614+
default = false
615+
}
611616
variable "timeouts" {
612617
type = map(string)
613618
description = "Timeout for cluster operations."
@@ -618,6 +623,7 @@ variable "timeouts" {
618623
}
619624
}
620625

626+
621627
variable "enable_kubernetes_alpha" {
622628
type = bool
623629
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."
@@ -665,12 +671,6 @@ variable "config_connector" {
665671
default = false
666672
}
667673

668-
variable "gke_backup_agent_config" {
669-
type = bool
670-
description = "(Beta) Whether Backup for GKE agent is enabled for this cluster."
671-
default = false
672-
}
673-
674674
variable "cloudrun" {
675675
description = "(Beta) Enable CloudRun addon"
676676
default = false

‎modules/beta-private-cluster-update-variant/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/beta-private-cluster/cluster.tf

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,13 @@ resource "google_container_cluster" "primary" {
206206
enabled = gce_persistent_disk_csi_driver_config.value.enabled
207207
}
208208
}
209+
dynamic "gke_backup_agent_config" {
210+
for_each = local.gke_backup_agent_config
211+
212+
content {
213+
enabled = gke_backup_agent_config.value.enabled
214+
}
215+
}
209216

210217
istio_config {
211218
disabled = !var.istio
@@ -227,14 +234,6 @@ resource "google_container_cluster" "primary" {
227234
config_connector_config {
228235
enabled = var.config_connector
229236
}
230-
231-
dynamic "gke_backup_agent_config" {
232-
for_each = local.gke_backup_agent_config
233-
234-
content {
235-
enabled = gke_backup_agent_config.value.enabled
236-
}
237-
}
238237
}
239238

240239
datapath_provider = var.datapath_provider

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ locals {
8484
provider = null
8585
}]
8686
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
87+
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
8788
cluster_cloudrun_config_load_balancer_config = (var.cloudrun && var.cloudrun_load_balancer_type != "") ? {
8889
load_balancer_type = var.cloudrun_load_balancer_type
8990
} : {}
@@ -96,7 +97,6 @@ locals {
9697
)
9798
] : []
9899
cluster_cloudrun_enabled = var.cloudrun
99-
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
100100
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus
101101

102102
cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,11 @@ variable "gce_pd_csi_driver" {
608608
default = true
609609
}
610610

611+
variable "gke_backup_agent_config" {
612+
type = bool
613+
description = "Whether Backup for GKE agent is enabled for this cluster."
614+
default = false
615+
}
611616
variable "timeouts" {
612617
type = map(string)
613618
description = "Timeout for cluster operations."
@@ -618,6 +623,7 @@ variable "timeouts" {
618623
}
619624
}
620625

626+
621627
variable "enable_kubernetes_alpha" {
622628
type = bool
623629
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."
@@ -665,12 +671,6 @@ variable "config_connector" {
665671
default = false
666672
}
667673

668-
variable "gke_backup_agent_config" {
669-
type = bool
670-
description = "Whether Backup for GKE agent is enabled for this cluster."
671-
default = false
672-
}
673-
674674
variable "cloudrun" {
675675
description = "(Beta) Enable CloudRun addon"
676676
default = false

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ Then perform the following commands on the root folder:
193193
| firewall\_inbound\_ports | List of TCP ports for admission/webhook controllers. Either flag `add_master_webhook_firewall_rules` or `add_cluster_firewall_rules` (also adds egress rules) must be set to `true` for inbound-ports firewall rules to be applied. | `list(string)` | <pre>[<br> "8443",<br> "9443",<br> "15017"<br>]</pre> | no |
194194
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
195195
| gce\_pd\_csi\_driver | Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |
196-
| gke\_backup\_agent\_config | (Beta) Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
196+
| gke\_backup\_agent\_config | Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
197197
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles. | `bool` | `false` | no |
198198
| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |
199199
| http\_load\_balancing | Enable httpload balancer addon | `bool` | `true` | no |

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,13 @@ resource "google_container_cluster" "primary" {
206206
enabled = gce_persistent_disk_csi_driver_config.value.enabled
207207
}
208208
}
209+
dynamic "gke_backup_agent_config" {
210+
for_each = local.gke_backup_agent_config
211+
212+
content {
213+
enabled = gke_backup_agent_config.value.enabled
214+
}
215+
}
209216

210217
istio_config {
211218
disabled = !var.istio
@@ -227,14 +234,6 @@ resource "google_container_cluster" "primary" {
227234
config_connector_config {
228235
enabled = var.config_connector
229236
}
230-
231-
dynamic "gke_backup_agent_config" {
232-
for_each = local.gke_backup_agent_config
233-
234-
content {
235-
enabled = gke_backup_agent_config.value.enabled
236-
}
237-
}
238237
}
239238

240239
datapath_provider = var.datapath_provider

‎modules/beta-public-cluster-update-variant/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ locals {
8484
provider = null
8585
}]
8686
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
87+
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
8788
cluster_cloudrun_config_load_balancer_config = (var.cloudrun && var.cloudrun_load_balancer_type != "") ? {
8889
load_balancer_type = var.cloudrun_load_balancer_type
8990
} : {}
@@ -96,7 +97,6 @@ locals {
9697
)
9798
] : []
9899
cluster_cloudrun_enabled = var.cloudrun
99-
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
100100
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus
101101

102102
cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{

0 commit comments

Comments
 (0)