Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[receiver/k8scluster] add support for observing resources for a specific namespace #35727

Merged
merged 50 commits into from
Nov 18, 2024
Merged

[receiver/k8scluster] add support for observing resources for a specific namespace #35727

merged 50 commits into from
Nov 18, 2024

Conversation

bacherfl
Copy link
Contributor

@bacherfl bacherfl commented Oct 10, 2024 •
edited
Loading

Description

This PR extends the k8scluster receiver with an option to limit the observed resources to a specific namespace.

Link to tracking issue

Fixes #9401

Testing

added unit and e2e tests

Documentation

Added section about how to make use of Roles and RoleBindings instead of ClusterRoles and ClusterRoleBindings

bacherfl added 12 commits October 10, 2024 13:45
@bacherfl
add namespace to role binding
5b9c6ac 
Signed-off-by: Florian Bacher <[email protected]>
@bacherfl
adapt test expectations
46d11fd 
Signed-off-by: Florian Bacher <[email protected]>
@bacherfl
revert accidental change
dc3b2f3 
Signed-off-by: Florian Bacher <[email protected]>
@bacherfl
omit cluster scoped observers if namespace filter is set
1b53fa0 
Signed-off-by: Florian Bacher <[email protected]>
@bacherfl
[revert when done] - adapt test setup to run locally
e18f4e5 
Signed-off-by: Florian Bacher <[email protected]>
@bacherfl
Merge branch 'main' into feat/9401/namespaced-cluster-receiver
873b489
@bacherfl
Merge branch 'feat/9401/namespaced-cluster-receiver' of https://githu…
fd62f43 
…b.com/bacherfl/opentelemetry-collector-contrib into feat/9401/namespaced-cluster-receiver
@bacherfl
fix informer setup
a2990f3 
Signed-off-by: Florian Bacher <[email protected]>
@bacherfl
update expected metrics
c8b1f29 
Signed-off-by: Florian Bacher <[email protected]>
@bacherfl
do not try to observe cluster resource quotas when namespace limit ha…
f94b075 
…s been specified

Signed-off-by: Florian Bacher <[email protected]>
@bacherfl
extend readme and add changelog entry
b0710fb 
Signed-off-by: Florian Bacher <[email protected]>
@bacherfl
add resourcequota access to role
3fa57f5 
Signed-off-by: Florian Bacher <[email protected]>
@bacherfl bacherfl marked this pull request as ready for review October 17, 2024 11:49
@bacherfl bacherfl requested a review from a team as a code owner October 17, 2024 11:49
ChrsMark
ChrsMark reviewed Nov 7, 2024
View reviewed changes
Copy link
Member

@ChrsMark ChrsMark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's wait for #36235 to get merged and re-base this one. Meanwhile I'm a bit worried about the changes to the existing tests.

@bacherfl
Copy link
Contributor Author

bacherfl commented Nov 7, 2024

Let's wait for #36235 to get merged and re-base this one. Meanwhile I'm a bit worried about the changes to the existing tests.

agree, i did some changes in the meantime and got the tests working on this PR, but some changes may have been unneccessary - I will try out everything after rebasing and keep the changes as minimal as possible

TylerHelmuth pushed a commit that referenced this pull request Nov 7, 2024
@ChrsMark
[receiver/k8scluster] Fix e2e tests by limiting jobs/pods of cronjob …
3458d51 
…to 1 (#36235)

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description
Fixes what was described at
#35727 (comment).

After
#36114
the `k8scluster` receiver's e2e tests started showing some flakiness
([example](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/11701936581/job/32589392145)).

With this change we ensure that only 1 active job/pod of the cronjob
will be present for the whole lifetime of the test to avoid hitting
timing/scheduling related flakiness.

@bacherfl could you also take a look here?

<!-- Issue number (e.g. #1234) or full URL to issue, if applicable. -->
#### Link to tracking issue
Fixes 

<!--Describe what testing was performed and which tests were added.-->
#### Testing

<!--Describe the documentation added.-->
#### Documentation

<!--Please delete paragraphs that you did not use before submitting.-->

Signed-off-by: ChrsMark <[email protected]>
pull bot pushed a commit to abaguas/opentelemetry-collector-contrib that referenced this pull request Nov 7, 2024
@ChrsMark @pull
[receiver/k8scluster] Fix e2e tests by limiting jobs/pods of cronjob …
5d238cf 
…to 1 (open-telemetry#36235)

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description
Fixes what was described at
open-telemetry#35727 (comment).

After
open-telemetry#36114
the `k8scluster` receiver's e2e tests started showing some flakiness
([example](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/11701936581/job/32589392145)).

With this change we ensure that only 1 active job/pod of the cronjob
will be present for the whole lifetime of the test to avoid hitting
timing/scheduling related flakiness.

@bacherfl could you also take a look here?

<!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. -->
#### Link to tracking issue
Fixes 

<!--Describe what testing was performed and which tests were added.-->
#### Testing

<!--Describe the documentation added.-->
#### Documentation

<!--Please delete paragraphs that you did not use before submitting.-->

Signed-off-by: ChrsMark <[email protected]>
@bacherfl
Merge branch 'main' into feat/9401/namespaced-cluster-receiver
ca738c1 
# Conflicts:
#	receiver/k8sclusterreceiver/testdata/e2e/cluster-scoped/expected.yaml
@bacherfl
revert changes to test logic
c1810ec 
Signed-off-by: Florian Bacher <[email protected]>
@bacherfl
extract common helper functions
4a673dc 
Signed-off-by: Florian Bacher <[email protected]>
@bacherfl
Copy link
Contributor Author

bacherfl commented Nov 8, 2024

Alright this should now be ready again - @ChrsMark I reverted the changes I made earlier in the waitForData function as it turned out with the recent fix being merged they were not required anymore

ChrsMark
ChrsMark approved these changes Nov 8, 2024
View reviewed changes
Copy link
Member

@ChrsMark ChrsMark left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Left a nit comment. Thank's @bacherfl!

(it will need a make generate to make the CI happy)

receiver/k8sclusterreceiver/e2e_test.go Show resolved Hide resolved
@ChrsMark ChrsMark added the ready to merge Code review completed; ready to merge by maintainers label Nov 18, 2024
@ChrsMark
Copy link
Member

@TylerHelmuth that should be good to go

@TylerHelmuth TylerHelmuth merged commit ec784fb into open-telemetry:main Nov 18, 2024
158 checks passed
@github-actions github-actions bot added this to the next release milestone Nov 18, 2024
RutvikS-crest pushed a commit to RutvikS-crest/opentelemetry-collector-contrib that referenced this pull request Dec 9, 2024
@bacherfl @TylerHelmuth
@evan-bradley @RutvikS-crest
[receiver/k8scluster] add support for observing resources for a speci…
52f7f20 
…fic namespace (open-telemetry#35727)

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description

This PR extends the k8scluster receiver with an option to limit the
observed resources to a specific namespace.

<!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. -->
#### Link to tracking issue
Fixes open-telemetry#9401 

<!--Describe what testing was performed and which tests were added.-->
#### Testing

added unit and e2e tests

<!--Describe the documentation added.-->
#### Documentation

Added section about how to make use of Roles and RoleBindings instead of
ClusterRoles and ClusterRoleBindings

---------

Signed-off-by: Florian Bacher <[email protected]>
Co-authored-by: Tyler Helmuth <[email protected]>
Co-authored-by: Evan Bradley <[email protected]>
sbylica-splunk pushed a commit to sbylica-splunk/opentelemetry-collector-contrib that referenced this pull request Dec 17, 2024
@ChrsMark @sbylica-splunk
[receiver/k8scluster] Fix e2e tests by limiting jobs/pods of cronjob …
1d8a1ed 
…to 1 (open-telemetry#36235)

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description
Fixes what was described at
open-telemetry#35727 (comment).

After
open-telemetry#36114
the `k8scluster` receiver's e2e tests started showing some flakiness
([example](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/11701936581/job/32589392145)).

With this change we ensure that only 1 active job/pod of the cronjob
will be present for the whole lifetime of the test to avoid hitting
timing/scheduling related flakiness.

@bacherfl could you also take a look here?

<!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. -->
#### Link to tracking issue
Fixes 

<!--Describe what testing was performed and which tests were added.-->
#### Testing

<!--Describe the documentation added.-->
#### Documentation

<!--Please delete paragraphs that you did not use before submitting.-->

Signed-off-by: ChrsMark <[email protected]>
sbylica-splunk pushed a commit to sbylica-splunk/opentelemetry-collector-contrib that referenced this pull request Dec 17, 2024
@bacherfl @TylerHelmuth
@evan-bradley @sbylica-splunk
[receiver/k8scluster] add support for observing resources for a speci…
f947c0d 
…fic namespace (open-telemetry#35727)

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description

This PR extends the k8scluster receiver with an option to limit the
observed resources to a specific namespace.

<!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. -->
#### Link to tracking issue
Fixes open-telemetry#9401 

<!--Describe what testing was performed and which tests were added.-->
#### Testing

added unit and e2e tests

<!--Describe the documentation added.-->
#### Documentation

Added section about how to make use of Roles and RoleBindings instead of
ClusterRoles and ClusterRoleBindings

---------

Signed-off-by: Florian Bacher <[email protected]>
Co-authored-by: Tyler Helmuth <[email protected]>
Co-authored-by: Evan Bradley <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@povilasv povilasv povilasv approved these changes

@TylerHelmuth TylerHelmuth TylerHelmuth approved these changes

@ChrsMark ChrsMark ChrsMark approved these changes

@dmitryax dmitryax Awaiting requested review from dmitryax dmitryax is a code owner

Assignees

@TylerHelmuth TylerHelmuth

Labels
ready to merge Code review completed; ready to merge by maintainers receiver/k8scluster
Projects
None yet
Milestone
v0.114.0
Development

Successfully merging this pull request may close these issues.

k8sclusterreceiver: Fetch namespace scoped metrics from the Master API
5 participants
@bacherfl @ChrsMark @TylerHelmuth @povilasv @evan-bradley