From df21c4c24e4dfcb919b88da82eb5261e001e23bf Mon Sep 17 00:00:00 2001 From: Tetiana Kravchenko Date: Thu, 14 Jul 2022 10:19:54 +0200 Subject: [PATCH] remove comment for FLEET_ENROLLMENT_TOKEN; use Needed everywhere instead of Required Signed-off-by: Tetiana Kravchenko --- deploy/kubernetes/elastic-agent-managed-kubernetes.yaml | 3 +-- .../elastic-agent-managed-daemonset.yaml | 7 +++---- deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml | 2 +- .../elastic-agent-standalone-daemonset.yaml | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml index dac78fabe8c..788867248d6 100644 --- a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml @@ -38,7 +38,6 @@ spec: # Fleet Server URL to enroll the Elastic Agent into - name: FLEET_URL value: "https://fleet-server:8220" - # The token to use for Fleet enrollment # If FLEET_ENROLLMENT_TOKEN is empty then KIBANA_HOST, KIBANA_FLEET_USERNAME, KIBANA_FLEET_PASSWORD are needed - name: FLEET_ENROLLMENT_TOKEN value: "" @@ -225,7 +224,7 @@ rules: - jobs - cronjobs verbs: [ "get", "list", "watch" ] - # Required for apiserver + # Needed for apiserver - nonResourceURLs: - "/metrics" verbs: 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 8de92942aa6..f8443ed01f7 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,7 @@ spec: labels: app: elastic-agent spec: - # To run Elastic Agent on master nodes + # Tolerations are needed to run Elastic Agent on master nodes. # Agents running on master nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes tolerations: - key: node-role.kubernetes.io/master @@ -35,11 +35,10 @@ spec: # Set to true to communicate with Fleet with either insecure HTTP or unverified HTTPS - name: FLEET_INSECURE value: "true" - # URL to enroll the Fleet Server into + # Fleet Server URL to enroll the Elastic Agent into - name: FLEET_URL value: "https://fleet-server:8220" - # The token to use for Fleet enrollment - # If left empty KIBANA_HOST, KIBANA_FLEET_USERNAME, KIBANA_FLEET_PASSWORD are needed + # If FLEET_ENROLLMENT_TOKEN is empty then KIBANA_HOST, KIBANA_FLEET_USERNAME, KIBANA_FLEET_PASSWORD are needed - name: FLEET_ENROLLMENT_TOKEN value: "" - name: KIBANA_HOST diff --git a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml index f4f4b0f6cae..9ec2f5d86c9 100644 --- a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml @@ -809,7 +809,7 @@ rules: - nodes/stats verbs: - get - # Required for apiserver + # Needed for apiserver - nonResourceURLs: - "/metrics" verbs: 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 b457cd7c97b..0bf131ec8ea 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,7 @@ spec: labels: app: elastic-agent-standalone spec: - # To run Elastic Agent on Kubernetes master nodes + # Tolerations are needed to run Elastic Agent on Kubernetes master nodes. # Agents running on master nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes tolerations: - key: node-role.kubernetes.io/master