Refactor metrics merging to work with endpoints-controller #469
+837
−751
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
ndhanushkodi
requested review from
a team,
lkysow and
thisisnotashwin
and removed request for
a team
There was a problem hiding this comment.
My thoughts: I really like the direction of this refactor/cleanup!! In terms of naming, i'd migrate InjectConfiguration -> MetricsConfiguration given the specificity of the config.
I also potentially like grouping all of our requests and limits into a similar struct (not a part of this change here, but more as a future adoption of this pattern of grouping related entities into their own struct and file for readability.
|
I really like this, great work so far. Echoing a few of the naming related things Ashwin mentioned otherwise I think it's a good approach. |
ndhanushkodi
force-pushed
the
metrics-merging-on-tproxy
branch
from
d973a84
to
150750c
Compare
ndhanushkodi
changed the title
|
Thanks @thisisnotashwin and @kschoche for your feedback!! I've made edits based on this and cleaned up the PR, so re-requesting your reviews for this more final version. |
ndhanushkodi
requested review from
kschoche and
thisisnotashwin
and removed request for
lkysow
lkysow
reviewed
Apr 5, 2021
kschoche
reviewed
Apr 5, 2021
ndhanushkodi
force-pushed
the
metrics-merging-on-tproxy
branch
from
150750c
to
2466746
Compare
kschoche
reviewed
Apr 6, 2021
| fmt.Sprintf("-service-metrics-path=%s", serviceMetricsPath), | ||
| fmt.Sprintf("-merged-metrics-port=%s", metricsPorts.mergedPort), | ||
| fmt.Sprintf("-service-metrics-port=%s", metricsPorts.servicePort), | ||
| fmt.Sprintf("-service-metrics-path=%s", metricsPorts.servicePath), |
kschoche
reviewed
Apr 6, 2021
kschoche
reviewed
Apr 6, 2021
kschoche
reviewed
Apr 6, 2021
kschoche
reviewed
Apr 6, 2021
kschoche
approved these changes
Apr 6, 2021
Previously, all metrics configuration was dealt with in the mutating webhook handler. Now, since service/proxy registration happens in endpoints-controller, some of the metrics configuration needs to be used in endpoints-controller as well. There is still some functionality in the handler that also needs metrics configuration, such as adding prometheus annotations and running the consul sidecar. This refactor pulls out common configuration for metrics into a MetricsConfig struct and adds the methods for getting values from flags and annotations to that struct, so it can be commonly used between endpoints-controller and the webhook handler.
ndhanushkodi
force-pushed
the
metrics-merging-on-tproxy
branch
from
2466746
to
67d9c5f
Compare
ishustava
pushed a commit
that referenced
this pull request
Apr 14, 2021
Previously, all metrics configuration was dealt with in the mutating webhook handler. Now, since service/proxy registration happens in endpoints-controller, some of the metrics configuration needs to be used in endpoints-controller as well. There is still some functionality in the handler that also needs metrics configuration, such as adding prometheus annotations and running the consul sidecar. This refactor pulls out common configuration for metrics into a MetricsConfig struct and adds the methods for getting values from flags and annotations to that struct, so it can be commonly used between endpoints-controller and the webhook handler.
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.
Changes proposed in this PR:
Refactor metrics merging to work with endpoints-controller
Previously, all metrics configuration was dealt with in the mutating
webhook handler. Now, since service/proxy registration happens in
endpoints-controller, some of the metrics configuration needs to be used
in endpoints-controller as well. There is still some functionality in
the handler that also needs metrics configuration, such as adding
prometheus annotations and running the consul sidecar.
This refactor pulls out common configuration for metrics into a
MetricsConfiguration struct and adds the methods for getting values from
flags and annotations to that struct, so it can be commonly used between
endpoints-controller and the webhook handler.
I wasn't able to E2E test this due to consul-k8s and consul-helm being incompatible on the feature-tproxy branch. Once we make the Helm PR for feature-tproxy, we should have confidence that the acceptance tests cover the metrics merging functionality.How I've tested this PR:
How I expect reviewers to test this PR:
Checklist: