Skip to content

chore: Use constants for default network CIDRs #17505

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 21, 2025
Merged

chore: Use constants for default network CIDRs #17505

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions upup/pkg/fi/cloudup/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ import (
kopsversion "k8s.io/kops"
)

const (
defaultAWSNetworkCIDR = "172.20.0.0/16"
defaultAzureNetworkCIDR = "10.0.0.0/16"
defaultNonMasqueradeCIDR = "100.64.0.0/10"
)

// PerformAssignments populates values that are required and immutable
// For example, it assigns stable Keys to InstanceGroups & Masters, and
// it assigns CIDRs to subnets
Expand Down Expand Up @@ -85,7 +91,7 @@ func PerformAssignments(c *kops.Cluster, vfsContext *vfs.VFSContext, cloud fi.Cl
}
} else {
// TODO: Choose non-overlapping networking CIDRs for VPCs, using vpcInfo
c.Spec.Networking.NetworkCIDR = "172.20.0.0/16"
c.Spec.Networking.NetworkCIDR = defaultAWSNetworkCIDR
}

// Amazon VPC CNI uses the same network
Expand All @@ -111,12 +117,12 @@ func PerformAssignments(c *kops.Cluster, vfsContext *vfs.VFSContext, cloud fi.Cl
return fmt.Errorf("unable to infer NetworkCIDR from Network ID, please specify --network-cidr")
}
} else {
c.Spec.Networking.NetworkCIDR = "10.0.0.0/16"
c.Spec.Networking.NetworkCIDR = defaultAzureNetworkCIDR
}
}

if c.Spec.Networking.NonMasqueradeCIDR == "" {
c.Spec.Networking.NonMasqueradeCIDR = "100.64.0.0/10"
c.Spec.Networking.NonMasqueradeCIDR = defaultNonMasqueradeCIDR
}

// TODO: Unclear this should be here - it isn't too hard to change
Expand Down
Loading