Skip to content

Allow installation with IPIP/noencap and BGP Disabled #4243

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
mazdakn wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow installation with IPIP/noencap and BGP Disabled #4243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4334f4f
remove validation
mazdakn Oct 29, 2025
8972ba0
Update
mazdakn Oct 30, 2025
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
15 changes: 0 additions & 15 deletions pkg/controller/installation/validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,21 +164,6 @@ func validateCustomResource(instance *operatorv1.Installation) error {
// Check that the encapsulation mode on the IP pool is compatible with the CNI plugin that is in-use.
if instance.Spec.CNI.Type == operatorv1.PluginCalico {
switch instance.Spec.CNI.IPAM.Type {
case operatorv1.IPAMPluginCalico:
// Verify the specified encapsulation type is valid.
switch pool.Encapsulation {
case operatorv1.EncapsulationIPIP, operatorv1.EncapsulationIPIPCrossSubnet:
// IPIP currently requires BGP to be running in order to program routes.
if instance.Spec.CalicoNetwork.BGP == nil || *instance.Spec.CalicoNetwork.BGP == operatorv1.BGPDisabled {
return fmt.Errorf("IPIP encapsulation requires that BGP is enabled")
}
case operatorv1.EncapsulationVXLAN, operatorv1.EncapsulationVXLANCrossSubnet:
case operatorv1.EncapsulationNone:
// Unencapsulated currently requires BGP to be running in order to program routes.
if instance.Spec.CalicoNetwork.BGP == nil || *instance.Spec.CalicoNetwork.BGP == operatorv1.BGPDisabled {
return fmt.Errorf("unencapsulated IP pools require that BGP is enabled")
}
}
case operatorv1.IPAMPluginHostLocal:
// The host-local IPAM plugin doesn't support VXLAN.
switch pool.Encapsulation {
Expand Down
11 changes: 7 additions & 4 deletions pkg/controller/installation/validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,10 @@ var _ = Describe("Installation validation tests", func() {
Expect(err).NotTo(HaveOccurred())
})

It("should prevent IPIP if BGP is disabled", func() {
// Previously, IPIP encapsulation were only possible with BGP enabled,
// however, Felix can do the same thing now which means IPIP with BGP disabled
// is supported.
It("should allow IPIP if BGP is disabled", func() {
Copy link
Member Author

@mazdakn mazdakn Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can also remove these two tests, but given UTs are cheap, it might be good to keep them to not regress.

disabled := operator.BGPDisabled
instance.Spec.CalicoNetwork.BGP = &disabled
instance.Spec.CalicoNetwork.IPPools = []operator.IPPool{
Expand All @@ -258,10 +261,10 @@ var _ = Describe("Installation validation tests", func() {
},
}
err := validateCustomResource(instance)
Expect(err).To(HaveOccurred())
Expect(err).NotTo(HaveOccurred())
})

It("should prevent IPIP cross-subnet if BGP is disabled", func() {
It("should allow IPIP cross-subnet if BGP is disabled", func() {
disabled := operator.BGPDisabled
instance.Spec.CalicoNetwork.BGP = &disabled
instance.Spec.CalicoNetwork.IPPools = []operator.IPPool{
Expand All @@ -273,7 +276,7 @@ var _ = Describe("Installation validation tests", func() {
},
}
err := validateCustomResource(instance)
Expect(err).To(HaveOccurred())
Expect(err).NotTo(HaveOccurred())
})

It("should not error if CalicoNetwork is provided on EKS", func() {
Expand Down
2 changes: 2 additions & 0 deletions pkg/crds/enterprise/crd.projectcalico.org_kubecontrollersconfigurations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ spec:
loadBalancer:
properties:
assignIPs:
default: AllServices
type: string
type: object
namespace:
Expand Down Expand Up @@ -127,6 +128,7 @@ spec:
loadBalancer:
properties:
assignIPs:
default: AllServices
type: string
type: object
namespace:
Expand Down
Loading