Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions charts/datadog/templates/_container-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,9 @@
- name: kubelet-cert-volume
mountPath: /certs
{{- end }}
- name: agent-cluster-ca
mountPath: /etc/datadog-agent/agent-cluster-ca
readOnly: true
{{- if .Values.agents.volumeMounts }}
{{ toYaml .Values.agents.volumeMounts | indent 4 }}
{{- end }}
Expand Down
3 changes: 3 additions & 0 deletions charts/datadog/templates/_container-otel-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@
{{- if .Values.datadog.kubelet.hostCAPath }}
{{ include "datadog.kubelet.volumeMount" . | indent 4 }}
{{- end }}
- name: agent-cluster-ca
mountPath: /etc/datadog-agent/agent-cluster-ca
readOnly: true
{{- if .Values.agents.volumeMounts }}
{{ toYaml .Values.agents.volumeMounts | indent 4 }}
{{- end }}
Expand Down
3 changes: 3 additions & 0 deletions charts/datadog/templates/_container-process-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@
{{- if .Values.datadog.kubelet.hostCAPath }}
{{ include "datadog.kubelet.volumeMount" . | indent 4 }}
{{- end }}
- name: agent-cluster-ca
mountPath: /etc/datadog-agent/agent-cluster-ca
readOnly: true
{{- if .Values.agents.volumeMounts }}
{{ toYaml .Values.agents.volumeMounts | indent 4 }}
{{- end }}
Expand Down
3 changes: 3 additions & 0 deletions charts/datadog/templates/_container-security-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@
readOnly: true
{{- end }}
{{- end }}
- name: agent-cluster-ca
mountPath: /etc/datadog-agent/agent-cluster-ca
readOnly: true
{{- if .Values.agents.volumeMounts }}
{{ toYaml .Values.agents.volumeMounts | indent 4 }}
{{- end }}
Expand Down
3 changes: 3 additions & 0 deletions charts/datadog/templates/_container-system-probe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@
mountPath: {{ .Values.datadog.systemProbe.btfPath }}
readOnly: true
{{- end }}
- name: agent-cluster-ca
mountPath: /etc/datadog-agent/agent-cluster-ca
readOnly: true
{{- if .Values.agents.volumeMounts }}
{{ toYaml .Values.agents.volumeMounts | indent 4 }}
{{- end }}
Expand Down
3 changes: 3 additions & 0 deletions charts/datadog/templates/_container-trace-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@
readOnly: false # Need RW for UDS APM socket
{{- end }}
{{- end }}
- name: agent-cluster-ca
mountPath: /etc/datadog-agent/agent-cluster-ca
readOnly: true
{{- include "container-crisocket-volumemounts" . | nindent 4 }}
{{- end }}
{{- include "container-cloudinit-volumemounts" . | nindent 4 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,9 @@ spec:
- name: config
mountPath: {{ template "datadog.confPath" . }}
readOnly: false # Need RW for config path
- name: agent-cluster-ca
mountPath: /etc/datadog-agent/agent-cluster-ca
readOnly: true
{{- if eq (include "should-mount-fips-configmap" .) "true" }}
{{- include "linux-container-fips-proxy-cfg-volumemount" . | indent 10 }}
{{- end }}
Expand All @@ -229,6 +232,9 @@ spec:
{{- $startup := .Values.clusterChecksRunner.startupProbe }}
{{ include "probe.http" (dict "settings" $startup "path" "/startup" "port" $healthPort) | indent 10 }}
volumes:
- name: agent-cluster-ca
secret:
secretName: datadog-agent-cluster-ca-secret
- name: installinfo
configMap:
name: {{ include "agents-install-info-configmap-name" . }}
Expand Down
6 changes: 6 additions & 0 deletions charts/datadog/templates/cluster-agent-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,9 @@ spec:
- name: tmpdir
mountPath: /tmp
readOnly: false
- name: agent-cluster-ca
mountPath: /etc/datadog-agent/agent-cluster-ca
readOnly: true
- name: installinfo
subPath: install_info
{{- if eq .Values.targetSystem "windows" }}
Expand Down Expand Up @@ -471,6 +474,9 @@ spec:
- name: config
mountPath: /etc/datadog-agent
volumes:
- name: agent-cluster-ca
secret:
secretName: datadog-agent-cluster-ca-secret
- name: datadogrun
emptyDir: {}
- name: varlog
Expand Down
3 changes: 3 additions & 0 deletions charts/datadog/templates/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,9 @@ spec:
{{ include "system-probe-init" . | nindent 6 }}
{{- end }}
volumes:
- name: agent-cluster-ca
secret:
secretName: datadog-agent-cluster-ca-secret
{{- if (not .Values.providers.gke.autopilot) }}
- name: auth-token
emptyDir: {}
Expand Down
13 changes: 13 additions & 0 deletions charts/datadog/templates/secret-ipc-ca.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{{- $cn := printf "%s-root-ca" .Release.Name -}}
{{- $ca := genCA $cn 3650 -}}
apiVersion: v1
kind: Secret
metadata:
name: datadog-agent-cluster-ca-secret
namespace: {{ .Release.Namespace }}
labels:
{{ include "datadog.labels" . | indent 4 }}
type: kubernetes.io/tls
data:
tls.crt: {{ $ca.Cert | b64enc | quote }}
tls.key: {{ $ca.Key | b64enc | quote }}
Loading