Skip to content

Update k8s autodiscover metadata in nodes earlier#29289

Merged
ChrsMark merged 10 commits intoelastic:masterfrom
ChrsMark:pod-node-watcher
Dec 9, 2021
Merged

Update k8s autodiscover metadata in nodes earlier#29289
ChrsMark merged 10 commits intoelastic:masterfrom
ChrsMark:pod-node-watcher

Conversation

@ChrsMark
Copy link
Copy Markdown
Member

@ChrsMark ChrsMark commented Dec 6, 2021 •
edited by andrewkroh
Loading

What does this PR do?

Node metadata is used by autodiscover to include it in events or
to generate autodiscover hints for the pods in the node.

This change watches explicitly for changes in nodes to update these
metadata immediately instead of waiting for full resyncs.

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.

Related issues

@ChrsMark
Update k8s autodiscover metadata in nodes earlier
4a49f8f 
Nodes metadata is used by autodiscover to include it in events or
to generate autodiscover hints for the pods in the node.

This change watches explicitly for changes in nodes to update this
metadata instead of waiting for resyncs.

Signed-off-by: chrismark <chrismarkou92@gmail.com>
@ChrsMark ChrsMark added the Team:Integrations Label for the Integrations team label Dec 6, 2021
@ChrsMark ChrsMark self-assigned this Dec 6, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Dec 6, 2021

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Dec 6, 2021
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Dec 6, 2021

This pull request does not have a backport label. Could you fix it @ChrsMark? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Dec 6, 2021
@ChrsMark
Add changelog
5033bba 
Signed-off-by: chrismark <chrismarkou92@gmail.com>
@ChrsMark
Copy link
Copy Markdown
Member Author

ChrsMark commented Dec 6, 2021

/package

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Dec 6, 2021

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 pod-node-watcher upstream/pod-node-watcher
git merge upstream/master
git push upstream pod-node-watcher

@ChrsMark ChrsMark requested review from MichaelKatsoulis, jsoriano and tetianakravchenko and removed request for jsoriano December 7, 2021 09:37
@ChrsMark
Initialise addResourceMetadata in all places
a2bbca0 
Signed-off-by: chrismark <chrismarkou92@gmail.com>
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Dec 7, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 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: 2021-12-09T12:02:25.477+0000

  • Duration: 158 min 34 sec

  • Commit: 20ef0f0

Test stats 🧪

Test Results
Failed 0
Passed 48593
Skipped 4276
Total 52869

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

@ChrsMark
Copy link
Copy Markdown
Member Author

ChrsMark commented Dec 7, 2021

/package

@ChrsMark
Fix machine-id back
ec3f6c9 
Signed-off-by: chrismark <chrismarkou92@gmail.com>
@ChrsMark
remove extra initialisation
2798e05 
Signed-off-by: chrismark <chrismarkou92@gmail.com>
@ChrsMark
fmt
8fe9393 
Signed-off-by: chrismark <chrismarkou92@gmail.com>
@ChrsMark
Copy link
Copy Markdown
Member Author

ChrsMark commented Dec 7, 2021

/package

tetianakravchenko
tetianakravchenko approved these changes Dec 7, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@tetianakravchenko tetianakravchenko left a comment

Choose a reason for hiding this comment

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

LGTM!

@ChrsMark
fix tests
31d088b 
Signed-off-by: chrismark <chrismarkou92@gmail.com>
@ChrsMark
fix tests
2d83a37 
Signed-off-by: chrismark <chrismarkou92@gmail.com>
@ChrsMark
Copy link
Copy Markdown
Member Author

ChrsMark commented Dec 7, 2021

/package

jsoriano
jsoriano approved these changes Dec 7, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@jsoriano jsoriano left a comment

Choose a reason for hiding this comment

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

👍

@ChrsMark
Copy link
Copy Markdown
Member Author

ChrsMark commented Dec 9, 2021

/package

@ChrsMark ChrsMark merged commit 7afc4e1 into elastic:master Dec 9, 2021
@Evgenikk Evgenikk mentioned this pull request May 12, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jsoriano jsoriano jsoriano approved these changes

@MichaelKatsoulis MichaelKatsoulis MichaelKatsoulis approved these changes

@tetianakravchenko tetianakravchenko tetianakravchenko approved these changes

Assignees

@ChrsMark ChrsMark

Labels

backport-skip Skip notification from the automated backport with mergify Team:Integrations Label for the Integrations team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[Kubernetes] Leverage higher's resource updates to keep metadata and hints-based configurations in sync

5 participants

@ChrsMark @elasticmachine @jsoriano @MichaelKatsoulis @tetianakravchenko