Skip to content

Do not patch felixconfig or bgpconfig when cluster routing mode is not set #4667

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

Merged
mazdakn merged 2 commits into from
Apr 10, 2026
Merged

Do not patch felixconfig or bgpconfig when cluster routing mode is not set #4667

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
998d60e
Do not patch felixconfig or bgpconfig when cluster routing mode is no…
mazdakn Apr 9, 2026
20b4a01
fix ut
mazdakn Apr 9, 2026
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
9 changes: 8 additions & 1 deletion pkg/controller/installation/core_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2068,6 +2068,10 @@ func setClusterRoutingOnFelixConfiguration(
fc *v3.FelixConfiguration,
reqLogger logr.Logger,
) (bool, error) {
if install.Spec.CalicoNetwork == nil || install.Spec.CalicoNetwork.ClusterRoutingMode == nil {
return false, nil
}

updated := false
desiredValue := "Disabled"
if felixProgramsClusterRoutes(install) {
Expand All @@ -2090,9 +2094,12 @@ func setClusterRoutingOnBGPConfiguration(
bgpConfig *v3.BGPConfiguration,
reqLogger logr.Logger,
) (bool, error) {
if install.Spec.CalicoNetwork == nil || install.Spec.CalicoNetwork.ClusterRoutingMode == nil {
return false, nil
}

updated := false
desiredValue := "Enabled"

if felixProgramsClusterRoutes(install) {
desiredValue = "Disabled"
}
Expand Down
9 changes: 3 additions & 6 deletions pkg/controller/installation/core_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1430,7 +1430,7 @@ var _ = Describe("Testing core-controller installation", func() {
Expect(pullSecret.Kind).To(Equal("Installation"))
})

It("should correctly patch FelixConfig and BGPConfig with ClusterRouteMode not set", func() {
It("should not patch FelixConfig and BGPConfig when ClusterRouteMode not set", func() {
cr.Spec.CalicoNetwork = &operator.CalicoNetworkSpec{}
Expect(c.Create(ctx, cr)).NotTo(HaveOccurred())
_, err := r.Reconcile(ctx, reconcile.Request{})
Expand All @@ -1439,14 +1439,11 @@ var _ = Describe("Testing core-controller installation", func() {
fc := &v3.FelixConfiguration{}
err = c.Get(ctx, types.NamespacedName{Name: "default"}, fc)
Expect(err).ShouldNot(HaveOccurred())
Expect(fc.Spec.ProgramClusterRoutes).NotTo(BeNil())
Expect(*fc.Spec.ProgramClusterRoutes).To(Equal("Disabled"))
Expect(fc.Spec.ProgramClusterRoutes).To(BeNil())

bgpConfig := &v3.BGPConfiguration{}
err = c.Get(ctx, types.NamespacedName{Name: "default"}, bgpConfig)
Expect(err).ShouldNot(HaveOccurred())
Expect(bgpConfig.Spec.ProgramClusterRoutes).NotTo(BeNil())
Expect(*bgpConfig.Spec.ProgramClusterRoutes).To(Equal("Enabled"))
Expect(err).Should(HaveOccurred())
})

It("should correctly patch FelixConfig and BGPConfig with ClusterRouteMode set to BIRD", func() {
Expand Down
Loading