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.3](backport #864) Add control-plane toleration to Agent K8S manifests. #906

Merged
merged 2 commits into from
Aug 18, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 11, 2022

This is an automatic backport of pull request #864 done by Mergify.
Cherry-pick of 689aee3 has failed:

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

You are currently cherry-picking commit 689aee33c.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deploy/kubernetes/elastic-agent-managed-kubernetes.yaml
	both modified:   deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml
	both modified:   deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml
	both modified:   deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml

no changes added to commit (use "git add" and/or "git commit -a")

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

* Add toleration to elastic-agent Kubernetes manifests.

The toleration with key node-role.kubernetes.io/control-plane is set to replace
the deprecated toleration with key node-role.kubernetes.io/master which will be
removed by Kubernetes v1.25

* Remove outdated "master" node terminology.

(cherry picked from commit 689aee3)

# Conflicts:
#	deploy/kubernetes/elastic-agent-managed-kubernetes.yaml
#	deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml
#	deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml
#	deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml
@mergify mergify bot requested a review from a team as a code owner August 11, 2022 18:31
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 11, 2022
@mergify mergify bot requested review from ph and michalpristas and removed request for a team August 11, 2022 18:31
@elasticmachine
Copy link
Contributor

elasticmachine commented Aug 11, 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-08-17T13:48:09.899+0000

  • Duration: 22 min 2 sec

Test stats 🧪

Test Results
Failed 0
Passed 6089
Skipped 23
Total 6112

💚 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.

  • run integration tests : Run the Elastic Agent Integration tests.

  • run end-to-end tests : Generate the packages and run the E2E Tests.

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

@elasticmachine
Copy link
Contributor

elasticmachine commented Aug 11, 2022

🌐 Coverage report

Name Metrics % (covered/total) Diff
Packages 97.222% (70/72) 👍
Files 68.326% (151/221) 👍
Classes 68.1% (301/442) 👍
Methods 51.722% (826/1597) 👍
Lines 38.026% (8855/23287) 👍 0.013
Conditionals 100.0% (0/0) 💚

@mergify
Copy link
Contributor Author

mergify bot commented Aug 15, 2022

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

@ph
Copy link
Contributor

ph commented Aug 17, 2022

@yashtewari I've fixed the conflicts in this automatic backport, can you approve it?

@yashtewari
Copy link
Contributor

Thanks @ph! I was off sick. Approved but don't have permissions to merge here.

@ph ph merged commit bc04e48 into 8.3 Aug 18, 2022
@mergify mergify bot deleted the mergify/bp/8.3/pr-864 branch August 18, 2022 13:52
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants