This repository has been archived by the owner on Dec 8, 2023. It is now read-only.
Add flag to disable annotation discovery #82
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
- Move discovery of endpoints from resources to new endpointCreator - Add unit tests for new endpointCreator - Add documentation about new config value disable_annotation_discovery [MONIT-21378](https://wavefront.atlassian.net/browse/MONIT-21378)
JSchuenke
force-pushed
the
MONIT-21378-disable-annotation-discovery
branch
from
db2aef4
to
b12b7bb
Compare
vikramraman
reviewed
Dec 17, 2020
| Containers: make([]v1.Container, 0), | ||
| } | ||
|
|
||
| got := e.discoverEndpoints(resource) |
There was a problem hiding this comment.
Curious why this discovers when the resource does not have any annotations on it (under the meta section)?
There was a problem hiding this comment.
It works because down in the encoder it assumes that we're using an annotation and then fills in all the default values when nothing is defined in meta:
func Param(meta metav1.ObjectMeta, annotation, cfgVal, defaultVal string) string {
value := ""
// give precedence to annotation
if annotation != "" {
value = meta.GetAnnotations()[annotation]
}
if value == "" {
// then config
value = cfgVal
}
if value == "" {
// then default
value = defaultVal
}
return value
}
vikramraman
reviewed
Dec 17, 2020
| func (e *endpointCreator) discoverEndpointsWithAnnotations(resource discovery.Resource) []*discovery.Endpoint { | ||
| var eps []*discovery.Endpoint | ||
| // delegate to runtime handlers if no matching delegate | ||
| if ep := e.makeEndpoint(resource, discovery.PluginConfig{Type: "prometheus", Name: "example"}); ep != nil { |
There was a problem hiding this comment.
Should probably remove the example name (just leave the name empty) since that is used to determine whether to check for annotations here:
josephgee
suggested changes
Dec 17, 2020
| Kind: discovery.PodType.String(), | ||
| IP: "0.0.0.0", | ||
| Meta: metav1.ObjectMeta{}, | ||
| Containers: make([]v1.Container, 0), |
There was a problem hiding this comment.
This resource needs an annotation on it for it to validly get skipped
vikramraman
approved these changes
Dec 17, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
MONIT-21378