Skip to content

Commit

Permalink
feat: Allow enabling GKE backup agent for safer cluster variants (#1367)
Browse files Browse the repository at this point in the history
* Allow enabling GKE backup agent for safer cluster variants

* fix extra attrib from merge conflict

Co-authored-by: Bharath KKB <[email protected]>
  • Loading branch information
lauraseidler and bharathkkb authored Sep 7, 2022
1 parent 4e817be commit 5fb077d
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 6 deletions.
6 changes: 4 additions & 2 deletions autogen/safer-cluster/main.tf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,16 @@ module "gke" {

dns_cache = var.dns_cache


config_connector = var.config_connector
gke_backup_agent_config = var.gke_backup_agent_config

cluster_dns_provider = var.cluster_dns_provider

cluster_dns_scope = var.cluster_dns_scope

cluster_dns_domain = var.cluster_dns_domain

config_connector = var.config_connector

default_max_pods_per_node = var.default_max_pods_per_node

database_encryption = var.database_encryption
Expand Down
6 changes: 6 additions & 0 deletions autogen/safer-cluster/variables.tf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,12 @@ variable "config_connector" {
default = false
}

variable "gke_backup_agent_config" {
type = bool
description = "(Beta) Whether Backup for GKE agent is enabled for this cluster."
default = false
}

variable "disable_default_snat" {
type = bool
description = "Whether to disable the default SNAT to support the private use of public IP addresses"
Expand Down
1 change: 1 addition & 0 deletions modules/safer-cluster-update-variant/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ For simplicity, we suggest using `roles/container.admin` and
| firewall\_inbound\_ports | List of TCP ports for admission/webhook controllers | `list(string)` | <pre>[<br> "8443",<br> "9443",<br> "15017"<br>]</pre> | no |
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
| gce\_pd\_csi\_driver | (Beta) Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |
| gke\_backup\_agent\_config | (Beta) Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer role. | `bool` | `true` | no |
| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |
| http\_load\_balancing | Enable httpload balancer addon. The addon allows whoever can create Ingress objects to expose an application to a public IP. Network policies or Gatekeeper policies should be used to verify that only authorized applications are exposed. | `bool` | `true` | no |
Expand Down
6 changes: 4 additions & 2 deletions modules/safer-cluster-update-variant/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,16 @@ module "gke" {

dns_cache = var.dns_cache


config_connector = var.config_connector
gke_backup_agent_config = var.gke_backup_agent_config

cluster_dns_provider = var.cluster_dns_provider

cluster_dns_scope = var.cluster_dns_scope

cluster_dns_domain = var.cluster_dns_domain

config_connector = var.config_connector

default_max_pods_per_node = var.default_max_pods_per_node

database_encryption = var.database_encryption
Expand Down
6 changes: 6 additions & 0 deletions modules/safer-cluster-update-variant/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,12 @@ variable "config_connector" {
default = false
}

variable "gke_backup_agent_config" {
type = bool
description = "(Beta) Whether Backup for GKE agent is enabled for this cluster."
default = false
}

variable "disable_default_snat" {
type = bool
description = "Whether to disable the default SNAT to support the private use of public IP addresses"
Expand Down
1 change: 1 addition & 0 deletions modules/safer-cluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ For simplicity, we suggest using `roles/container.admin` and
| firewall\_inbound\_ports | List of TCP ports for admission/webhook controllers | `list(string)` | <pre>[<br> "8443",<br> "9443",<br> "15017"<br>]</pre> | no |
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
| gce\_pd\_csi\_driver | (Beta) Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |
| gke\_backup\_agent\_config | (Beta) Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer role. | `bool` | `true` | no |
| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |
| http\_load\_balancing | Enable httpload balancer addon. The addon allows whoever can create Ingress objects to expose an application to a public IP. Network policies or Gatekeeper policies should be used to verify that only authorized applications are exposed. | `bool` | `true` | no |
Expand Down
6 changes: 4 additions & 2 deletions modules/safer-cluster/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,16 @@ module "gke" {

dns_cache = var.dns_cache


config_connector = var.config_connector
gke_backup_agent_config = var.gke_backup_agent_config

cluster_dns_provider = var.cluster_dns_provider

cluster_dns_scope = var.cluster_dns_scope

cluster_dns_domain = var.cluster_dns_domain

config_connector = var.config_connector

default_max_pods_per_node = var.default_max_pods_per_node

database_encryption = var.database_encryption
Expand Down
6 changes: 6 additions & 0 deletions modules/safer-cluster/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,12 @@ variable "config_connector" {
default = false
}

variable "gke_backup_agent_config" {
type = bool
description = "(Beta) Whether Backup for GKE agent is enabled for this cluster."
default = false
}

variable "disable_default_snat" {
type = bool
description = "Whether to disable the default SNAT to support the private use of public IP addresses"
Expand Down

0 comments on commit 5fb077d

Please sign in to comment.