From 9a17a21252deeb77c8c21c786fb302c956563f9e Mon Sep 17 00:00:00 2001 From: Yash Tewari Date: Fri, 12 Aug 2022 00:00:35 +0530 Subject: [PATCH 1/2] 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 689aee33c923be6183267c0e45596aa8d758e6eb) # 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 --- deploy/kubernetes/elastic-agent-managed-kubernetes.yaml | 7 +++++++ .../elastic-agent-managed-daemonset.yaml | 7 +++++++ deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml | 7 +++++++ .../elastic-agent-standalone-daemonset.yaml | 7 +++++++ 4 files changed, 28 insertions(+) diff --git a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml index 748795c318c..66c42a955ef 100644 --- a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml @@ -14,7 +14,14 @@ spec: labels: app: elastic-agent spec: +<<<<<<< HEAD +======= + # Tolerations are needed to run Elastic Agent on Kubernetes control-plane nodes. + # Agents running on control-plane nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes +>>>>>>> 689aee33c (Add control-plane toleration to Agent K8S manifests. (#864)) tolerations: + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule - key: node-role.kubernetes.io/master effect: NoSchedule serviceAccountName: elastic-agent diff --git a/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml b/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml index 097d9786e03..8f24b3dfab5 100644 --- a/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml @@ -14,7 +14,14 @@ spec: labels: app: elastic-agent spec: +<<<<<<< HEAD +======= + # Tolerations are needed to run Elastic Agent on Kubernetes control-plane nodes. + # Agents running on control-plane nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes +>>>>>>> 689aee33c (Add control-plane toleration to Agent K8S manifests. (#864)) tolerations: + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule - key: node-role.kubernetes.io/master effect: NoSchedule serviceAccountName: elastic-agent diff --git a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml index 1aff977d342..d30ec29353d 100644 --- a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml @@ -559,7 +559,14 @@ spec: labels: app: elastic-agent-standalone spec: +<<<<<<< HEAD +======= + # Tolerations are needed to run Elastic Agent on Kubernetes control-plane nodes. + # Agents running on control-plane nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes +>>>>>>> 689aee33c (Add control-plane toleration to Agent K8S manifests. (#864)) tolerations: + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule - key: node-role.kubernetes.io/master effect: NoSchedule serviceAccountName: elastic-agent-standalone diff --git a/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml b/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml index 2a0f23107f1..98697fce037 100644 --- a/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml @@ -14,7 +14,14 @@ spec: labels: app: elastic-agent-standalone spec: +<<<<<<< HEAD +======= + # Tolerations are needed to run Elastic Agent on Kubernetes control-plane nodes. + # Agents running on control-plane nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes +>>>>>>> 689aee33c (Add control-plane toleration to Agent K8S manifests. (#864)) tolerations: + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule - key: node-role.kubernetes.io/master effect: NoSchedule serviceAccountName: elastic-agent-standalone From 2120dfa689610750a5102f92608ec2770aa8e75f Mon Sep 17 00:00:00 2001 From: Pier-Hugues Pellerin Date: Wed, 17 Aug 2022 09:47:18 -0400 Subject: [PATCH 2/2] Fix conflict to 8.3 --- deploy/kubernetes/elastic-agent-managed-kubernetes.yaml | 3 --- .../elastic-agent-managed/elastic-agent-managed-daemonset.yaml | 3 --- deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml | 3 --- .../elastic-agent-standalone-daemonset.yaml | 3 --- 4 files changed, 12 deletions(-) diff --git a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml index 66c42a955ef..8b8ef3dd83a 100644 --- a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml @@ -14,11 +14,8 @@ spec: labels: app: elastic-agent spec: -<<<<<<< HEAD -======= # Tolerations are needed to run Elastic Agent on Kubernetes control-plane nodes. # Agents running on control-plane nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes ->>>>>>> 689aee33c (Add control-plane toleration to Agent K8S manifests. (#864)) tolerations: - key: node-role.kubernetes.io/control-plane effect: NoSchedule diff --git a/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml b/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml index 8f24b3dfab5..748cec0f3bf 100644 --- a/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml @@ -14,11 +14,8 @@ spec: labels: app: elastic-agent spec: -<<<<<<< HEAD -======= # Tolerations are needed to run Elastic Agent on Kubernetes control-plane nodes. # Agents running on control-plane nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes ->>>>>>> 689aee33c (Add control-plane toleration to Agent K8S manifests. (#864)) tolerations: - key: node-role.kubernetes.io/control-plane effect: NoSchedule diff --git a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml index d30ec29353d..9a3e01bd5a8 100644 --- a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml @@ -559,11 +559,8 @@ spec: labels: app: elastic-agent-standalone spec: -<<<<<<< HEAD -======= # Tolerations are needed to run Elastic Agent on Kubernetes control-plane nodes. # Agents running on control-plane nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes ->>>>>>> 689aee33c (Add control-plane toleration to Agent K8S manifests. (#864)) tolerations: - key: node-role.kubernetes.io/control-plane effect: NoSchedule diff --git a/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml b/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml index 98697fce037..fef6683040d 100644 --- a/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml @@ -14,11 +14,8 @@ spec: labels: app: elastic-agent-standalone spec: -<<<<<<< HEAD -======= # Tolerations are needed to run Elastic Agent on Kubernetes control-plane nodes. # Agents running on control-plane nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes ->>>>>>> 689aee33c (Add control-plane toleration to Agent K8S manifests. (#864)) tolerations: - key: node-role.kubernetes.io/control-plane effect: NoSchedule