From 3a327746df27165cc65cef35f732443bcbf2d2e4 Mon Sep 17 00:00:00 2001 From: Devin Young Date: Tue, 17 Oct 2023 13:18:09 -0400 Subject: [PATCH] add support for initContainer volume mounts (#1183) --- charts/datadog/CHANGELOG.md | 4 ++++ charts/datadog/Chart.yaml | 2 +- charts/datadog/README.md | 3 ++- charts/datadog/templates/_containers-init-linux.yaml | 3 +++ charts/datadog/templates/_containers-init-windows.yaml | 3 +++ charts/datadog/values.yaml | 2 ++ 6 files changed, 15 insertions(+), 2 deletions(-) diff --git a/charts/datadog/CHANGELOG.md b/charts/datadog/CHANGELOG.md index cbbf99a14..e990435ca 100644 --- a/charts/datadog/CHANGELOG.md +++ b/charts/datadog/CHANGELOG.md @@ -1,5 +1,9 @@ # Datadog changelog +## 3.40.1 + +* Add support for initContainer volume mounts + ## 3.40.0 * Default `Agent` and `Cluster-Agent` to `7.48.0` version. diff --git a/charts/datadog/Chart.yaml b/charts/datadog/Chart.yaml index 6e44209af..944e22441 100644 --- a/charts/datadog/Chart.yaml +++ b/charts/datadog/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: datadog -version: 3.40.0 +version: 3.40.1 appVersion: "7" description: Datadog Agent keywords: diff --git a/charts/datadog/README.md b/charts/datadog/README.md index 5c82c9382..74765ec82 100644 --- a/charts/datadog/README.md +++ b/charts/datadog/README.md @@ -1,6 +1,6 @@ # Datadog -![Version: 3.40.0](https://img.shields.io/badge/Version-3.40.0-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square) +![Version: 3.40.1](https://img.shields.io/badge/Version-3.40.1-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square) [Datadog](https://www.datadoghq.com/) is a hosted infrastructure monitoring platform. This chart adds the Datadog Agent to all nodes in your cluster via a DaemonSet. It also optionally depends on the [kube-state-metrics chart](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-state-metrics). For more information about monitoring Kubernetes with Datadog, please refer to the [Datadog documentation website](https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/). @@ -411,6 +411,7 @@ helm install \ | agents.containers.agent.securityContext | object | `{}` | Allows you to overwrite the default container SecurityContext for the agent container. | | agents.containers.initContainers.resources | object | `{}` | Resource requests and limits for the init containers | | agents.containers.initContainers.securityContext | object | `{}` | Allows you to overwrite the default container SecurityContext for the init containers. | +| agents.containers.initContainers.volumeMounts | list | `[]` | Specify additional volumes to mount for the init containers | | agents.containers.processAgent.env | list | `[]` | Additional environment variables for the process-agent container | | agents.containers.processAgent.envDict | object | `{}` | Set environment variables specific to process-agent defined in a dict | | agents.containers.processAgent.envFrom | list | `[]` | Set environment variables specific to process-agent from configMaps and/or secrets | diff --git a/charts/datadog/templates/_containers-init-linux.yaml b/charts/datadog/templates/_containers-init-linux.yaml index 98f3ea5e5..089555505 100644 --- a/charts/datadog/templates/_containers-init-linux.yaml +++ b/charts/datadog/templates/_containers-init-linux.yaml @@ -53,6 +53,9 @@ subPath: system-probe.yaml readOnly: true {{- end }} + {{- if .Values.agents.containers.initContainers.volumeMounts }} + {{ toYaml .Values.agents.containers.initContainers.volumeMounts | nindent 4 }} + {{- end }} env: {{- include "containers-common-env" . | nindent 4 }} {{- if and (eq (include "cluster-agent-enabled" .) "false") .Values.datadog.leaderElection }} diff --git a/charts/datadog/templates/_containers-init-windows.yaml b/charts/datadog/templates/_containers-init-windows.yaml index f0477faa6..ddd9beda9 100644 --- a/charts/datadog/templates/_containers-init-windows.yaml +++ b/charts/datadog/templates/_containers-init-windows.yaml @@ -45,6 +45,9 @@ readOnly: true {{- end }} {{- include "container-crisocket-volumemounts" . | nindent 4 }} + {{- if .Values.agents.containers.initContainers.volumeMounts }} + {{ toYaml .Values.agents.containers.initContainers.volumeMounts | nindent 4 }} + {{- end }} env: {{- include "containers-common-env" . | nindent 4 }} resources: diff --git a/charts/datadog/values.yaml b/charts/datadog/values.yaml index 4826fbd99..dc0daf340 100644 --- a/charts/datadog/values.yaml +++ b/charts/datadog/values.yaml @@ -1576,6 +1576,8 @@ agents: # memory: 200Mi # agents.containers.initContainers.securityContext -- Allows you to overwrite the default container SecurityContext for the init containers. securityContext: {} + # agents.containers.initContainers.volumeMounts -- Specify additional volumes to mount for the init containers + volumeMounts: [] # agents.volumes -- Specify additional volumes to mount in the dd-agent container volumes: []