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.

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

[8.6](backport #33763) Use NamespaceAwareResourceMetaGenerator for all generic kubernetes resources #33986

Merged
merged 3 commits into from
Dec 8, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 7, 2022

This is an automatic backport of pull request #33763 done by Mergify.
Cherry-pick of 951b244 has failed:

On branch mergify/bp/8.6/pr-33763
Your branch is up to date with 'origin/8.6'.

You are currently cherry-picking commit 951b244e0e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   NOTICE.txt
	modified:   go.sum
	modified:   metricbeat/docs/modules/kubernetes.asciidoc
	modified:   metricbeat/metricbeat.reference.yml
	modified:   metricbeat/module/kubernetes/_meta/config.reference.yml
	modified:   metricbeat/module/kubernetes/_meta/config.yml
	modified:   metricbeat/module/kubernetes/util/kubernetes.go
	modified:   metricbeat/modules.d/kubernetes.yml.disabled
	modified:   x-pack/metricbeat/metricbeat.reference.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…sources (#33763)

* update elastic-agent-autodiscover; use NamespaceAwareResourceMetaGenerator for all generic kubernetes resources

Signed-off-by: Tetiana Kravchenko <[email protected]>

* update configuration comments

Signed-off-by: Tetiana Kravchenko <[email protected]>

* add PR number; fix conflicts

Signed-off-by: Tetiana Kravchenko <[email protected]>

* run make notice

Signed-off-by: Tetiana Kravchenko <[email protected]>

* fix go.sum file after rebase

Signed-off-by: Tetiana Kravchenko <[email protected]>

* make update

Signed-off-by: Tetiana Kravchenko <[email protected]>

* clean up changelog

Signed-off-by: Tetiana Kravchenko <[email protected]>

* test llc

Signed-off-by: Tetiana Kravchenko <[email protected]>

* revert local test

Signed-off-by: Tetiana Kravchenko <[email protected]>

Signed-off-by: Tetiana Kravchenko <[email protected]>
(cherry picked from commit 951b244)

# Conflicts:
#	go.mod
@mergify mergify bot requested review from a team as code owners December 7, 2022 13:13
@mergify mergify bot requested review from belimawr and faec and removed request for a team December 7, 2022 13:13
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 7, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 7, 2022
@botelastic
Copy link

botelastic bot commented Dec 7, 2022

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

elasticmachine commented Dec 7, 2022

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-12-08T10:59:41.710+0000

  • Duration: 128 min 56 sec

Test stats 🧪

Test Results
Failed 0
Passed 24445
Skipped 1802
Total 26247

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify
Copy link
Contributor Author

mergify bot commented Dec 7, 2022

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.6/pr-33763 upstream/mergify/bp/8.6/pr-33763
git merge upstream/8.6
git push upstream mergify/bp/8.6/pr-33763

@mergify
Copy link
Contributor Author

mergify bot commented Dec 8, 2022

This pull request has not been merged yet. Could you please review and merge it @tetianakravchenko? 🙏

@sonarcloud
Copy link

sonarcloud bot commented Dec 8, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@tetianakravchenko
Copy link
Contributor

failing E2E test is fleet_ubuntu_22_04_amd64_upgrade_agent - doesn't seem to be related to this PR.

linter errors - similar to #33763 (comment), seems to be an linter issue: linter for the same PR backported to 8.5 - does not give any errors

@tetianakravchenko tetianakravchenko merged commit f405fbc into 8.6 Dec 8, 2022
@tetianakravchenko tetianakravchenko deleted the mergify/bp/8.6/pr-33763 branch December 8, 2022 16:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants