From 5878632858fbdb06bd16dca27b61149daaa87c4a Mon Sep 17 00:00:00 2001 From: Mohamed Rafraf <81432497+mohamed-rafraf@users.noreply.github.com> Date: Wed, 6 Nov 2024 11:16:54 +0100 Subject: [PATCH] Update utils.go --- pkg/charts/utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/charts/utils.go b/pkg/charts/utils.go index c31c2633..e0e1c415 100644 --- 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) } }