Skip to content

Remove libbeat/keystore, libbeat/common/kubernetes and libbeat/common/docker#31607

Merged
kvch merged 7 commits intoelastic:mainfrom
kvch:move-keystore
May 16, 2022
Merged

Remove libbeat/keystore, libbeat/common/kubernetes and libbeat/common/docker#31607
kvch merged 7 commits intoelastic:mainfrom
kvch:move-keystore

Conversation

@kvch
Copy link
Copy Markdown
Contributor

@kvch kvch commented May 12, 2022

What does this PR do?

This PR removes libbeat/keystore and imports it from github.com/elastic/elastic-agent-libs/keystore instead. Futhermore, docker and kubernetes functions are imported from elastic-agent-autodiscover.

I am not fixing the linter issues.

Why is it important?

We no longer have to maintain the code in two places.

Checklist

  • My code follows the style guidelines of this project
    - [ ] I have commented my code, particularly in hard-to-understand areas
    - [ ] I have made corresponding changes to the documentation
    - [ ] I have made corresponding change to the default configuration files
    - [ ] I have added tests that prove my fix is effective or that my feature works
    - [ ] I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

@kvch kvch requested review from a team as code owners May 12, 2022 09:45
@kvch kvch requested review from belimawr and fearful-symmetry and removed request for a team May 12, 2022 09:45
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 12, 2022
@mergify mergify bot assigned kvch May 12, 2022
@kvch kvch marked this pull request as draft May 12, 2022 09:48
@kvch kvch mentioned this pull request May 12, 2022
Merged
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented May 12, 2022 •
edited by jenkins-beats-ci bot
Loading

❕ Build Aborted

There is a new build on-going so the previous on-going builds have been aborted.

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

Expand to view the summary

Build stats

  • Start Time: 2022-05-16T11:58:25.406+0000

  • Duration: 77 min 58 sec

Test stats 🧪

Test Results
Failed 0
Passed 351
Skipped 116
Total 467

Steps errors 3

Expand to view the steps failures

metricbeat-goIntegTest - mage goIntegTest
  • Took 30 min 7 sec . View more details here
  • Description: mage goIntegTest
metricbeat-goIntegTest - mage goIntegTest
  • Took 20 min 19 sec . View more details here
  • Description: mage goIntegTest
Error signal
  • Took 0 min 0 sec . View more details here
  • Description: Error 'org.jenkinsci.plugins.workflow.steps.FlowInterruptedException'

🤖 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!)

@jsoriano jsoriano requested a review from a team May 12, 2022 10:39
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented May 12, 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 move-keystore upstream/move-keystore
git merge upstream/main
git push upstream move-keystore

@kvch kvch marked this pull request as ready for review May 12, 2022 11:02
@kvch kvch added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label May 12, 2022
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented May 12, 2022

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label May 12, 2022
fearful-symmetry
fearful-symmetry approved these changes May 12, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@fearful-symmetry fearful-symmetry left a comment

Choose a reason for hiding this comment

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

RIP the linter.

Otherwise, changes seem good.

@kvch
Copy link
Copy Markdown
Contributor Author

kvch commented May 16, 2022

/test metricbeat

@kvch kvch merged commit 9535a58 into elastic:main May 16, 2022
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented May 16, 2022

💚 Flaky test report

Tests succeeded.

🤖 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!)

chrisberkhout pushed a commit that referenced this pull request Jun 1, 2023
@kvch @chrisberkhout
Remove libbeat/keystore, libbeat/common/kubernetes and `libbeat/c…
8fd3e56 
…ommon/docker` (#31607)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cmacknz cmacknz cmacknz approved these changes

@fearful-symmetry fearful-symmetry fearful-symmetry approved these changes

@belimawr belimawr Awaiting requested review from belimawr belimawr is a code owner automatically assigned from elastic/elastic-agent-data-plane

Assignees

@kvch kvch

Labels

Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@kvch @elasticmachine @cmacknz @fearful-symmetry