Skip to content

Commit b7d892b

Browse files
L3n41cL3n41c
committed
Regenerate the sample k8s manifests
Regenerate datadog-agent-windows-all-features from Helm chart
1 parent 1826973 commit b7d892b

File tree

2 files changed

+162
-29
lines changed

2 files changed

+162
-29
lines changed

‎static/resources/yaml/datadog-agent-windows-all-features.yaml

Lines changed: 144 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,54 @@
1+
# Source: datadog/templates/secrets.yaml
2+
# API Key
3+
apiVersion: v1
4+
kind: Secret
5+
metadata:
6+
name: datadog-agent
7+
labels: {}
8+
type: Opaque
9+
data:
10+
api-key: PUT_YOUR_BASE64_ENCODED_API_KEY_HERE
11+
12+
# APP Key
13+
---
14+
# Source: datadog/templates/install_info-configmap.yaml
15+
apiVersion: v1
16+
kind: ConfigMap
17+
metadata:
18+
name: datadog-agent-installinfo
19+
labels: {}
20+
annotations:
21+
checksum/install_info: 0b4b93ab3a64d6b6dd8f6b9954ef7628e2faf03f1c6b5a0145077b1f281d21bc
22+
data:
23+
install_info: |
24+
---
25+
install_method:
26+
tool: kubernetes sample manifests
27+
tool_version: kubernetes sample manifests
28+
installer_version: kubernetes sample manifests
29+
---
30+
# Source: datadog/templates/daemonset.yaml
131
apiVersion: apps/v1
232
kind: DaemonSet
333
metadata:
4-
name: datadog-agent-windows
34+
name: datadog-agent
35+
labels: {}
536
spec:
637
selector:
738
matchLabels:
8-
app: datadog-agent-windows
39+
app: datadog-agent
940
template:
1041
metadata:
1142
labels:
12-
app: datadog-agent-windows
13-
name: datadog-agent-windows
43+
app: datadog-agent
44+
name: datadog-agent
45+
annotations: {}
1446
spec:
1547
containers:
1648
- name: agent
17-
image: "datadog/agent:latest"
18-
imagePullPolicy: Always
19-
command: ["agent", "start"]
49+
image: "datadog/agent:7.23.0"
50+
imagePullPolicy: IfNotPresent
51+
command: ["agent", "run"]
2052
resources: {}
2153
ports:
2254
- containerPort: 8125
@@ -26,18 +58,26 @@ spec:
2658
- name: DD_API_KEY
2759
valueFrom:
2860
secretKeyRef:
29-
name: "datadog-agent-windows"
61+
name: "datadog-agent"
3062
key: api-key
3163
- name: DD_KUBERNETES_KUBELET_HOST
3264
valueFrom:
3365
fieldRef:
3466
fieldPath: status.hostIP
3567
- name: KUBERNETES
3668
value: "yes"
69+
- name: DD_AC_EXCLUDE
70+
value: "name:datadog-agent"
71+
- name: DOCKER_HOST
72+
value: npipe:////./pipe/docker_engine
3773
- name: DD_LOG_LEVEL
3874
value: "INFO"
3975
- name: DD_DOGSTATSD_PORT
4076
value: "8125"
77+
- name: DD_LEADER_ELECTION
78+
value: "true"
79+
- name: DD_COLLECT_KUBERNETES_EVENTS
80+
value: "true"
4181
- name: DD_APM_ENABLED
4282
value: "false"
4383
- name: DD_LOGS_ENABLED
@@ -49,6 +89,8 @@ spec:
4989
- name: DD_HEALTH_PORT
5090
value: "5555"
5191
volumeMounts:
92+
- name: config
93+
mountPath: C:/ProgramData/Datadog
5294
- name: runtimesocket
5395
mountPath: \\.\pipe\docker_engine
5496
- name: pointerdir
@@ -62,21 +104,27 @@ spec:
62104
livenessProbe:
63105
failureThreshold: 6
64106
httpGet:
65-
path: /health
107+
path: /live
66108
port: 5555
109+
scheme: HTTP
110+
initialDelaySeconds: 15
111+
periodSeconds: 15
112+
successThreshold: 1
113+
timeoutSeconds: 5
114+
readinessProbe:
115+
failureThreshold: 6
116+
httpGet:
117+
path: /ready
118+
port: 5555
119+
scheme: HTTP
67120
initialDelaySeconds: 15
68121
periodSeconds: 15
69122
successThreshold: 1
70123
timeoutSeconds: 5
71124
- name: trace-agent
72-
image: "datadog/agent:latest"
73-
imagePullPolicy: Always
74-
command:
75-
[
76-
"trace-agent",
77-
"-foreground",
78-
"-config=C:/ProgramData/Datadog/datadog.yaml",
79-
]
125+
image: "datadog/agent:7.23.0"
126+
imagePullPolicy: IfNotPresent
127+
command: ["trace-agent", "-foreground", "-config=C:/ProgramData/Datadog/datadog.yaml"]
80128
resources: {}
81129
ports:
82130
- containerPort: 8126
@@ -87,14 +135,18 @@ spec:
87135
- name: DD_API_KEY
88136
valueFrom:
89137
secretKeyRef:
90-
name: "datadog-agent-windows"
138+
name: "datadog-agent"
91139
key: api-key
92140
- name: DD_KUBERNETES_KUBELET_HOST
93141
valueFrom:
94142
fieldRef:
95143
fieldPath: status.hostIP
96144
- name: KUBERNETES
97145
value: "yes"
146+
- name: DD_AC_EXCLUDE
147+
value: "name:datadog-agent"
148+
- name: DOCKER_HOST
149+
value: npipe:////./pipe/docker_engine
98150
- name: DD_LOG_LEVEL
99151
value: "INFO"
100152
- name: DD_APM_ENABLED
@@ -103,40 +155,98 @@ spec:
103155
value: "true"
104156
- name: DD_APM_RECEIVER_PORT
105157
value: "8126"
158+
volumeMounts:
159+
- name: config
160+
mountPath: C:/ProgramData/Datadog
161+
- name: runtimesocket
162+
mountPath: \\.\pipe\docker_engine
106163
livenessProbe:
107164
initialDelaySeconds: 15
108165
periodSeconds: 15
109166
tcpSocket:
110167
port: 8126
111168
timeoutSeconds: 5
112169
- name: process-agent
113-
image: "datadog/agent:latest"
114-
imagePullPolicy: Always
115-
command:
116-
[
117-
"process-agent",
118-
"-foreground",
119-
"-config=C:/ProgramData/Datadog/datadog.yaml",
120-
]
170+
image: "datadog/agent:7.23.0"
171+
imagePullPolicy: IfNotPresent
172+
command: ["process-agent", "-foreground", "-config=C:/ProgramData/Datadog/datadog.yaml"]
121173
resources: {}
122174
env:
123175
- name: DD_API_KEY
124176
valueFrom:
125177
secretKeyRef:
126-
name: "datadog-agent-windows"
178+
name: "datadog-agent"
127179
key: api-key
128180
- name: DD_KUBERNETES_KUBELET_HOST
129181
valueFrom:
130182
fieldRef:
131183
fieldPath: status.hostIP
132184
- name: KUBERNETES
133185
value: "yes"
186+
- name: DD_AC_EXCLUDE
187+
value: "name:datadog-agent"
188+
- name: DOCKER_HOST
189+
value: npipe:////./pipe/docker_engine
190+
- name: DD_PROCESS_AGENT_ENABLED
191+
value: "true"
134192
- name: DD_LOG_LEVEL
135193
value: "INFO"
194+
- name: DD_ORCHESTRATOR_EXPLORER_ENABLED
195+
value: "false"
136196
volumeMounts:
197+
- name: config
198+
mountPath: C:/ProgramData/Datadog
137199
- name: runtimesocket
138200
mountPath: \\.\pipe\docker_engine
201+
initContainers:
202+
- name: init-volume
203+
image: "datadog/agent:7.23.0"
204+
imagePullPolicy: IfNotPresent
205+
command: ["pwsh", "-Command"]
206+
args:
207+
- |
208+
Copy-Item -Recurse -Force C:/ProgramData/Datadog C:/Temp
209+
Copy-Item -Force C:/Temp/install_info/install_info C:/Temp/Datadog/install_info
210+
volumeMounts:
211+
- name: config
212+
mountPath: C:/Temp/Datadog
213+
- name: installinfo
214+
mountPath: C:/Temp/install_info
215+
resources: {}
216+
- name: init-config
217+
image: "datadog/agent:7.23.0"
218+
imagePullPolicy: IfNotPresent
219+
command: ["pwsh", "-Command"]
220+
args:
221+
- Get-ChildItem 'entrypoint-ps1' | ForEach-Object { & $_.FullName if (-Not $?) { exit 1 } }
222+
volumeMounts:
223+
- name: config
224+
mountPath: C:/ProgramData/Datadog
225+
- name: runtimesocket
226+
mountPath: \\.\pipe\docker_engine
227+
env:
228+
- name: DD_API_KEY
229+
valueFrom:
230+
secretKeyRef:
231+
name: "datadog-agent"
232+
key: api-key
233+
- name: DD_KUBERNETES_KUBELET_HOST
234+
valueFrom:
235+
fieldRef:
236+
fieldPath: status.hostIP
237+
- name: KUBERNETES
238+
value: "yes"
239+
- name: DD_AC_EXCLUDE
240+
value: "name:datadog-agent"
241+
- name: DOCKER_HOST
242+
value: npipe:////./pipe/docker_engine
243+
resources: {}
139244
volumes:
245+
- name: installinfo
246+
configMap:
247+
name: datadog-agent-installinfo
248+
- name: config
249+
emptyDir: {}
140250
- hostPath:
141251
path: \\.\pipe\docker_engine
142252
name: runtimesocket
@@ -154,10 +264,15 @@ spec:
154264
key: node.kubernetes.io/os
155265
value: windows
156266
operator: Equal
157-
serviceAccountName: datadog-agent-windows
267+
affinity: {}
268+
serviceAccountName: "datadog-agent"
158269
nodeSelector:
159270
kubernetes.io/os: windows
160271
updateStrategy:
161272
rollingUpdate:
162273
maxUnavailable: 10%
163-
type: RollingUpdate
274+
type: RollingUpdate
275+
276+
# Source: datadog/templates/containers-common-env.yaml
277+
# The purpose of this template is to define a minimal set of environment
278+
# variables required to operate dedicated containers in the daemonset

‎static/resources/yaml/datadog-agent-windows-all-features_values.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
targetSystem: windows
2+
datadog:
3+
kubeStateMetricsEnabled: false
4+
leaderElection: true
5+
collectEvents: true
6+
logs:
7+
enabled: true
8+
containerCollectAll: true
9+
acExclude: "name:datadog-agent"
10+
apm:
11+
enabled: true
12+
processAgent:
13+
enabled: true
14+
processCollection: true
15+
agents:
16+
rbac:
17+
create: false
18+
serviceAccountName: datadog-agent

0 commit comments

Comments
 (0)