From f26874c37e90273d3a42fabcb173a0eba2b3b154 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Tue, 3 Oct 2023 07:24:12 +0300 Subject: [PATCH] aws: Don't add dependency on additional CIDR for shared VPC --- pkg/model/awsmodel/network.go | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkg/model/awsmodel/network.go b/pkg/model/awsmodel/network.go index f6fad3ae85..d85f31793b 100644 --- a/pkg/model/awsmodel/network.go +++ b/pkg/model/awsmodel/network.go @@ -295,17 +295,19 @@ func (b *NetworkModelBuilder) Build(c *fi.CloudupModelBuilderContext) error { if subnetSpec.CIDR != "" { subnet.CIDR = fi.PtrTo(subnetSpec.CIDR) - for _, cidr := range b.Cluster.Spec.Networking.AdditionalNetworkCIDRs { - _, additionalCIDR, err := net.ParseCIDR(cidr) - if err != nil { - return err - } - subnetIP, _, err := net.ParseCIDR(subnetSpec.CIDR) - if err != nil { - return err - } - if additionalCIDR.Contains(subnetIP) { - subnet.VPCCIDRBlock = &awstasks.VPCCIDRBlock{Name: fi.PtrTo(cidr)} + if !sharedVPC { + for _, cidr := range b.Cluster.Spec.Networking.AdditionalNetworkCIDRs { + _, additionalCIDR, err := net.ParseCIDR(cidr) + if err != nil { + return err + } + subnetIP, _, err := net.ParseCIDR(subnetSpec.CIDR) + if err != nil { + return err + } + if additionalCIDR.Contains(subnetIP) { + subnet.VPCCIDRBlock = &awstasks.VPCCIDRBlock{Name: fi.PtrTo(cidr)} + } } } }