From 1395a30b24cc56b98ee44047b4e01fdafa77a989 Mon Sep 17 00:00:00 2001 From: JacksonDavenport Date: Fri, 5 Dec 2025 15:08:49 -0800 Subject: [PATCH 1/2] Cleanup for fleet automation vs manual install steps --- content/en/containers/kubernetes/_index.md | 124 ++------------------- 1 file changed, 11 insertions(+), 113 deletions(-) diff --git a/content/en/containers/kubernetes/_index.md b/content/en/containers/kubernetes/_index.md index 4d99ac64322..ceb917314b2 100644 --- a/content/en/containers/kubernetes/_index.md +++ b/content/en/containers/kubernetes/_index.md @@ -49,126 +49,22 @@ You can install the Agent using either the [Datadog Operator][4] or Helm chart b {{< img src="agent/basic_agent_usage/agent_install_k8.png" alt="In-app installation steps for the Datadog Agent on Kubernetes." style="width:90%;">}} -The Datadog Operator flow installs the Datadog Operator and uses Custom Resources to configure observability coverage. +The Datadog Operator flow installs the Datadog Operator and uses Custom Resources to configure your observability coverage. -The Helm Chart flow installs the Agent using DaemonSet and offers similar toggles for observability features. +The Helm Chart flow installs the Datadog components more directly and offers similar toggles for observability features. + +Both options allow you to manage a simple configuration. Letting the Datadog Operator or Helm Chart create the Datadog Agent DaemonSet, Cluster Agent Deployment, and all their dependencies for your Kubernetes based monitoring. See [Supported Versions][6] for the full list of Kubernetes versions supported by the Datadog Agent. ### Manual installation -For manually install your Agent on Kubernetes, follow the [Manually install and configure the Datadog Agent with a DaemonSet][7] - - -For Agent commands, see the Agent Commands guides. For information on the Datadog Cluster Agent, see Cluster Agent for Kubernetes. - -
- -<CLUSTER_NAME> allows you to scope hosts and Cluster Checks. This unique name must be dot-separated tokens and abide by the following restrictions: - -
- -
- -## Additional configuration -### Unprivileged installation - -{{< tabs >}} -{{% tab "Datadog Operator" %}} -To run an unprivileged installation, add the following to `datadog-agent.yaml`: - -{{< highlight yaml "hl_lines=13-18" >}} -apiVersion: datadoghq.com/v2alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - global: - clusterName: - site: - credentials: - apiSecret: - secretName: datadog-secret - keyName: api-key -agent: - config: - securityContext: - runAsUser: - supplementalGroups: - - -{{< /highlight >}} - -- Replace `` with the UID to run the Datadog Agent. Datadog recommends [setting this value to 100 since Datadog Agent v7.48+][1]. -- Replace `` with the group ID that owns the Docker or containerd socket. - -[1]: /data_security/kubernetes/#running-container-as-root-user - -Then, deploy the Agent: - -```shell -kubectl apply -f datadog-agent.yaml -``` - -{{% /tab %}} -{{% tab "Helm" %}} -To run an unprivileged installation, add the following to your `datadog-values.yaml` file: - -{{< highlight yaml "hl_lines=4-7" >}} -datadog: - apiKeyExistingSecret: datadog-secret - site: - securityContext: - runAsUser: - supplementalGroups: - - -{{< /highlight >}} - -- Replace `` with the UID to run the Datadog Agent. -- Replace `` with the group ID that owns the Docker or containerd socket. - -Then, deploy the Agent: - -```shell -helm install datadog-agent -f datadog-values.yaml datadog/datadog -``` - -{{% /tab %}} -{{< /tabs >}} - - -### Select container registries - -The in-app UI lets you select the container image registry, defaulting to gcr.io/datadoghq. If Artifact Registry is not accessible in your deployment region, use another registry such as: - -- `public.ecr.aws/datadog` (recommended for deploying the Agent in an AWS environment) -- `datadoghq.azurecr.io` -- `docker.io/datadog` (can be subject to rate limits unless a Docker Hub customer) - - -### Uninstall - +The [in-app installation tool in Fleet Automation][5] provides a guided way to build your configurations. However if you prefer, consult the [Kubernetes installation docs][7] for steps on how to deploy and configure the Datadog Operator or Datadog Helm Chart manually in your enviornment. -{{< tabs >}} -{{% tab "Datadog Operator" %}} -```shell -kubectl delete datadogagent datadog -helm delete datadog-operator -``` +Datadog recommends to take advantage of the Datadog Operator or the Datadog Helm Chart to deploy all the Kubernetes resources for you. If you need to deploy the all the manifests directly consult the full [Kubernetes manual installation docs here][8]. -This command deletes all Kubernetes resources created by installing Datadog Operator and deploying the Datadog Agent. -{{% /tab %}} -{{% tab "Helm" %}} -```shell -helm uninstall datadog-agent -``` -{{% /tab %}} -{{< /tabs >}} +For Agent commands, see the [Agent Commands guides][9]. For information on the Datadog Cluster Agent and its role, see [Cluster Agent for Kubernetes][3]. {{< whatsnext desc="This section includes the following topics:">}} {{< nextlink href="/agent/kubernetes/installation">}}Installation: Install the Datadog Agent in a Kubernetes environment.{{< /nextlink >}} @@ -193,5 +89,7 @@ helm uninstall datadog-agent [3]: /containers/cluster_agent/ [4]: https://docs.datadoghq.com/containers/datadog_operator/ [5]: https://app.datadoghq.com/fleet/install-agent/latest?platform=kubernetes -[6]: https://docs.datadoghq.com/agent/supported_platforms/?tab=cloudandcontainers -[7]: https://docs.datadoghq.com/containers/guide/kubernetes_daemonset/ +[6]: /containers/kubernetes/installation?tab=datadogoperator#minimum-kubernetes-and-datadog-agent-versions +[7]: /containers/kubernetes/installation +[8]: https://docs.datadoghq.com/containers/guide/kubernetes_daemonset/ +[9]: /agent/configuration/agent-commands/ \ No newline at end of file From 9a1a878cad3f9b6290a63b6f8cd98932f62a8d43 Mon Sep 17 00:00:00 2001 From: cecilia saixue wat-kim Date: Tue, 9 Dec 2025 15:33:52 -0800 Subject: [PATCH 2/2] Update _index.md --- content/en/containers/kubernetes/_index.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/en/containers/kubernetes/_index.md b/content/en/containers/kubernetes/_index.md index ceb917314b2..3539a38cac9 100644 --- a/content/en/containers/kubernetes/_index.md +++ b/content/en/containers/kubernetes/_index.md @@ -53,16 +53,16 @@ The Datadog Operator flow installs the Datadog Operator and uses Custom Resource The Helm Chart flow installs the Datadog components more directly and offers similar toggles for observability features. -Both options allow you to manage a simple configuration. Letting the Datadog Operator or Helm Chart create the Datadog Agent DaemonSet, Cluster Agent Deployment, and all their dependencies for your Kubernetes based monitoring. +Both options allow you to manage a configuration: the Datadog Operator or Helm chart creates the Datadog Agent DaemonSet, Cluster Agent Deployment, and all their dependencies for your Kubernetes-based monitoring. See [Supported Versions][6] for the full list of Kubernetes versions supported by the Datadog Agent. ### Manual installation -The [in-app installation tool in Fleet Automation][5] provides a guided way to build your configurations. However if you prefer, consult the [Kubernetes installation docs][7] for steps on how to deploy and configure the Datadog Operator or Datadog Helm Chart manually in your enviornment. +The [in-app installation tool in Fleet Automation][5] provides a guided way to build your configurations. You can also see the [Kubernetes installation docs][7] for steps on how to deploy and configure the Datadog Operator or Datadog Helm chart manually in your enviornment. -Datadog recommends to take advantage of the Datadog Operator or the Datadog Helm Chart to deploy all the Kubernetes resources for you. If you need to deploy the all the manifests directly consult the full [Kubernetes manual installation docs here][8]. +Datadog recommends that you use the Datadog Operator or the Datadog Helm Chart to deploy all the Kubernetes resources for you. If you need to deploy the all the manifests directly consult the full [Kubernetes manual installation documentation][8]. For Agent commands, see the [Agent Commands guides][9]. For information on the Datadog Cluster Agent and its role, see [Cluster Agent for Kubernetes][3]. @@ -92,4 +92,4 @@ For Agent commands, see the [Agent Commands guides][9]. For information on the D [6]: /containers/kubernetes/installation?tab=datadogoperator#minimum-kubernetes-and-datadog-agent-versions [7]: /containers/kubernetes/installation [8]: https://docs.datadoghq.com/containers/guide/kubernetes_daemonset/ -[9]: /agent/configuration/agent-commands/ \ No newline at end of file +[9]: /agent/configuration/agent-commands/