Merge pull request #521 from mohamed-rafraf/patch-1

Sanity Check for dual-stack before use IPAM.CIDR
gardener · Nov 6, 2024 · 6c6ebe6 · 6c6ebe6
2 parents b1f9801 + 5878632
commit 6c6ebe6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/charts/utils.go b/pkg/charts/utils.go
@@ -311,7 +311,7 @@ func mergeCalicoValuesWithConfig(c *calicoConfig, config *calicov1alpha1.Network
 	}
 
 	if c.IPAM.IPAMType == hostLocal {
-		if config.IPAM != nil && config.IPAM.CIDR != nil {
+		if config.IPAM != nil && config.IPAM.CIDR != nil && !(isIPv4 && isIPv6) {
 			c.IPAM.Subnet = string(*config.IPAM.CIDR)
 		}
 	}