cluster routing mode #4511
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1144,9 +1144,34 @@ func (r *ReconcileInstallation) Reconcile(ctx context.Context, request reconcile | |
| if err != nil { | ||
| return false, err | ||
| } | ||
|
|
||
| // Configure cluster routing mode. | ||
| u3, err := setClusterRoutingOnFelixConfiguration(instance, fc, reqLogger) | ||
| if err != nil { | ||
| return false, err | ||
| } | ||
|
|
||
| updated := u || u2 || u3 | ||
| return updated, nil | ||
| }) | ||
| if err != nil { | ||
| return reconcile.Result{}, err | ||
| } | ||
|
|
||
| // Set any non-default BGPConfiguration values that we need. | ||
| _, err = utils.PatchBGPConfiguration(ctx, r.client, func(bgpConfig *v3.BGPConfiguration) (bool, error) { | ||
| // Configure cluster routing mode. | ||
| u, err := setClusterRoutingOnBGPConfiguration(instance, bgpConfig, reqLogger) | ||
| if err != nil { | ||
| return false, err | ||
| } | ||
|
|
||
| return u, nil | ||
| }) | ||
| if err != nil { | ||
| // Since, programClusterRoutes in FelixConfiguration is already updated earlier, | ||
| // failure in updating programClusterRouting in BGPConfiguration, essentially results in inconsistency | ||
| // between the configuration of BIRD and Felix in programming cluster routes, until the next reconcile convergence | ||
| return reconcile.Result{}, err | ||
| } | ||
|
|
||
|
|
@@ -2011,6 +2036,59 @@ func (r *ReconcileInstallation) setDefaultsOnFelixConfiguration(ctx context.Cont | |
| return updated, nil | ||
| } | ||
|
|
||
| // setClusterRoutingOnFelixConfiguration sets programClusterRoutes in the FelixConfiguration resource | ||
| // based on the value of clusterRoutingMode in the install config. | ||
| func setClusterRoutingOnFelixConfiguration( | ||
| install *operatorv1.Installation, | ||
| fc *v3.FelixConfiguration, | ||
| reqLogger logr.Logger, | ||
| ) (bool, error) { | ||
| updated := false | ||
| desiredValue := "Disabled" | ||
| if felixProgramsClusterRoutes(install) { | ||
| desiredValue = "Enabled" | ||
| } | ||
|
|
||
| if fc.Spec.ProgramClusterRoutes == nil || *fc.Spec.ProgramClusterRoutes != desiredValue { | ||
| fc.Spec.ProgramClusterRoutes = &desiredValue | ||
| updated = true | ||
| reqLogger.Info("Patching FelixConfiguration", "programClusterRoutes", desiredValue) | ||
| } | ||
|
|
||
| return updated, nil | ||
| } | ||
|
|
||
| // setClusterRoutingOnBGPConfiguration sets programClusterRoutes in the BGPConfiguration resource | ||
| // based on the value of clusterRoutingMode in the install config. | ||
| func setClusterRoutingOnBGPConfiguration( | ||
| install *operatorv1.Installation, | ||
| bgpConfig *v3.BGPConfiguration, | ||
| reqLogger logr.Logger, | ||
| ) (bool, error) { | ||
| updated := false | ||
| desiredValue := "Enabled" | ||
|
Member
There was a problem hiding this comment. Are there constants we should be using for this?
Member
Author
There was a problem hiding this comment. No, for these options in the BGPConfig and FelixConfig we use string type, and we rely on kubebuilder to validate inputs. |
||
|
|
||
| if felixProgramsClusterRoutes(install) { | ||
| desiredValue = "Disabled" | ||
| } | ||
|
|
||
| if bgpConfig.Spec.ProgramClusterRoutes == nil || *bgpConfig.Spec.ProgramClusterRoutes != desiredValue { | ||
|
Member
There was a problem hiding this comment. Hm, we usually try to avoid overwriting end-user modifications of FelixConfig, etc using an annotation. Technically I suppose we should do it here... but we're actually pretty inconsistent about it. I've started a prototype of how to make this more easily implemented: #4523 But I don't want to block this PR on it. So I'll just make sure to incorporate this into my changes.
Member
Author
There was a problem hiding this comment. Thanks for the input and including the case in your PR. |
||
| bgpConfig.Spec.ProgramClusterRoutes = &desiredValue | ||
| updated = true | ||
| reqLogger.Info("Patching BGPConfiguration", "programClusterRoutes", desiredValue) | ||
| } | ||
|
|
||
| return updated, nil | ||
| } | ||
|
|
||
| func felixProgramsClusterRoutes(install *operatorv1.Installation) bool { | ||
| if install.Spec.CalicoNetwork != nil && install.Spec.CalicoNetwork.ClusterRoutingMode != nil && | ||
| *install.Spec.CalicoNetwork.ClusterRoutingMode == operatorv1.ClusterRoutingModeFelix { | ||
| return true | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| // setBPFUpdatesOnFelixConfiguration will take the passed in fc and update any BPF properties needed | ||
| // based on the install config and the daemonset. | ||
| func (r *ReconcileInstallation) setBPFUpdatesOnFelixConfiguration(ctx context.Context, install *operatorv1.Installation, fc *v3.FelixConfiguration, reqLogger logr.Logger) (bool, error) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.