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

[8.3](backport #864) Add control-plane toleration to Agent K8S manifests. #906

Merged
merged 2 commits into from
Aug 18, 2022
Merged

[8.3](backport #864) Add control-plane toleration to Agent K8S manifests. #906

merged 2 commits into from
Aug 18, 2022

Commits on Aug 11, 2022

  1. Add control-plane toleration to Agent K8S manifests. (#864) 

    * 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
    @yashtewari @mergify
    yashtewari authored and mergify[bot] committed Aug 11, 2022
    Configuration menu
    Copy the full SHA
    9a17a21 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2022

  1. Fix conflict to 8.3

    @ph
    ph committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    2120dfa View commit details
    Browse the repository at this point in the history