Skip to content

allow encapsulation in IPV6 when vpp dataplane in used #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hedibouattour wants to merge 1 commit into
base: master
Choose a base branch
from
Open

allow encapsulation in IPV6 when vpp dataplane in used #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkg/controller/installation/validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,9 @@ func validateCustomResource(instance *operatorv1.Installation) error {
}

if v6pool.Encapsulation != operatorv1.EncapsulationNone {
return fmt.Errorf("Encapsulation is not supported by IPv6 pools, but it is set for %s", v6pool.CIDR)
if instance.Spec.CalicoNetwork.LinuxDataplane == nil || *instance.Spec.CalicoNetwork.LinuxDataplane != operatorv1.LinuxDataplaneVPP {
return fmt.Errorf("Encapsulation is not supported by IPv6 pools, but it is set for %s", v6pool.CIDR)
}
}

if bpfDataplane {
Expand Down
15 changes: 15 additions & 0 deletions pkg/render/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1228,6 +1228,21 @@ func (c *nodeComponent) nodeEnvVars() []corev1.EnvVar {
if v6pool := GetIPv6Pool(c.cfg.Installation.CalicoNetwork.IPPools); v6pool != nil {
nodeEnv = append(nodeEnv, corev1.EnvVar{Name: "CALICO_IPV6POOL_CIDR", Value: v6pool.CIDR})

switch v6pool.Encapsulation {
case operatorv1.EncapsulationIPIPCrossSubnet:
nodeEnv = append(nodeEnv, corev1.EnvVar{Name: "CALICO_IPV6POOL_IPIP", Value: "CrossSubnet"})
case operatorv1.EncapsulationIPIP:
nodeEnv = append(nodeEnv, corev1.EnvVar{Name: "CALICO_IPV6POOL_IPIP", Value: "Always"})
case operatorv1.EncapsulationVXLAN:
nodeEnv = append(nodeEnv, corev1.EnvVar{Name: "CALICO_IPV6POOL_VXLAN", Value: "Always"})
case operatorv1.EncapsulationVXLANCrossSubnet:
nodeEnv = append(nodeEnv, corev1.EnvVar{Name: "CALICO_IPV6POOL_VXLAN", Value: "CrossSubnet"})
case operatorv1.EncapsulationNone:
nodeEnv = append(nodeEnv, corev1.EnvVar{Name: "CALICO_IPV6POOL_IPIP", Value: "Never"})
default:
nodeEnv = append(nodeEnv, corev1.EnvVar{Name: "CALICO_IPV6POOL_IPIP", Value: "Always"})
}

if v6pool.BlockSize != nil {
nodeEnv = append(nodeEnv, corev1.EnvVar{Name: "CALICO_IPV6POOL_BLOCK_SIZE", Value: fmt.Sprintf("%d", *v6pool.BlockSize)})
}
Expand Down