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

Merge pull request #17505 from hakman/azure-test 

chore: Use constants for default network CIDRs
This commit is contained in:
Kubernetes Prow Robot 2025-07-20 20:20:26 -07:00 committed by GitHub
parent 1a0d074510 2663df7e25
commit 8e83ad6dcd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
upup/pkg/fi/cloudup/defaults.go
View File

@ -33,6 +33,12 @@ import (
kopsversion "k8s.io/kops" 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 // PerformAssignments populates values that are required and immutable
// For example, it assigns stable Keys to InstanceGroups & Masters, and // For example, it assigns stable Keys to InstanceGroups & Masters, and
// it assigns CIDRs to subnets // it assigns CIDRs to subnets
@ -85,7 +91,7 @@ func PerformAssignments(c *kops.Cluster, vfsContext *vfs.VFSContext, cloud fi.Cl
} }
} else { } else {
// TODO: Choose non-overlapping networking CIDRs for VPCs, using vpcInfo // 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 // Amazon VPC CNI uses the same network
@ -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") return fmt.Errorf("unable to infer NetworkCIDR from Network ID, please specify --network-cidr")
} }
} else { } else {
c.Spec.Networking.NetworkCIDR = "10.0.0.0/16" c.Spec.Networking.NetworkCIDR = defaultAzureNetworkCIDR
} }
} }
if c.Spec.Networking.NonMasqueradeCIDR == "" { 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 // TODO: Unclear this should be here - it isn't too hard to change