From 07bfb18cc83e0df7697cbe8590c8998371e9172d Mon Sep 17 00:00:00 2001 From: MichaelKatsoulis Date: Wed, 7 Jul 2021 15:22:10 +0300 Subject: [PATCH 1/3] Update agent managed manifest to include enrollment token variable --- deploy/kubernetes/elastic-agent-managed-kubernetes.yaml | 5 ++++- .../elastic-agent-managed-daemonset.yaml | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml index dc9fd86e6af8..954b9b50a23d 100644 --- a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml @@ -28,10 +28,13 @@ spec: value: "1" # Set to true in case of insecure or unverified HTTP - name: FLEET_INSECURE - value: false + value: "false" # The ip:port pair of fleet server - name: FLEET_URL value: "https://fleet-server:8220" + # If left empty KIBANA_HOST, KIBANA_FLEET_USERNAME, KIBANA_FLEET_PASSWORD are needed + - name: FLEET_ENROLLMENT_TOKEN + value: "token" - name: KIBANA_HOST value: "http://kibana:5601" - name: KIBANA_FLEET_USERNAME 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 0efd907a84d2..7289ea5fe879 100644 --- a/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml @@ -26,12 +26,15 @@ spec: env: - name: FLEET_ENROLL value: "1" - # Set to true in case of insecure or unverified HTTP + # Set to true in case of insecure or unverified HTTP - name: FLEET_INSECURE - value: false + value: "false" # The ip:port pair of fleet server - name: FLEET_URL value: "https://fleet-server:8220" + # If left empty KIBANA_HOST, KIBANA_FLEET_USERNAME, KIBANA_FLEET_PASSWORD are needed + - name: FLEET_ENROLLMENT_TOKEN + value: "token" - name: KIBANA_HOST value: "http://kibana:5601" - name: KIBANA_FLEET_USERNAME From 8db12f3b5f17331a3b7382e64ca6cf80ab2186d2 Mon Sep 17 00:00:00 2001 From: MichaelKatsoulis Date: Wed, 7 Jul 2021 16:05:44 +0300 Subject: [PATCH 2/3] Update variables default values --- deploy/kubernetes/elastic-agent-managed-kubernetes.yaml | 4 ++-- .../elastic-agent-managed-daemonset.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml index 954b9b50a23d..cd21273d5dd5 100644 --- a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml @@ -28,13 +28,13 @@ spec: value: "1" # Set to true in case of insecure or unverified HTTP - name: FLEET_INSECURE - value: "false" + value: "true" # The ip:port pair of fleet server - name: FLEET_URL value: "https://fleet-server:8220" # If left empty KIBANA_HOST, KIBANA_FLEET_USERNAME, KIBANA_FLEET_PASSWORD are needed - name: FLEET_ENROLLMENT_TOKEN - value: "token" + value: "" - name: KIBANA_HOST value: "http://kibana:5601" - name: KIBANA_FLEET_USERNAME 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 7289ea5fe879..bd058e47d663 100644 --- a/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml @@ -28,13 +28,13 @@ spec: value: "1" # Set to true in case of insecure or unverified HTTP - name: FLEET_INSECURE - value: "false" + value: "true" # The ip:port pair of fleet server - name: FLEET_URL value: "https://fleet-server:8220" # If left empty KIBANA_HOST, KIBANA_FLEET_USERNAME, KIBANA_FLEET_PASSWORD are needed - name: FLEET_ENROLLMENT_TOKEN - value: "token" + value: "" - name: KIBANA_HOST value: "http://kibana:5601" - name: KIBANA_FLEET_USERNAME From f110191992bd44e21ad71ae1abb1a643c1a7f4a8 Mon Sep 17 00:00:00 2001 From: MichaelKatsoulis Date: Wed, 7 Jul 2021 16:07:17 +0300 Subject: [PATCH 3/3] Fix linting --- deploy/kubernetes/elastic-agent-managed-kubernetes.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml index cd21273d5dd5..4f70a5c61bff 100644 --- a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml @@ -26,7 +26,7 @@ spec: env: - name: FLEET_ENROLL value: "1" - # Set to true in case of insecure or unverified HTTP + # Set to true in case of insecure or unverified HTTP - name: FLEET_INSECURE value: "true" # The ip:port pair of fleet server