aws: Don't add dependency on additional CIDR for shared VPC

hakman · Oct 3, 2023 · f26874c · f26874c
1 parent ecda9e8
commit f26874c
Showing 1 changed file with 13 additions and 11 deletions.
diff --git 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)}
+					}
 				}
 			}
 		}