Skip to content

Commit

Permalink
Update control plane toleration. (elastic#38040)
Browse files Browse the repository at this point in the history
Signed-off-by: constanca <[email protected]>
  • Loading branch information
constanca-m authored Feb 20, 2024
1 parent b9a75c9 commit aff596a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions auditbeat/docs/running-on-kubernetes.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,17 @@ may want to change that behavior, so just edit the YAML file and modify them:
------------------------------------------------

[float]
===== Running {beatname_uc} on master nodes
===== Running {beatname_uc} on control plane nodes

Kubernetes master nodes can use https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/[taints]
to limit the workloads that can run on them. To run {beatname_uc} on master nodes you may need to
Kubernetes control plane nodes can use https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/[taints]
to limit the workloads that can run on them. To run {beatname_uc} on control plane nodes you may need to
update the Daemonset spec to include proper tolerations:

[source,yaml]
------------------------------------------------
spec:
tolerations:
- key: node-role.kubernetes.io/master
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
------------------------------------------------

Expand Down
12 changes: 6 additions & 6 deletions filebeat/docs/running-on-kubernetes.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,17 @@ in the manifest file:
------------------------------------------------

[float]
===== Running {beatname_uc} on master nodes
===== Running {beatname_uc} on control plane nodes

Kubernetes master nodes can use https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/[taints]
to limit the workloads that can run on them. To run {beatname_uc} on master nodes you may need to
Kubernetes control plane nodes can use https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/[taints]
to limit the workloads that can run on them. To run {beatname_uc} on control plane nodes you may need to
update the Daemonset spec to include proper tolerations:

[source,yaml]
------------------------------------------------
spec:
tolerations:
- key: node-role.kubernetes.io/master
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
------------------------------------------------

Expand Down Expand Up @@ -110,7 +110,7 @@ oc patch namespace kube-system -p \
----
+
This command sets the node selector for the project to an empty string. If you
don't run this command, the default node selector will skip master nodes.
don't run this command, the default node selector will skip control plane nodes.

In order to support runtime environments with Openshift (eg. CRI-O, containerd) you need to configure following path:

Expand All @@ -137,7 +137,7 @@ filebeat.autodiscover:
- /var/log/containers/*.log
----

NOTE: `/var/log/containers/\*.log` is normally a symlink to `/var/log/pods/*/*.log`,
NOTE: `/var/log/containers/\*.log` is normally a symlink to `/var/log/pods/*/*.log`,
so above paths can be edited accordingly


Expand Down
10 changes: 5 additions & 5 deletions metricbeat/docs/running-on-kubernetes.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,17 @@ in the manifest file:
------------------------------------------------

[float]
===== Running {beatname_uc} on master nodes
===== Running {beatname_uc} on control plane nodes

Kubernetes master nodes can use https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/[taints]
to limit the workloads that can run on them. To run {beatname_uc} on master nodes you may need to
Kubernetes control plane nodes can use https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/[taints]
to limit the workloads that can run on them. To run {beatname_uc} on control plane nodes you may need to
update the Daemonset spec to include proper tolerations:

[source,yaml]
------------------------------------------------
spec:
tolerations:
- key: node-role.kubernetes.io/master
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
------------------------------------------------

Expand Down Expand Up @@ -166,7 +166,7 @@ oc patch namespace kube-system -p \
----
+
This command sets the node selector for the project to an empty string. If you
don't run this command, the default node selector will skip master nodes.
don't run this command, the default node selector will skip control plane nodes.

NOTE: for openshift versions prior to the version 4.x additionally you need to modify the `DaemonSet` container spec in the manifest file to enable the container to run as privileged:
[source,yaml]
Expand Down

0 comments on commit aff596a

Please sign in to comment.