Remove metrics logic from cmd/anisble-operator/main.go#3466
Merged
bharathi-tenneti merged 3 commits intooperator-framework:masterfrom Jul 21, 2020
Merged
Remove metrics logic from cmd/anisble-operator/main.go#3466bharathi-tenneti merged 3 commits intooperator-framework:masterfrom
bharathi-tenneti merged 3 commits intooperator-framework:masterfrom
Conversation
joelanford
requested changes
Jul 20, 2020
Member
joelanford
left a comment
joelanford
left a comment
There was a problem hiding this comment.
We can also remove these lines, I think:
operator-sdk/internal/scaffold/role.go
Lines 329 to 356 in 6a36023
Comment on lines
+80
to
+86
| # header_text "verify that the metrics endpoint exists (Port 8686)" | ||
| # if ! timeout 1m bash -c -- "until kubectl run --attach --rm --restart=Never test-metrics --image=$metrics_test_image -- curl -sfo /dev/null http://memcached-operator-metrics:8686/metrics; do sleep 1; done"; | ||
| # then | ||
| # error_text "FAIL: Failed to verify that metrics endpoint exists" | ||
| # operator_logs | ||
| # exit 1 | ||
| # fi |
Member
There was a problem hiding this comment.
This can be fully removed since port 8686 is only for the legacy kube-state-metrics stuff that's being removed.
| # exit 1 | ||
| # fi | ||
|
|
||
| # header_text "verify that the metrics endpoint exists (Port 8383)" |
Member
There was a problem hiding this comment.
Add a TODO here to add a --metrics-addr flag to the ansible operator and default it to 8080.
See #3440
Once we have an equivalent PR merged for ansible, we'll need to update this port to be 8080.
| exit 1 | ||
| fi | ||
| # header_text "verify that metrics reflect cr creation" | ||
| # if ! timeout 60s bash -c -- "until kubectl run --attach --rm --restart=Never test-metrics --image=$metrics_test_image -- curl -sf http://memcached-operator-metrics:8686/metrics | grep example-memcached; do sleep 1; done"; |
Member
There was a problem hiding this comment.
Since the metric is now on 8383 via the instrumented handler:
Suggested change
| # if ! timeout 60s bash -c -- "until kubectl run --attach --rm --restart=Never test-metrics --image=$metrics_test_image -- curl -sf http://memcached-operator-metrics:8686/metrics | grep example-memcached; do sleep 1; done"; | |
| # if ! timeout 60s bash -c -- "until kubectl run --attach --rm --restart=Never test-metrics --image=$metrics_test_image -- curl -sf http://memcached-operator-metrics:8383/metrics | grep example-memcached; do sleep 1; done"; |
92 tasks
joelanford
approved these changes
Jul 21, 2020
bharathi-tenneti
force-pushed
the
ansible-metrics
branch
from
e1f9e1b to
92181b0
Compare
|
New changes are detected. LGTM label has been removed. |
fabianvf
approved these changes
Jul 21, 2020
Member
fabianvf
left a comment
fabianvf
left a comment
There was a problem hiding this comment.
LGTM, though it needs a rebase
| breaking: true | ||
| migration: | ||
| header: Remove legacy metrics generation code from cmd/ansible-operator/main.go, and tests/e2e-anisble.sh checks for servicemonitor. | ||
| body: TBD No newline at end of file |
bharathi-tenneti
force-pushed
the
ansible-metrics
branch
from
92181b0 to
dd55394
Compare
openshift-ci-robot
added
the
needs-rebase
bharathi-tenneti
force-pushed
the
ansible-metrics
branch
from
dd55394 to
d69ae93
Compare
openshift-ci-robot
removed
the
needs-rebase
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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: Remove kubemetrics package reference logic from cmd/ansible-operator/main.go.
Remove corresponding checks from hack/tests/e2e-ansible.sh
Motivation: Now that we have handler to setup metrics on primary resources using handler.InstrumentedEnqueueRequestForObject{}, we do not separate KubeMetrics to setup metrics.