From b696c13730c09eccbefc20e6c2329dad96a2c768 Mon Sep 17 00:00:00 2001 From: Peter Brachwitz Date: Thu, 22 May 2025 21:12:25 +0200 Subject: [PATCH 1/3] Docs for Fleet advanced config in ECK (#1446) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This adds documentation for the feature implemented in https://github.com/elastic/cloud-on-k8s/pull/8623 Merge target is `eck-3.1.0` so that we can in preparation for the next ECK release merge all pertinent docs at once to main. --------- Co-authored-by: Edu González de la Herrán <25320357+eedugon@users.noreply.github.com> --- .../deploy/cloud-on-k8s/configuration-fleet.md | 17 ++++++++++++++++- .../advanced-kubernetes-managed-by-fleet.md | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/deploy-manage/deploy/cloud-on-k8s/configuration-fleet.md b/deploy-manage/deploy/cloud-on-k8s/configuration-fleet.md index 58d5ded5d2..b83032b01e 100644 --- a/deploy-manage/deploy/cloud-on-k8s/configuration-fleet.md +++ b/deploy-manage/deploy/cloud-on-k8s/configuration-fleet.md @@ -146,8 +146,23 @@ By default, every reference targets all instances in your {{es}}, {{kib}} and {{ ## Customize {{agent}} configuration [k8s-elastic-agent-fleet-configuration-custom-configuration] -In contrast to {{agents}} in standalone mode, the configuration is managed through {{fleet}}, and it cannot be defined through `config` or `configRef` elements. +In contrast to {{agents}} in standalone mode, the configuration is managed through {{fleet}}, and it cannot be defined through `config` or `configRef` elements with a few exceptions. +One of those exceptions is the configuration of providers as described in [advanced Agent configuration managed by Fleet](/reference/fleet/advanced-kubernetes-managed-by-fleet.md). When {{agent}} is managed by {{fleet}} and is orchestrated by ECK, the configuration of providers can simply be done through the `.spec.config` element in the Agent resource as of {applies_to}`stack: ga 8.13`: + +```yaml +apiVersion: agent.k8s.elastic.co/v1alpha1 +kind: Agent +metadata: + name: elastic-agent +spec: + config: + fleet: + enabled: true + providers.kubernetes: + add_resource_metadata: + deployment: true +``` ## Upgrade the {{agent}} specification [k8s-elastic-agent-fleet-configuration-upgrade-specification] diff --git a/reference/fleet/advanced-kubernetes-managed-by-fleet.md b/reference/fleet/advanced-kubernetes-managed-by-fleet.md index bf0964d6f1..ec4ecb9352 100644 --- a/reference/fleet/advanced-kubernetes-managed-by-fleet.md +++ b/reference/fleet/advanced-kubernetes-managed-by-fleet.md @@ -106,4 +106,5 @@ volumes: 1. By default the manifests for {{agent}} managed by {{fleet}} have `hostNetwork:true`. In order to support multiple installations of {{agent}}s in the same node you should set `hostNetwork:false`. See this relevant [example](https://github.com/elastic/elastic-agent/tree/main/docs/manifests/hostnetwork) as described in [{{agent}} Manifests in order to support Kube-State-Metrics Sharding](https://github.com/elastic/elastic-agent/blob/main/docs/elastic-agent-ksm-sharding.md). 2. The volume `/usr/share/elastic-agent/state` must remain mounted in [elastic-agent-managed-kubernetes.yaml](https://github.com/elastic/elastic-agent/blob/main/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml), otherwise custom config map provided above will be overwritten. +3. If {{agent}} is deployed through ECK, you can define the provider configuration in the `spec.config` field of the Kubernetes custom resource. Refer to [{{fleet}}-managed {{agent}} on ECK](/deploy-manage/deploy/cloud-on-k8s/configuration-fleet.md) for details. From 9eb86fc84aa53d3c058737b1b5e383c266dc2a38 Mon Sep 17 00:00:00 2001 From: Michael Morello Date: Thu, 3 Jul 2025 08:03:54 +0200 Subject: [PATCH 2/3] Update supported versions --- deploy-manage/deploy/cloud-on-k8s.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy-manage/deploy/cloud-on-k8s.md b/deploy-manage/deploy/cloud-on-k8s.md index 5b14687c14..74ccc3d2fb 100644 --- a/deploy-manage/deploy/cloud-on-k8s.md +++ b/deploy-manage/deploy/cloud-on-k8s.md @@ -69,8 +69,8 @@ This section outlines the supported Kubernetes and {{stack}} versions for ECK. C ECK is compatible with the following Kubernetes distributions and related technologies: -* Kubernetes 1.28-1.32 -* OpenShift 4.14-4.18 +* Kubernetes 1.29-1.33 +* OpenShift 4.15-4.19 * Google Kubernetes Engine (GKE), Azure Kubernetes Service (AKS), and Amazon Elastic Kubernetes Service (EKS) * Helm: {{eck_helm_minimum_version}}+ From 02d6b31eb55682b79ead451aa3abdb54ddbfaf9d Mon Sep 17 00:00:00 2001 From: Michael Morello Date: Thu, 3 Jul 2025 08:26:13 +0200 Subject: [PATCH 3/3] Update ECK version in docset.yml --- docset.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docset.yml b/docset.yml index ddbfd2e95b..9b78d678e0 100644 --- a/docset.yml +++ b/docset.yml @@ -275,8 +275,8 @@ subs: kib-pull: "https://github.com/elastic/kibana/pull/" stack-version: "9.0.0" ece_version: "4.0.1" - eck_version: "3.0.0" - eck_release_branch: "3.0" + eck_version: "3.1.0" + eck_release_branch: "3.1" eck_helm_minimum_version: "3.2.0" eck_resources_list: "Elasticsearch, Kibana, APM Server, Beats, Elastic Agent, Elastic Maps Server, and Logstash" eck_resources_list_short: "APM Server, Beats, Elastic Agent, Elastic Maps Server, and Logstash"