Skip to content

Commit 42d8ba2

Browse files
Add control-plane toleration to Agent K8S manifests. (elastic#864) (elastic#907)
* 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) Co-authored-by: Yash Tewari <yashtewari1996@gmail.com>
1 parent c24b0ee commit 42d8ba2

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

deploy/kubernetes/elastic-agent-managed-kubernetes.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ spec:
1515
labels:
1616
app: elastic-agent
1717
spec:
18-
# Tolerations are needed to run Elastic Agent on Kubernetes master nodes.
19-
# Agents running on master nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes
18+
# Tolerations are needed to run Elastic Agent on Kubernetes control-plane nodes.
19+
# Agents running on control-plane nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes
2020
tolerations:
21+
- key: node-role.kubernetes.io/control-plane
22+
effect: NoSchedule
2123
- key: node-role.kubernetes.io/master
2224
effect: NoSchedule
2325
serviceAccountName: elastic-agent

deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ spec:
1515
labels:
1616
app: elastic-agent
1717
spec:
18-
# Tolerations are needed to run Elastic Agent on Kubernetes master nodes.
19-
# Agents running on master nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes
18+
# Tolerations are needed to run Elastic Agent on Kubernetes control-plane nodes.
19+
# Agents running on control-plane nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes
2020
tolerations:
21+
- key: node-role.kubernetes.io/control-plane
22+
effect: NoSchedule
2123
- key: node-role.kubernetes.io/master
2224
effect: NoSchedule
2325
serviceAccountName: elastic-agent

deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -640,9 +640,11 @@ spec:
640640
labels:
641641
app: elastic-agent-standalone
642642
spec:
643-
# Tolerations are needed to run Elastic Agent on Kubernetes master nodes.
644-
# Agents running on master nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes
643+
# Tolerations are needed to run Elastic Agent on Kubernetes control-plane nodes.
644+
# Agents running on control-plane nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes
645645
tolerations:
646+
- key: node-role.kubernetes.io/control-plane
647+
effect: NoSchedule
646648
- key: node-role.kubernetes.io/master
647649
effect: NoSchedule
648650
serviceAccountName: elastic-agent-standalone

deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ spec:
1414
labels:
1515
app: elastic-agent-standalone
1616
spec:
17-
# Tolerations are needed to run Elastic Agent on Kubernetes master nodes.
18-
# Agents running on master nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes
17+
# Tolerations are needed to run Elastic Agent on Kubernetes control-plane nodes.
18+
# Agents running on control-plane nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes
1919
tolerations:
20+
- key: node-role.kubernetes.io/control-plane
21+
effect: NoSchedule
2022
- key: node-role.kubernetes.io/master
2123
effect: NoSchedule
2224
serviceAccountName: elastic-agent-standalone

0 commit comments

Comments
 (0)