Skip to content

Commit 7e7c348

Browse files
Cleanup for fleet automation vs manual install steps (#33198)
* Cleanup for fleet automation vs manual install steps * Update _index.md --------- Co-authored-by: cecilia saixue wat-kim <[email protected]>
1 parent 85c8c8d commit 7e7c348

File tree

1 file changed

+11
-113
lines changed

1 file changed

+11
-113
lines changed

content/en/containers/kubernetes/_index.md

Lines changed: 11 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -49,126 +49,22 @@ You can install the Agent using either the [Datadog Operator][4] or Helm chart b
4949
{{< img src="agent/basic_agent_usage/agent_install_k8.png" alt="In-app installation steps for the Datadog Agent on Kubernetes." style="width:90%;">}}
5050

5151

52-
The Datadog Operator flow installs the Datadog Operator and uses Custom Resources to configure observability coverage.
52+
The Datadog Operator flow installs the Datadog Operator and uses Custom Resources to configure your observability coverage.
5353

54-
The Helm Chart flow installs the Agent using DaemonSet and offers similar toggles for observability features.
54+
The Helm Chart flow installs the Datadog components more directly and offers similar toggles for observability features.
55+
56+
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.
5557

5658
See [Supported Versions][6] for the full list of Kubernetes versions supported by the Datadog Agent.
5759

5860

5961
### Manual installation
6062

61-
For manually install your Agent on Kubernetes, follow the [Manually install and configure the Datadog Agent with a DaemonSet][7]
62-
63-
64-
For Agent commands, see the Agent Commands guides. For information on the Datadog Cluster Agent, see Cluster Agent for Kubernetes.
65-
66-
<div class="alert alert-info">
67-
68-
<code>&lt;CLUSTER_NAME&gt;</code> allows you to scope hosts and Cluster Checks. This unique name must be dot-separated tokens and abide by the following restrictions:
69-
<ul>
70-
<li/>Must only contain lowercase letters, numbers, and hyphens
71-
<li/>Must start with a letter
72-
<li/>Must end with a number or a letter
73-
<li/>Must be less than or equal to 80 characters
74-
</ul>
75-
</div>
76-
77-
<br>
78-
79-
## Additional configuration
80-
### Unprivileged installation
81-
82-
{{< tabs >}}
83-
{{% tab "Datadog Operator" %}}
84-
To run an unprivileged installation, add the following to `datadog-agent.yaml`:
85-
86-
{{< highlight yaml "hl_lines=13-18" >}}
87-
apiVersion: datadoghq.com/v2alpha1
88-
kind: DatadogAgent
89-
metadata:
90-
name: datadog
91-
spec:
92-
global:
93-
clusterName: <CLUSTER_NAME>
94-
site: <DATADOG_SITE>
95-
credentials:
96-
apiSecret:
97-
secretName: datadog-secret
98-
keyName: api-key
99-
agent:
100-
config:
101-
securityContext:
102-
runAsUser: <USER_ID>
103-
supplementalGroups:
104-
- <GROUP_ID>
105-
{{< /highlight >}}
106-
107-
- Replace `<USER_ID>` with the UID to run the Datadog Agent. Datadog recommends [setting this value to 100 since Datadog Agent v7.48+][1].
108-
- Replace `<GROUP_ID>` with the group ID that owns the Docker or containerd socket.
109-
110-
[1]: /data_security/kubernetes/#running-container-as-root-user
111-
112-
Then, deploy the Agent:
113-
114-
```shell
115-
kubectl apply -f datadog-agent.yaml
116-
```
117-
118-
{{% /tab %}}
119-
{{% tab "Helm" %}}
120-
To run an unprivileged installation, add the following to your `datadog-values.yaml` file:
121-
122-
{{< highlight yaml "hl_lines=4-7" >}}
123-
datadog:
124-
apiKeyExistingSecret: datadog-secret
125-
site: <DATADOG_SITE>
126-
securityContext:
127-
runAsUser: <USER_ID>
128-
supplementalGroups:
129-
- <GROUP_ID>
130-
{{< /highlight >}}
131-
132-
- Replace `<USER_ID>` with the UID to run the Datadog Agent.
133-
- Replace `<GROUP_ID>` with the group ID that owns the Docker or containerd socket.
134-
135-
Then, deploy the Agent:
136-
137-
```shell
138-
helm install datadog-agent -f datadog-values.yaml datadog/datadog
139-
```
140-
141-
{{% /tab %}}
142-
{{< /tabs >}}
143-
144-
145-
### Select container registries
146-
147-
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:
148-
149-
- `public.ecr.aws/datadog` (recommended for deploying the Agent in an AWS environment)
150-
- `datadoghq.azurecr.io`
151-
- `docker.io/datadog` (can be subject to rate limits unless a Docker Hub customer)
152-
153-
154-
### Uninstall
155-
63+
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.
15664

157-
{{< tabs >}}
158-
{{% tab "Datadog Operator" %}}
159-
```shell
160-
kubectl delete datadogagent datadog
161-
helm delete datadog-operator
162-
```
65+
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].
16366

164-
This command deletes all Kubernetes resources created by installing Datadog Operator and deploying the Datadog Agent.
165-
{{% /tab %}}
166-
{{% tab "Helm" %}}
167-
```shell
168-
helm uninstall datadog-agent
169-
```
170-
{{% /tab %}}
171-
{{< /tabs >}}
67+
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].
17268

17369
{{< whatsnext desc="This section includes the following topics:">}}
17470
{{< nextlink href="/agent/kubernetes/installation">}}<u>Installation</u>: Install the Datadog Agent in a Kubernetes environment.{{< /nextlink >}}
@@ -193,5 +89,7 @@ helm uninstall datadog-agent
19389
[3]: /containers/cluster_agent/
19490
[4]: https://docs.datadoghq.com/containers/datadog_operator/
19591
[5]: https://app.datadoghq.com/fleet/install-agent/latest?platform=kubernetes
196-
[6]: https://docs.datadoghq.com/agent/supported_platforms/?tab=cloudandcontainers
197-
[7]: https://docs.datadoghq.com/containers/guide/kubernetes_daemonset/
92+
[6]: /containers/kubernetes/installation?tab=datadogoperator#minimum-kubernetes-and-datadog-agent-versions
93+
[7]: /containers/kubernetes/installation
94+
[8]: https://docs.datadoghq.com/containers/guide/kubernetes_daemonset/
95+
[9]: /agent/configuration/agent-commands/

0 commit comments

Comments
 (0)