Set DNS trusted servers using FelixConfig instead of FELIX_ env var #2700
Conversation
This file contains 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
For Rancher and OpenShift the operator needs to set a non-default value for DNS trusted servers, and it was previously doing that by setting a FELIX_ env var in the node daemonset. But that makes it impossible for any further tweaks to that using FelixConfiguration - because FelixConfiguration settings are always overridden by FELIX_ env vars. To allow later tweaks, change the operator to create or patch FelixConfiguration instead. References: https://tigera.atlassian.net/browse/RS-897 https://tigera.atlassian.net/browse/EV-3193
nelljerram
added
kind/bug
|
I think the CI failure is unrelated. Will wait for review feedback, in case there are other issues to address, before hitting Rerun. |
caseydavenport
approved these changes
Jun 30, 2023
There was a problem hiding this comment.
LGTM - I really like the common helper for performing FC patches. Thanks @nelljerram!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
For Rancher and OpenShift the operator needs to set a non-default value for DNS trusted servers, and it was previously doing that by setting a FELIX_ env var in the node daemonset. But that makes it impossible for any further tweaks to that using FelixConfiguration - because FelixConfiguration settings are always overridden by FELIX_ env vars.
To allow later tweaks, change the operator to create or patch FelixConfiguration instead.
References:
https://tigera.atlassian.net/browse/RS-897
https://tigera.atlassian.net/browse/EV-3193
Description
For PR author
make gen-filesmake gen-versionsFor PR reviewers
A note for code reviewers - all pull requests must have the following:
kind/bugif this is a bugfix.kind/enhancementif this is a a new feature.enterpriseif this PR applies to Calico Enterprise only.