-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: firewall rules for autopilot clusters are ineffective. add cluster_network_tag to autopilot cluster network_tags if firewalls are toggled on #1817
Merged
apeabody
merged 71 commits into
terraform-google-modules:master
from
GorginZ:gke-autopilot-network-tags
Jun 20, 2024
Merged
Changes from all commits
Commits
Show all changes
71 commits
Select commit
Hold shift + click to select a range
2a36867
use var network_tags for egress firewal rules
GorginZ 70b461b
include service ranges in intra-egress rule
GorginZ 4a103be
get the cidr service range, not the name of the secondary range
GorginZ b70cfff
add cluster_network_tag to node_pool_auto_config.network_tags if any …
GorginZ c05ff1b
add example test for autopilot private with firewall rules
GorginZ b81943a
tf fmt
GorginZ 2982500
readme
GorginZ 82fb83a
clusterNetworkTag var to assert cluster network tags are same value a…
GorginZ 28071b1
readme notes
GorginZ c07eb65
rm some json tests, mostly interested in FW rules and private
GorginZ 993f750
test data
GorginZ 27a45e3
mm dont think I need kitchen
GorginZ 3810721
readme
GorginZ 8376ea2
tidy up comments on fw rules and tf-example foundation
GorginZ 8aeb962
Merge branch 'master' into gke-autopilot-network-tags
GorginZ d43348a
fw rules in base shared vpc not heirarchical just normal fw rules, co…
GorginZ a7af50c
test all expected fw rules created and target tag is cluster_network_…
GorginZ 416484b
.kitchen.yml
GorginZ 6c09110
linter
GorginZ 66772d4
Merge branch 'master' into gke-autopilot-network-tags
GorginZ e25121d
Merge branch 'master' into gke-autopilot-network-tags
GorginZ 34e50bd
Merge branch 'master' into gke-autopilot-network-tags
GorginZ 7987177
Merge branch 'master' into gke-autopilot-network-tags
GorginZ 8684a25
Merge branch 'master' into gke-autopilot-network-tags
GorginZ 5b8456f
Merge branch 'master' into gke-autopilot-network-tags
GorginZ d5f3ae8
Merge branch 'master' into gke-autopilot-network-tags
GorginZ 51cb7d6
Merge branch 'terraform-google-modules:master' into gke-autopilot-net…
GorginZ 505c774
Merge branch 'terraform-google-modules:master' into gke-autopilot-net…
GorginZ b357543
Merge branch 'master' into gke-autopilot-network-tags
GorginZ 080d9b3
fix tf constraints fail in linting
GorginZ 193bee3
Merge branch 'master' into gke-autopilot-network-tags
GorginZ ead10fc
Merge branch 'master' into gke-autopilot-network-tags
GorginZ 34f48a5
Merge branch 'master' into gke-autopilot-network-tags
GorginZ d3a7462
Merge branch 'master' into gke-autopilot-network-tags
GorginZ 6bcd1f2
Merge branch 'master' into gke-autopilot-network-tags
apeabody 8d0c851
Merge branch 'master' into gke-autopilot-network-tags
GorginZ f545b80
Merge branch 'master' into gke-autopilot-network-tags
GorginZ dd6c03a
Merge branch 'master' into gke-autopilot-network-tags
GorginZ 99be550
Merge branch 'master' into gke-autopilot-network-tags
apeabody c7b2cce
Merge branch 'master' into gke-autopilot-network-tags
GorginZ c63786e
Merge branch 'master' into gke-autopilot-network-tags
GorginZ 6066b9a
Merge branch 'master' into gke-autopilot-network-tags
GorginZ fc7eb2a
Merge branch 'master' into gke-autopilot-network-tags
GorginZ da1409b
Merge branch 'master' into gke-autopilot-network-tags
GorginZ 6003f1e
Update examples/autopilot_private_firewalls/network.tf
GorginZ 49257d0
Update examples/autopilot_private_firewalls/network.tf
GorginZ 5eefbf1
Update examples/autopilot_private_firewalls/outputs.tf
GorginZ 1c09567
Update examples/autopilot_private_firewalls/variables.tf
GorginZ cea6035
Update examples/autopilot_private_firewalls/versions.tf
GorginZ 50b240b
Update test/fixtures/autopilot_private_firewalls/outputs.tf
GorginZ badc0cc
Update test/fixtures/autopilot_private_firewalls/variables.tf
GorginZ 03e0056
Update test/integration/autopilot_private_firewalls/autopilot_private…
GorginZ 9259574
Update examples/autopilot_private_firewalls/main.tf
GorginZ e52ed86
Merge branch 'master' into gke-autopilot-network-tags
apeabody 55c0a35
Merge branch 'master' into gke-autopilot-network-tags
apeabody 4fda4ab
rm deprecated kitchen test setup
GorginZ dc24ca0
add cft test config for autopilot-private-firewalls
GorginZ 64da32f
Update build/int.cloudbuild.yaml
GorginZ d3195b8
add wait for destroy simple-autopilot-private-local due to network li…
GorginZ 4d9e654
Merge branch 'master' into gke-autopilot-network-tags
GorginZ 72c91ee
Merge branch 'master' into gke-autopilot-network-tags
GorginZ 97eaf26
Merge branch 'master' into gke-autopilot-network-tags
apeabody 57a2588
mv autopilot-private-firewalls after simple-autopilot-private-local
GorginZ a4a56ff
Merge branch 'master' into gke-autopilot-network-tags
apeabody b68b4b3
increase clustername fmt limit in test
GorginZ 3961a73
Merge branch 'master' into gke-autopilot-network-tags
GorginZ 684b763
Merge branch 'master' into gke-autopilot-network-tags
apeabody 4b4c47c
Merge branch 'master' into gke-autopilot-network-tags
GorginZ 8eb4e8d
rm char limit on clusterName in test
GorginZ bc77424
Update examples/autopilot_private_firewalls/main.tf
GorginZ f836567
terraform fmt
GorginZ File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
# Private Regional Autopilot Cluster With Firewall Rules | ||
|
||
This example creates a regional autopilot cluster with beta features | ||
|
||
It will: | ||
- Create a private autopilot cluster | ||
- Variables ```add_cluster_firewall_rules```, ```add_master_webhook_firewall_rules``` and ```add_shadow_firewal_rules``` are toggled on. In a environment with stringent firewall rules, these cluster firewall rules may be required to allow intra cluster communication | ||
- Adds an example network tag. This example network tag aligns with a firewall rule target tag from the [terraform-example-foundation](https://github.com/terraform-google-modules/terraform-example-foundation) configuration to allow google api access | ||
|
||
>note: this example does **not** create a network with stringent firewall rules. This example shows what cluster configuration may be required for a networking configuration comparable to the [terraform-example-foundation](https://github.com/terraform-google-modules/terraform-example-foundation)'s base shared VPCs, or any VPC with firewall rules to deny 0.0.0.0/0 egress and an allow rule for private google api egress access which targets tags "allow-google-apis". By toggling on the firewall rules variables and adding network_tags to allow private google api access, a private cluster can come up healthy with no internet egress. This configuration shows how to ensure those firewalls that explicitly allow intra cluster ingress and egress are created and appropriate network tags are attached to the cluster. | ||
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK --> | ||
## Inputs | ||
|
||
| Name | Description | Type | Default | Required | | ||
|------|-------------|------|---------|:--------:| | ||
| project\_id | The project ID to host the cluster in | `any` | n/a | yes | | ||
| region | The region the cluster in | `string` | `"us-central1"` | no | | ||
|
||
## Outputs | ||
|
||
| Name | Description | | ||
|------|-------------| | ||
| ca\_certificate | The cluster ca certificate (base64 encoded) | | ||
| cluster\_name | Cluster name | | ||
| kubernetes\_endpoint | The cluster endpoint | | ||
| location | n/a | | ||
| master\_kubernetes\_version | Kubernetes version of the master | | ||
| network\_name | The name of the VPC being created | | ||
| project\_id | The project ID the cluster is in | | ||
| region | The region in which the cluster resides | | ||
| service\_account | The service account to default running nodes as if not overridden in `node_pools`. | | ||
| subnet\_names | The names of the subnet being created | | ||
| zones | List of zones in which the cluster resides | | ||
|
||
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK --> | ||
|
||
To provision this example, run the following from within this directory: | ||
- `terraform init` to get the plugins | ||
- `terraform plan` to see the infrastructure plan | ||
- `terraform apply` to apply the infrastructure build | ||
- `terraform destroy` to destroy the built infrastructure |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
/** | ||
* Copyright 2024 Google LLC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
locals { | ||
cluster_type = "autopilot-private-firewalls" | ||
network_name = "${local.cluster_type}-network" | ||
subnet_name = "${local.cluster_type}-subnet" | ||
master_auth_subnetwork = "${local.cluster_type}-master-subnet" | ||
pods_range_name = "ip-range-pods-${local.cluster_type}" | ||
svc_range_name = "ip-range-svc-${local.cluster_type}" | ||
subnet_names = [for subnet_self_link in module.gcp-network.subnets_self_links : split("/", subnet_self_link)[length(split("/", subnet_self_link)) - 1]] | ||
} | ||
|
||
data "google_client_config" "default" {} | ||
|
||
provider "kubernetes" { | ||
host = "https://${module.gke.endpoint}" | ||
token = data.google_client_config.default.access_token | ||
cluster_ca_certificate = base64decode(module.gke.ca_certificate) | ||
} | ||
|
||
module "gke" { | ||
source = "../../modules/beta-autopilot-private-cluster/" | ||
project_id = var.project_id | ||
name = "${local.cluster_type}-cluster" | ||
regional = true | ||
region = var.region | ||
network = module.gcp-network.network_name | ||
subnetwork = local.subnet_names[index(module.gcp-network.subnets_names, local.subnet_name)] | ||
ip_range_pods = local.pods_range_name | ||
ip_range_services = local.svc_range_name | ||
release_channel = "REGULAR" | ||
enable_vertical_pod_autoscaling = true | ||
enable_private_endpoint = true | ||
enable_private_nodes = true | ||
master_ipv4_cidr_block = "172.16.0.0/28" | ||
add_cluster_firewall_rules = true | ||
add_master_webhook_firewall_rules = true | ||
add_shadow_firewall_rules = true | ||
network_tags = ["allow-google-apis"] | ||
deletion_protection = false | ||
|
||
master_authorized_networks = [ | ||
{ | ||
cidr_block = "10.60.0.0/17" | ||
display_name = "VPC" | ||
}, | ||
] | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
/** | ||
* Copyright 2024 Google LLC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
module "gcp-network" { | ||
source = "terraform-google-modules/network/google" | ||
version = ">= 9.0.0" | ||
|
||
project_id = var.project_id | ||
network_name = local.network_name | ||
|
||
subnets = [ | ||
{ | ||
subnet_name = local.subnet_name | ||
subnet_ip = "10.0.0.0/17" | ||
subnet_region = var.region | ||
}, | ||
{ | ||
subnet_name = local.master_auth_subnetwork | ||
subnet_ip = "10.60.0.0/17" | ||
subnet_region = var.region | ||
}, | ||
] | ||
|
||
secondary_ranges = { | ||
(local.subnet_name) = [ | ||
{ | ||
range_name = local.pods_range_name | ||
ip_cidr_range = "192.168.0.0/18" | ||
}, | ||
{ | ||
range_name = local.svc_range_name | ||
ip_cidr_range = "192.168.64.0/18" | ||
}, | ||
] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
/** | ||
* Copyright 2024 Google LLC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
output "kubernetes_endpoint" { | ||
description = "The cluster endpoint" | ||
sensitive = true | ||
value = module.gke.endpoint | ||
} | ||
|
||
output "cluster_name" { | ||
description = "Cluster name" | ||
value = module.gke.name | ||
} | ||
|
||
output "location" { | ||
value = module.gke.location | ||
} | ||
|
||
output "master_kubernetes_version" { | ||
description = "Kubernetes version of the master" | ||
value = module.gke.master_version | ||
} | ||
|
||
output "ca_certificate" { | ||
sensitive = true | ||
description = "The cluster ca certificate (base64 encoded)" | ||
value = module.gke.ca_certificate | ||
} | ||
|
||
output "service_account" { | ||
description = "The service account to default running nodes as if not overridden in `node_pools`." | ||
value = module.gke.service_account | ||
} | ||
|
||
output "network_name" { | ||
description = "The name of the VPC being created" | ||
value = module.gcp-network.network_name | ||
} | ||
|
||
output "subnet_names" { | ||
description = "The names of the subnet being created" | ||
value = module.gcp-network.subnets_names | ||
} | ||
|
||
output "region" { | ||
description = "The region in which the cluster resides" | ||
value = module.gke.region | ||
} | ||
|
||
output "zones" { | ||
description = "List of zones in which the cluster resides" | ||
value = module.gke.zones | ||
} | ||
|
||
output "project_id" { | ||
description = "The project ID the cluster is in" | ||
value = var.project_id | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
/** | ||
* Copyright 2024 Google LLC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
variable "project_id" { | ||
description = "The project ID to host the cluster in" | ||
} | ||
|
||
variable "region" { | ||
description = "The region the cluster in" | ||
default = "us-central1" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
/** | ||
* Copyright 2024 Google LLC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
terraform { | ||
required_providers { | ||
google = { | ||
source = "hashicorp/google" | ||
} | ||
kubernetes = { | ||
source = "hashicorp/kubernetes" | ||
} | ||
} | ||
required_version = ">= 0.13" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
/** | ||
* Copyright 2018 Google LLC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
module "example" { | ||
source = "../../../examples/autopilot_private_firewalls" | ||
|
||
project_id = var.project_ids[0] | ||
region = var.region | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.