Skip to content

Commit

Permalink
align resource names (#76)
Browse files Browse the repository at this point in the history
  • Loading branch information
ahmed-mez committed Apr 17, 2020
1 parent 17f2aec commit d50ae02
Show file tree
Hide file tree
Showing 16 changed files with 110 additions and 109 deletions.
14 changes: 7 additions & 7 deletions docs/cluster_agent_setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ To deploy the Cluster Agent along with the Agent, update the current `DatadogAge
apiVersion: datadoghq.com/v1alpha1
kind: DatadogAgent
metadata:
name: datadog-agent
name: datadog
spec:
# Credentials to communicate between:
# * Agents and Datadog (API/APP key)
Expand Down Expand Up @@ -40,19 +40,19 @@ Then apply it with:

```shell
$ kubectl apply -n $DD_NAMESPACE -f datadog-agent-with-clusteragent.yaml
datadogagent.datadoghq.com/datadog-agent configured
datadogagent.datadoghq.com/datadog configured
```

Verify that the Agent and Cluster Agent are correctly running:

```shell
$ kubectl get -n $DD_NAMESPACE dd datadog-agent
$ kubectl get -n $DD_NAMESPACE dd datadog
NAME ACTIVE AGENT CLUSTER-AGENT CLUSTER-CHECKS-RUNNER AGE
datadog-agent True Running (2/2/2) Running (2/2/2) 6m

$ kubectl get -n $DD_NAMESPACE deployment datadog-agent-cluster-agent
$ kubectl get -n $DD_NAMESPACE deployment datadog-cluster-agent
NAME READY UP-TO-DATE AVAILABLE AGE
datadog-agent-cluster-agent 2/2 2 2 21s
datadog-cluster-agent 2/2 2 2 21s
```

The "datadog-agent" `DaemonSet` has also been updated to get the new configuration for using the `Cluster-Agent` deployment pods.
Expand All @@ -63,8 +63,8 @@ NAME READY STATUS RESTARTS AGE
datadog-operator-6f49889b99-vlscz 1/1 Running 0 15h
datadog-agent-22x44 1/1 Running 0 40s
datadog-agent-665dr 1/1 Running 0 50s
datadog-agent-cluster-agent-9f9c5c4c-2v9f7 1/1 Running 0 58s
datadog-agent-cluster-agent-9f9c5c4c-pmhqb 1/1 Running 0 58s
datadog-cluster-agent-9f9c5c4c-2v9f7 1/1 Running 0 58s
datadog-cluster-agent-9f9c5c4c-pmhqb 1/1 Running 0 58s
datadog-agent-hjlbg 1/1 Running 0 33s
```

Expand Down
4 changes: 2 additions & 2 deletions docs/custom_check.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Once the `ConfigMaps` are configured, a `DatadogAgent` resource can be created t
apiVersion: datadoghq.com/v1alpha1
kind: DatadogAgent
metadata:
name: datadog-agent
name: datadog
spec:
credentials:
apiKey: "<DATADOG_API_KEY>"
Expand Down Expand Up @@ -132,7 +132,7 @@ Additional user-configured volumes can be mounted in either the node or Cluster
apiVersion: datadoghq.com/v1alpha1
kind: DatadogAgent
metadata:
name: datadog-agent
name: datadog
spec:
credentials:
apiKey: "<DATADOG_API_KEY>"
Expand Down
16 changes: 8 additions & 8 deletions docs/getting_started.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ The following [`datadog-agent.yaml` file][7] is the simplest configuration for t
apiVersion: datadoghq.com/v1alpha1
kind: DatadogAgent
metadata:
name: datadog-agent
name: datadog
spec:
credentials:
apiKey: "<DATADOG_API_KEY>"
Expand All @@ -67,13 +67,13 @@ Replace `<DATADOG_API_KEY>` and `<DATADOG_APP_KEY>` with your [Datadog API and a

```shell
$ kubectl apply -n $DD_NAMESPACE -f datadog-agent.yaml
datadogagent.datadoghq.com/datadog-agent created
datadogagent.datadoghq.com/datadog created
```

You can check the state of the `DatadogAgent` ressource with:

```shell
kubectl get -n $DD_NAMESPACE dd datadog-agent
kubectl get -n $DD_NAMESPACE dd datadog
NAME ACTIVE AGENT CLUSTER-AGENT CLUSTER-CHECKS-RUNNER AGE
datadog-agent True Running (2/2/2) 110m
```
Expand All @@ -100,7 +100,7 @@ Update your [`datadog-agent.yaml` file][9] with the following configuration to a
apiVersion: datadoghq.com/v1alpha1
kind: DatadogAgent
metadata:
name: datadog-agent
name: datadog
spec:
credentials:
apiKey: "<DATADOG_API_KEY>"
Expand All @@ -117,7 +117,7 @@ Apply this new configuration:

```shell
$ kubectl apply -f datadog-agent.yaml
datadogagent.datadoghq.com/datadog-agent updated
datadogagent.datadoghq.com/datadog updated
```

The DaemonSet update can be validated by looking at the new desired pod value:
Expand All @@ -137,11 +137,11 @@ datadog-agent-zvdbw 1/1 Running 0 8m1s

## Cleanup

The following command deletes all the Kubernetes resources created by the Datadog Operator and the linked `DatadogAgent` `datadog-agent`.
The following command deletes all the Kubernetes resources created by the Datadog Operator and the linked `DatadogAgent` `datadog`.

```shell
$ kubectl delete -n $DD_NAMESPACE datadogagent datadog-agent
datadogagent.datadoghq.com/datadog-agent deleted
$ kubectl delete -n $DD_NAMESPACE datadogagent datadog
datadogagent.datadoghq.com/datadog deleted
```

You can then remove the Datadog-Operator with the `helm delete` command:
Expand Down
2 changes: 1 addition & 1 deletion examples/datadog-agent-all.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: datadoghq.com/v1alpha1
kind: DatadogAgent
metadata:
name: datadog-agent
name: datadog
spec:
credentials:
apiKey: <DATADOG_API_KEY>
Expand Down
2 changes: 1 addition & 1 deletion examples/datadog-agent-with-clusteragent.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: datadoghq.com/v1alpha1
kind: DatadogAgent
metadata:
name: datadog-agent
name: datadog
spec:
credentials:
apiKey: <DATADOG_API_KEY>
Expand Down
2 changes: 1 addition & 1 deletion examples/datadog-agent-with-dca-clusterchecksrunner.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: datadoghq.com/v1alpha1
kind: DatadogAgent
metadata:
name: datadog-agent
name: datadog
spec:
credentials:
apiKey: <DATADOG_API_KEY>
Expand Down
2 changes: 1 addition & 1 deletion examples/datadog-agent-with-tolerations.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: datadoghq.com/v1alpha1
kind: DatadogAgent
metadata:
name: datadog-agent
name: datadog
spec:
credentials:
apiKey: <DATADOG_API_KEY>
Expand Down
2 changes: 1 addition & 1 deletion examples/datadog-agent.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: datadoghq.com/v1alpha1
kind: DatadogAgent
metadata:
name: datadog-agent
name: datadog
spec:
credentials:
apiKey: <DATADOG_API_KEY>
Expand Down

0 comments on commit d50ae02

Please sign in to comment.