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

Merge pull request #15987 from hakman/fix-shared-vpc-additional-cidr 

aws: Don't add dependency on additional CIDR for shared VPC
This commit is contained in:
Kubernetes Prow Robot 2023-10-03 07:57:06 +02:00 committed by GitHub
parent ecda9e8652 f26874c37e
commit fcb3a85422
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/model/awsmodel/network.go
View File

@ -295,17 +295,19 @@ func (b *NetworkModelBuilder) Build(c *fi.CloudupModelBuilderContext) error {
if subnetSpec.CIDR != "" { if subnetSpec.CIDR != "" {
subnet.CIDR = fi.PtrTo(subnetSpec.CIDR) subnet.CIDR = fi.PtrTo(subnetSpec.CIDR)
for _, cidr := range b.Cluster.Spec.Networking.AdditionalNetworkCIDRs { if !sharedVPC {
_, additionalCIDR, err := net.ParseCIDR(cidr) for _, cidr := range b.Cluster.Spec.Networking.AdditionalNetworkCIDRs {
if err != nil { _, additionalCIDR, err := net.ParseCIDR(cidr)
return err if err != nil {
} return err
subnetIP, _, err := net.ParseCIDR(subnetSpec.CIDR) }
if err != nil { subnetIP, _, err := net.ParseCIDR(subnetSpec.CIDR)
return err if err != nil {
} return err
if additionalCIDR.Contains(subnetIP) { }
subnet.VPCCIDRBlock = &awstasks.VPCCIDRBlock{Name: fi.PtrTo(cidr)} if additionalCIDR.Contains(subnetIP) {
subnet.VPCCIDRBlock = &awstasks.VPCCIDRBlock{Name: fi.PtrTo(cidr)}
}
} }
} }
} }