inherit nodeReporterPort from felixconfig #1227
Merged
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
tmjd
reviewed
Mar 12, 2021
ozdanborne
force-pushed
the
configurable-noderporter-port
branch
from
53ba19c
to
e492dff
Compare
tmjd
reviewed
Mar 15, 2021
|
|
||
| if nodeReporterMetricsPort == 0 { | ||
| err := errors.New("felixConfiguration prometheusReporterPort=0 not supported") | ||
| r.SetDegraded("", err, reqLogger) |
There was a problem hiding this comment.
I think we need to have something in the 1st field because that is the Degraded "reason", I think saying "Invalid metrics port" would work and you can keep the error message as you have it.
ozdanborne
force-pushed
the
configurable-noderporter-port
branch
from
66738d5
to
babde82
Compare
tmjd
added
enterprise
5 tasks
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.
Description
Some of our users are setting the PrometheusReporterPort in FelixConfiguration (Enterprise) to prevent port conflicts with other services on their hosts. That felixconfig option gets overwritten by the env var Operator sets.
This PR enables Operator to check if the value is set in the FelixConfiguration and use that value instead of its hardcoded default.
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.