Skip to content

Commit e5dbb7e

Browse files
TolseeTolsee
committed
Update autogen
1 parent 56253a8 commit e5dbb7e

File tree

37 files changed

+117
-92
lines changed

37 files changed

+117
-92
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ Then perform the following commands on the root folder:
157157
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
158158
| gateway\_api\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |
159159
| gce\_pd\_csi\_driver | Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |
160+
| gke\_backup\_agent\_config | Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
160161
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles. | `bool` | `false` | no |
161162
| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |
162163
| 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
@@ -264,6 +264,13 @@ resource "google_container_cluster" "primary" {
264264
enabled = gce_persistent_disk_csi_driver_config.value.enabled
265265
}
266266
}
267+
dynamic "gke_backup_agent_config" {
268+
for_each = local.gke_backup_agent_config
269+
270+
content {
271+
enabled = gke_backup_agent_config.value.enabled
272+
}
273+
}
267274
{% endif %}
268275
{% if beta_cluster and autopilot_cluster != true %}
269276

@@ -287,14 +294,6 @@ resource "google_container_cluster" "primary" {
287294
config_connector_config {
288295
enabled = var.config_connector
289296
}
290-
291-
dynamic "gke_backup_agent_config" {
292-
for_each = local.gke_backup_agent_config
293-
294-
content {
295-
enabled = gke_backup_agent_config.value.enabled
296-
}
297-
}
298297
{% endif %}
299298
}
300299

‎autogen/main/main.tf.tmpl

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

‎autogen/main/variables.tf.tmpl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -641,6 +641,11 @@ variable "gce_pd_csi_driver" {
641641
default = true
642642
}
643643

644+
variable "gke_backup_agent_config" {
645+
type = bool
646+
description = "Whether Backup for GKE agent is enabled for this cluster."
647+
default = false
648+
}
644649
{% endif %}
645650
variable "timeouts" {
646651
type = map(string)
@@ -651,6 +656,7 @@ variable "timeouts" {
651656
error_message = "Only create, update, delete timeouts can be specified."
652657
}
653658
}
659+
654660
{% if beta_cluster %}
655661
{% if autopilot_cluster != true %}
656662

@@ -703,12 +709,6 @@ variable "config_connector" {
703709
default = false
704710
}
705711

706-
variable "gke_backup_agent_config" {
707-
type = bool
708-
description = "(Beta) Whether Backup for GKE agent is enabled for this cluster."
709-
default = false
710-
}
711-
712712
variable "cloudrun" {
713713
description = "(Beta) Enable CloudRun addon"
714714
default = false

‎autogen/main/versions.tf.tmpl

Lines changed: 1 addition & 1 deletion
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"

‎cluster.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,13 @@ resource "google_container_cluster" "primary" {
159159
enabled = gce_persistent_disk_csi_driver_config.value.enabled
160160
}
161161
}
162+
dynamic "gke_backup_agent_config" {
163+
for_each = local.gke_backup_agent_config
164+
165+
content {
166+
enabled = gke_backup_agent_config.value.enabled
167+
}
168+
}
162169
}
163170

164171
datapath_provider = var.datapath_provider

‎main.tf

Lines changed: 1 addition & 0 deletions
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

8889
cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{
8990
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
@@ -423,6 +423,7 @@ variable "timeouts" {
423423
}
424424
}
425425

426+
426427
variable "monitoring_enable_managed_prometheus" {
427428
type = bool
428429
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
@@ -393,6 +393,7 @@ variable "timeouts" {
393393
}
394394
}
395395

396+
396397
variable "monitoring_enable_managed_prometheus" {
397398
type = bool
398399
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
@@ -203,7 +203,7 @@ Then perform the following commands on the root folder:
203203
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
204204
| gateway\_api\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |
205205
| gce\_pd\_csi\_driver | Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |
206-
| gke\_backup\_agent\_config | (Beta) Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
206+
| gke\_backup\_agent\_config | Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
207207
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles. | `bool` | `false` | no |
208208
| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |
209209
| 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
@@ -215,6 +215,13 @@ resource "google_container_cluster" "primary" {
215215
enabled = gce_persistent_disk_csi_driver_config.value.enabled
216216
}
217217
}
218+
dynamic "gke_backup_agent_config" {
219+
for_each = local.gke_backup_agent_config
220+
221+
content {
222+
enabled = gke_backup_agent_config.value.enabled
223+
}
224+
}
218225

219226
istio_config {
220227
disabled = !var.istio
@@ -236,14 +243,6 @@ resource "google_container_cluster" "primary" {
236243
config_connector_config {
237244
enabled = var.config_connector
238245
}
239-
240-
dynamic "gke_backup_agent_config" {
241-
for_each = local.gke_backup_agent_config
242-
243-
content {
244-
enabled = gke_backup_agent_config.value.enabled
245-
}
246-
}
247246
}
248247

249248
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
@@ -85,6 +85,7 @@ locals {
8585
provider = null
8686
}]
8787
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
88+
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
8889
cluster_cloudrun_config_load_balancer_config = (var.cloudrun && var.cloudrun_load_balancer_type != "") ? {
8990
load_balancer_type = var.cloudrun_load_balancer_type
9091
} : {}
@@ -97,7 +98,6 @@ locals {
9798
)
9899
] : []
99100
cluster_cloudrun_enabled = var.cloudrun
100-
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
101101
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus
102102

103103
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
@@ -614,6 +614,11 @@ variable "gce_pd_csi_driver" {
614614
default = true
615615
}
616616

617+
variable "gke_backup_agent_config" {
618+
type = bool
619+
description = "Whether Backup for GKE agent is enabled for this cluster."
620+
default = false
621+
}
617622
variable "timeouts" {
618623
type = map(string)
619624
description = "Timeout for cluster operations."
@@ -624,6 +629,7 @@ variable "timeouts" {
624629
}
625630
}
626631

632+
627633
variable "enable_kubernetes_alpha" {
628634
type = bool
629635
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."
@@ -671,12 +677,6 @@ variable "config_connector" {
671677
default = false
672678
}
673679

674-
variable "gke_backup_agent_config" {
675-
type = bool
676-
description = "(Beta) Whether Backup for GKE agent is enabled for this cluster."
677-
default = false
678-
}
679-
680680
variable "cloudrun" {
681681
description = "(Beta) Enable CloudRun addon"
682682
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
@@ -215,6 +215,13 @@ resource "google_container_cluster" "primary" {
215215
enabled = gce_persistent_disk_csi_driver_config.value.enabled
216216
}
217217
}
218+
dynamic "gke_backup_agent_config" {
219+
for_each = local.gke_backup_agent_config
220+
221+
content {
222+
enabled = gke_backup_agent_config.value.enabled
223+
}
224+
}
218225

219226
istio_config {
220227
disabled = !var.istio
@@ -236,14 +243,6 @@ resource "google_container_cluster" "primary" {
236243
config_connector_config {
237244
enabled = var.config_connector
238245
}
239-
240-
dynamic "gke_backup_agent_config" {
241-
for_each = local.gke_backup_agent_config
242-
243-
content {
244-
enabled = gke_backup_agent_config.value.enabled
245-
}
246-
}
247246
}
248247

249248
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
@@ -85,6 +85,7 @@ locals {
8585
provider = null
8686
}]
8787
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
88+
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
8889
cluster_cloudrun_config_load_balancer_config = (var.cloudrun && var.cloudrun_load_balancer_type != "") ? {
8990
load_balancer_type = var.cloudrun_load_balancer_type
9091
} : {}
@@ -97,7 +98,6 @@ locals {
9798
)
9899
] : []
99100
cluster_cloudrun_enabled = var.cloudrun
100-
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
101101
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus
102102

103103
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
@@ -614,6 +614,11 @@ variable "gce_pd_csi_driver" {
614614
default = true
615615
}
616616

617+
variable "gke_backup_agent_config" {
618+
type = bool
619+
description = "Whether Backup for GKE agent is enabled for this cluster."
620+
default = false
621+
}
617622
variable "timeouts" {
618623
type = map(string)
619624
description = "Timeout for cluster operations."
@@ -624,6 +629,7 @@ variable "timeouts" {
624629
}
625630
}
626631

632+
627633
variable "enable_kubernetes_alpha" {
628634
type = bool
629635
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."
@@ -671,12 +677,6 @@ variable "config_connector" {
671677
default = false
672678
}
673679

674-
variable "gke_backup_agent_config" {
675-
type = bool
676-
description = "Whether Backup for GKE agent is enabled for this cluster."
677-
default = false
678-
}
679-
680680
variable "cloudrun" {
681681
description = "(Beta) Enable CloudRun addon"
682682
default = false

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ Then perform the following commands on the root folder:
194194
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
195195
| gateway\_api\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |
196196
| gce\_pd\_csi\_driver | Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |
197-
| gke\_backup\_agent\_config | (Beta) Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
197+
| gke\_backup\_agent\_config | Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
198198
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles. | `bool` | `false` | no |
199199
| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |
200200
| 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
@@ -215,6 +215,13 @@ resource "google_container_cluster" "primary" {
215215
enabled = gce_persistent_disk_csi_driver_config.value.enabled
216216
}
217217
}
218+
dynamic "gke_backup_agent_config" {
219+
for_each = local.gke_backup_agent_config
220+
221+
content {
222+
enabled = gke_backup_agent_config.value.enabled
223+
}
224+
}
218225

219226
istio_config {
220227
disabled = !var.istio
@@ -236,14 +243,6 @@ resource "google_container_cluster" "primary" {
236243
config_connector_config {
237244
enabled = var.config_connector
238245
}
239-
240-
dynamic "gke_backup_agent_config" {
241-
for_each = local.gke_backup_agent_config
242-
243-
content {
244-
enabled = gke_backup_agent_config.value.enabled
245-
}
246-
}
247246
}
248247

249248
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
@@ -85,6 +85,7 @@ locals {
8585
provider = null
8686
}]
8787
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
88+
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
8889
cluster_cloudrun_config_load_balancer_config = (var.cloudrun && var.cloudrun_load_balancer_type != "") ? {
8990
load_balancer_type = var.cloudrun_load_balancer_type
9091
} : {}
@@ -97,7 +98,6 @@ locals {
9798
)
9899
] : []
99100
cluster_cloudrun_enabled = var.cloudrun
100-
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
101101
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus
102102

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

0 commit comments

Comments
 (0)