kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12368 from justinsb/gce_firewall_rules_always_ipv6 

GCE: Always have IPv6 rules in "ipv6 mode"
This commit is contained in:
Kubernetes Prow Robot 2021-09-20 20:38:23 -07:00 committed by GitHub
parent 252f52f53d 76f816f483
commit 8f42a4a689
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 102 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/model/gcemodel/firewall.go
View File

@ -154,12 +154,21 @@ func (b *GCEModelContext) AddFirewallRulesTasks(c *fi.ModelBuilderContext, name
ipv4 := *rule
ipv4.Name = s(b.NameForFirewallRule(name))
ipv4.SourceRanges = ipv4SourceRanges
ipv4.DisableIfEmptySourceRanges()
if len(ipv4.SourceRanges) == 0 {
// This is helpful because empty SourceRanges and SourceTags are interpreted as allow everything,
// but the intent is usually to block everything, which can be achieved with Disabled=true.
ipv4.Disabled = true
ipv4.SourceRanges = []string{"0.0.0.0/0"}
}
c.AddTask(&ipv4)
ipv6 := *rule
ipv6.Name = s(b.NameForFirewallRule(name + "-ipv6"))
ipv6.SourceRanges = ipv6SourceRanges
ipv6.DisableIfEmptySourceRanges()
if len(ipv6.SourceRanges) == 0 {
// We specify explicitly so the rule is in IPv6 mode
ipv6.Disabled = true
ipv6.SourceRanges = []string{"::/0"}
}
c.AddTask(&ipv6)
}

36
tests/integration/update_cluster/ha_gce/kubernetes.tf
View File

@ -291,10 +291,11 @@ resource "google_compute_firewall" "cidr-to-master-ipv6-ha-gce-example-com" {
ports = ["4194"]
protocol = "tcp"
}
disabled = true
name = "cidr-to-master-ipv6-ha-gce-example-com"
network = google_compute_network.default.name
target_tags = ["ha-gce-example-com-k8s-io-role-master"]
disabled = true
name = "cidr-to-master-ipv6-ha-gce-example-com"
network = google_compute_network.default.name
source_ranges = ["::/0"]
target_tags = ["ha-gce-example-com-k8s-io-role-master"]
}
resource "google_compute_firewall" "cidr-to-node-ha-gce-example-com" {
@ -342,10 +343,11 @@ resource "google_compute_firewall" "cidr-to-node-ipv6-ha-gce-example-com" {
allow {
protocol = "sctp"
}
disabled = true
name = "cidr-to-node-ipv6-ha-gce-example-com"
network = google_compute_network.default.name
target_tags = ["ha-gce-example-com-k8s-io-role-node"]
disabled = true
name = "cidr-to-node-ipv6-ha-gce-example-com"
network = google_compute_network.default.name
source_ranges = ["::/0"]
target_tags = ["ha-gce-example-com-k8s-io-role-node"]
}
resource "google_compute_firewall" "kubernetes-master-https-ha-gce-example-com" {
@ -475,10 +477,11 @@ resource "google_compute_firewall" "nodeport-external-to-node-ha-gce-example-com
ports = ["30000-32767"]
protocol = "udp"
}
disabled = true
name = "nodeport-external-to-node-ha-gce-example-com"
network = google_compute_network.default.name
target_tags = ["ha-gce-example-com-k8s-io-role-node"]
disabled = true
name = "nodeport-external-to-node-ha-gce-example-com"
network = google_compute_network.default.name
source_ranges = ["0.0.0.0/0"]
target_tags = ["ha-gce-example-com-k8s-io-role-node"]
}
resource "google_compute_firewall" "nodeport-external-to-node-ipv6-ha-gce-example-com" {
@ -490,10 +493,11 @@ resource "google_compute_firewall" "nodeport-external-to-node-ipv6-ha-gce-exampl
ports = ["30000-32767"]
protocol = "udp"
}
disabled = true
name = "nodeport-external-to-node-ipv6-ha-gce-example-com"
network = google_compute_network.default.name
target_tags = ["ha-gce-example-com-k8s-io-role-node"]
disabled = true
name = "nodeport-external-to-node-ipv6-ha-gce-example-com"
network = google_compute_network.default.name
source_ranges = ["::/0"]
target_tags = ["ha-gce-example-com-k8s-io-role-node"]
}
resource "google_compute_firewall" "ssh-external-to-master-ha-gce-example-com" {

63
tests/integration/update_cluster/minimal_gce/kubernetes.tf
View File

@ -211,10 +211,11 @@ resource "google_compute_firewall" "cidr-to-master-ipv6-minimal-gce-example-com"
ports = ["4194"]
protocol = "tcp"
}
disabled = true
name = "cidr-to-master-ipv6-minimal-gce-example-com"
network = google_compute_network.default.name
target_tags = ["minimal-gce-example-com-k8s-io-role-master"]
disabled = true
name = "cidr-to-master-ipv6-minimal-gce-example-com"
network = google_compute_network.default.name
source_ranges = ["::/0"]
target_tags = ["minimal-gce-example-com-k8s-io-role-master"]
}
resource "google_compute_firewall" "cidr-to-master-minimal-gce-example-com" {
@ -252,10 +253,11 @@ resource "google_compute_firewall" "cidr-to-node-ipv6-minimal-gce-example-com" {
allow {
protocol = "sctp"
}
disabled = true
name = "cidr-to-node-ipv6-minimal-gce-example-com"
network = google_compute_network.default.name
target_tags = ["minimal-gce-example-com-k8s-io-role-node"]
disabled = true
name = "cidr-to-node-ipv6-minimal-gce-example-com"
network = google_compute_network.default.name
source_ranges = ["::/0"]
target_tags = ["minimal-gce-example-com-k8s-io-role-node"]
}
resource "google_compute_firewall" "cidr-to-node-minimal-gce-example-com" {
@ -289,10 +291,11 @@ resource "google_compute_firewall" "kubernetes-master-https-ipv6-minimal-gce-exa
ports = ["443"]
protocol = "tcp"
}
disabled = true
name = "kubernetes-master-https-ipv6-minimal-gce-example-com"
network = google_compute_network.default.name
target_tags = ["minimal-gce-example-com-k8s-io-role-master"]
disabled = true
name = "kubernetes-master-https-ipv6-minimal-gce-example-com"
network = google_compute_network.default.name
source_ranges = ["::/0"]
target_tags = ["minimal-gce-example-com-k8s-io-role-master"]
}
resource "google_compute_firewall" "kubernetes-master-https-minimal-gce-example-com" {
@ -410,10 +413,11 @@ resource "google_compute_firewall" "nodeport-external-to-node-ipv6-minimal-gce-e
ports = ["30000-32767"]
protocol = "udp"
}
disabled = true
name = "nodeport-external-to-node-ipv6-minimal-gce-example-com"
network = google_compute_network.default.name
target_tags = ["minimal-gce-example-com-k8s-io-role-node"]
disabled = true
name = "nodeport-external-to-node-ipv6-minimal-gce-example-com"
network = google_compute_network.default.name
source_ranges = ["::/0"]
target_tags = ["minimal-gce-example-com-k8s-io-role-node"]
}
resource "google_compute_firewall" "nodeport-external-to-node-minimal-gce-example-com" {
@ -425,10 +429,11 @@ resource "google_compute_firewall" "nodeport-external-to-node-minimal-gce-exampl
ports = ["30000-32767"]
protocol = "udp"
}
disabled = true
name = "nodeport-external-to-node-minimal-gce-example-com"
network = google_compute_network.default.name
target_tags = ["minimal-gce-example-com-k8s-io-role-node"]
disabled = true
name = "nodeport-external-to-node-minimal-gce-example-com"
network = google_compute_network.default.name
source_ranges = ["0.0.0.0/0"]
target_tags = ["minimal-gce-example-com-k8s-io-role-node"]
}
resource "google_compute_firewall" "ssh-external-to-master-ipv6-minimal-gce-example-com" {
@ -436,10 +441,11 @@ resource "google_compute_firewall" "ssh-external-to-master-ipv6-minimal-gce-exam
ports = ["22"]
protocol = "tcp"
}
disabled = true
name = "ssh-external-to-master-ipv6-minimal-gce-example-com"
network = google_compute_network.default.name
target_tags = ["minimal-gce-example-com-k8s-io-role-master"]
disabled = true
name = "ssh-external-to-master-ipv6-minimal-gce-example-com"
network = google_compute_network.default.name
source_ranges = ["::/0"]
target_tags = ["minimal-gce-example-com-k8s-io-role-master"]
}
resource "google_compute_firewall" "ssh-external-to-master-minimal-gce-example-com" {
@ -459,10 +465,11 @@ resource "google_compute_firewall" "ssh-external-to-node-ipv6-minimal-gce-exampl
ports = ["22"]
protocol = "tcp"
}
disabled = true
name = "ssh-external-to-node-ipv6-minimal-gce-example-com"
network = google_compute_network.default.name
target_tags = ["minimal-gce-example-com-k8s-io-role-node"]
disabled = true
name = "ssh-external-to-node-ipv6-minimal-gce-example-com"
network = google_compute_network.default.name
source_ranges = ["::/0"]
target_tags = ["minimal-gce-example-com-k8s-io-role-node"]
}
resource "google_compute_firewall" "ssh-external-to-node-minimal-gce-example-com" {

63
tests/integration/update_cluster/minimal_gce_private/kubernetes.tf
View File

@ -211,10 +211,11 @@ resource "google_compute_firewall" "cidr-to-master-ipv6-minimal-gce-private-exam
ports = ["4194"]
protocol = "tcp"
}
disabled = true
name = "cidr-to-master-ipv6-minimal-gce-private-example-com"
network = google_compute_network.default.name
target_tags = ["minimal-gce-private-example-com-k8s-io-role-master"]
disabled = true
name = "cidr-to-master-ipv6-minimal-gce-private-example-com"
network = google_compute_network.default.name
source_ranges = ["::/0"]
target_tags = ["minimal-gce-private-example-com-k8s-io-role-master"]
}
resource "google_compute_firewall" "cidr-to-master-minimal-gce-private-example-com" {
@ -252,10 +253,11 @@ resource "google_compute_firewall" "cidr-to-node-ipv6-minimal-gce-private-exampl
allow {
protocol = "sctp"
}
disabled = true
name = "cidr-to-node-ipv6-minimal-gce-private-example-com"
network = google_compute_network.default.name
target_tags = ["minimal-gce-private-example-com-k8s-io-role-node"]
disabled = true
name = "cidr-to-node-ipv6-minimal-gce-private-example-com"
network = google_compute_network.default.name
source_ranges = ["::/0"]
target_tags = ["minimal-gce-private-example-com-k8s-io-role-node"]
}
resource "google_compute_firewall" "cidr-to-node-minimal-gce-private-example-com" {
@ -289,10 +291,11 @@ resource "google_compute_firewall" "kubernetes-master-https-ipv6-minimal-gce-pri
ports = ["443"]
protocol = "tcp"
}
disabled = true
name = "kubernetes-master-https-ipv6-minimal-gce-private-example-com"
network = google_compute_network.default.name
target_tags = ["minimal-gce-private-example-com-k8s-io-role-master"]
disabled = true
name = "kubernetes-master-https-ipv6-minimal-gce-private-example-com"
network = google_compute_network.default.name
source_ranges = ["::/0"]
target_tags = ["minimal-gce-private-example-com-k8s-io-role-master"]
}
resource "google_compute_firewall" "kubernetes-master-https-minimal-gce-private-example-com" {
@ -410,10 +413,11 @@ resource "google_compute_firewall" "nodeport-external-to-node-ipv6-minimal-gce-p
ports = ["30000-32767"]
protocol = "udp"
}
disabled = true
name = "nodeport-external-to-node-ipv6-minimal-gce-private-example-com"
network = google_compute_network.default.name
target_tags = ["minimal-gce-private-example-com-k8s-io-role-node"]
disabled = true
name = "nodeport-external-to-node-ipv6-minimal-gce-private-example-com"
network = google_compute_network.default.name
source_ranges = ["::/0"]
target_tags = ["minimal-gce-private-example-com-k8s-io-role-node"]
}
resource "google_compute_firewall" "nodeport-external-to-node-minimal-gce-private-example-com" {
@ -425,10 +429,11 @@ resource "google_compute_firewall" "nodeport-external-to-node-minimal-gce-privat
ports = ["30000-32767"]
protocol = "udp"
}
disabled = true
name = "nodeport-external-to-node-minimal-gce-private-example-com"
network = google_compute_network.default.name
target_tags = ["minimal-gce-private-example-com-k8s-io-role-node"]
disabled = true
name = "nodeport-external-to-node-minimal-gce-private-example-com"
network = google_compute_network.default.name
source_ranges = ["0.0.0.0/0"]
target_tags = ["minimal-gce-private-example-com-k8s-io-role-node"]
}
resource "google_compute_firewall" "ssh-external-to-master-ipv6-minimal-gce-private-example-com" {
@ -436,10 +441,11 @@ resource "google_compute_firewall" "ssh-external-to-master-ipv6-minimal-gce-priv
ports = ["22"]
protocol = "tcp"
}
disabled = true
name = "ssh-external-to-master-ipv6-minimal-gce-private-example-com"
network = google_compute_network.default.name
target_tags = ["minimal-gce-private-example-com-k8s-io-role-master"]
disabled = true
name = "ssh-external-to-master-ipv6-minimal-gce-private-example-com"
network = google_compute_network.default.name
source_ranges = ["::/0"]
target_tags = ["minimal-gce-private-example-com-k8s-io-role-master"]
}
resource "google_compute_firewall" "ssh-external-to-master-minimal-gce-private-example-com" {
@ -459,10 +465,11 @@ resource "google_compute_firewall" "ssh-external-to-node-ipv6-minimal-gce-privat
ports = ["22"]
protocol = "tcp"
}
disabled = true
name = "ssh-external-to-node-ipv6-minimal-gce-private-example-com"
network = google_compute_network.default.name
target_tags = ["minimal-gce-private-example-com-k8s-io-role-node"]
disabled = true
name = "ssh-external-to-node-ipv6-minimal-gce-private-example-com"
network = google_compute_network.default.name
source_ranges = ["::/0"]
target_tags = ["minimal-gce-private-example-com-k8s-io-role-node"]
}
resource "google_compute_firewall" "ssh-external-to-node-minimal-gce-private-example-com" {

18
upup/pkg/fi/cloudup/gcetasks/firewallrule.go
View File

@ -93,16 +93,10 @@ func (e *FirewallRule) Run(c *fi.Context) error {
func (e *FirewallRule) sanityCheck() error {
if !e.Disabled {
// Treat it as an error if SourceRanges _and_ SourceTags empty with Disabled=false
// this is interpreted as SourceRanges="0.0.0.0/0", which is likely what was intended.
// this is interpreted as SourceRanges="0.0.0.0/0", which is likely not what was intended.
if len(e.SourceRanges) == 0 && len(e.SourceTags) == 0 {
return fmt.Errorf("either SourceRanges or SourceTags should be specified when Disabled is false")
}
} else {
// Treat it as an error if SourceRanges/SourceTags non-empty with Disabled
// this is allowed but is likely not what was intended.
if len(e.SourceRanges) != 0 || len(e.SourceTags) != 0 {
return fmt.Errorf("setting Disabled=true overrules SourceRanges or SourceTags")
}
}
// Treat it as an error if SourceRanges _and_ SourceTags both set;
@ -268,13 +262,3 @@ func (_ *FirewallRule) RenderTerraform(t *terraform.TerraformTarget, a, e, chang
return t.RenderResource("google_compute_firewall", *e.Name, tf)
}
// DisableIfEmptySourceRanges sets Disabled if SourceRanges is empty.
// This is helpful because empty SourceRanges and SourceTags are interpreted as allow everything,
// but the intent is usually to block everything, which can be achieved with Disabled=true.
func (e *FirewallRule) DisableIfEmptySourceRanges() *FirewallRule {
if len(e.SourceRanges) == 0 {
e.Disabled = true
}
return e
}