diff --git a/stable/datadog/CHANGELOG.md b/stable/datadog/CHANGELOG.md index 655a90a222..4411ed99ec 100644 --- a/stable/datadog/CHANGELOG.md +++ b/stable/datadog/CHANGELOG.md @@ -1,5 +1,10 @@ # Datadog changelog +## 2.3.16 + +* Add parameter `clusterChecksRunner.rbac.serviceAccountAnnotations` for specifying annotations for dedicated ServiceAccount for Cluster Checks runners. +* Add parameters `clusterChecksRunner.volumes` and `clusterChecksRunner.volumeMounts` that can be used for providing a secret backend to Cluster Checks runners. + ## 2.3.15 * Mount kernel headers in system-probe container diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml index 1a5e4b104a..796eaeceb6 100644 --- a/stable/datadog/Chart.yaml +++ b/stable/datadog/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: datadog -version: 2.3.15 +version: 2.3.16 appVersion: "7" description: Datadog Agent keywords: diff --git a/stable/datadog/README.md b/stable/datadog/README.md index 775f5ec0d3..089d9a9111 100644 --- a/stable/datadog/README.md +++ b/stable/datadog/README.md @@ -423,7 +423,10 @@ helm install --name \ | `clusterChecksRunner.rbac.create` | If true, create & use RBAC resources for clusterchecks agent's pods | `true` | | `clusterChecksRunner.rbac.dedicated` | If true, use dedicated RBAC resources for clusterchecks agent's pods | `false` | | `clusterChecksRunner.rbac.serviceAccount` | existing ServiceAccount to use (ignored if rbac.create=true) for clusterchecks agent's pods | `default` | +| `clusterChecksRunner.rbac.serviceAccountAnnotations` | Annotations to add to the ServiceAccount if `clusterChecksRunner.rbac.dedicated` is `true` | `{}` | | `clusterChecksRunner.strategy` | Which update strategy to deploy the Cluster Checks Deployment | RollingUpdate with 0 maxUnavailable, 1 maxSurge | +| `clusterChecksRunner.volumes` | Additional volumes for the Cluster Checks deployment | `nil` | +| `clusterChecksRunner.volumeMounts` | Additional volumeMounts for the Cluster Checks deployment | `nil` | | `clusterChecksRunner.dnsConfig` | If set, configure dnsConfig options in datadog cluster agent clusterChecks containers | `nil` | | `kube-state-metrics.rbac.create` | If true, create & use RBAC resources for kube-state-metrics | `true` | | `kube-state-metrics.serviceAccount.create` | If true, create & use serviceAccount | `true` | diff --git a/stable/datadog/ci/cluster-agent-and-worker-values.yaml b/stable/datadog/ci/cluster-agent-and-worker-values.yaml index 2bdcfcbac2..6771713b16 100644 --- a/stable/datadog/ci/cluster-agent-and-worker-values.yaml +++ b/stable/datadog/ci/cluster-agent-and-worker-values.yaml @@ -9,3 +9,13 @@ clusterAgent: clusterChecksRunner: enabled: true + + volumes: + - name: tmp + hostPath: + path: /tmp + + volumeMounts: + - name: tmp + mountPath: /etc/tmp + readOnly: true diff --git a/stable/datadog/ci/cluster-agent-and-worker-with-dedicated-rbac-values.yaml b/stable/datadog/ci/cluster-agent-and-worker-with-dedicated-rbac-values.yaml new file mode 100644 index 0000000000..5b33df3e48 --- /dev/null +++ b/stable/datadog/ci/cluster-agent-and-worker-with-dedicated-rbac-values.yaml @@ -0,0 +1,15 @@ +datadog: + apiKey: "00000000000000000000000000000000" + appKey: "0000000000000000000000000000000000000000" + clusterChecks: + enabled: true + +clusterAgent: + enabled: true + +clusterChecksRunner: + enabled: true + rbac: + dedicated: true + serviceAccountAnnotations: + "eks.amazonaws.com/role-arn": "arn:aws:iam::123456789012:role/datadog-clusterchecker" diff --git a/stable/datadog/templates/agent-clusterchecks-deployment.yaml b/stable/datadog/templates/agent-clusterchecks-deployment.yaml index 2d80e1c70d..e2ed54b653 100644 --- a/stable/datadog/templates/agent-clusterchecks-deployment.yaml +++ b/stable/datadog/templates/agent-clusterchecks-deployment.yaml @@ -103,10 +103,18 @@ spec: {{- end }} resources: {{ toYaml .Values.clusterChecksRunner.resources | indent 10 }} +{{- if .Values.clusterChecksRunner.volumeMounts }} + volumeMounts: +{{ toYaml .Values.clusterChecksRunner.volumeMounts | indent 10 }} +{{- end }} livenessProbe: {{ toYaml .Values.clusterChecksRunner.livenessProbe | indent 10 }} readinessProbe: {{ toYaml .Values.clusterChecksRunner.readinessProbe | indent 10 }} +{{- if .Values.clusterChecksRunner.volumes }} + volumes: +{{ toYaml .Values.clusterChecksRunner.volumes | indent 8 }} +{{- end }} affinity: {{- if .Values.clusterChecksRunner.affinity }} {{ toYaml .Values.clusterChecksRunner.affinity | indent 8 }} diff --git a/stable/datadog/templates/agent-clusterchecks-rbac.yaml b/stable/datadog/templates/agent-clusterchecks-rbac.yaml index da06257cd0..46ff0f9cf4 100644 --- a/stable/datadog/templates/agent-clusterchecks-rbac.yaml +++ b/stable/datadog/templates/agent-clusterchecks-rbac.yaml @@ -32,4 +32,7 @@ metadata: app.kubernetes.io/managed-by: {{ .Release.Service | quote }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} name: {{ template "datadog.fullname" . }}-cluster-checks + {{- if .Values.clusterChecksRunner.rbac.serviceAccountAnnotations }} + annotations: {{ toYaml .Values.clusterChecksRunner.rbac.serviceAccountAnnotations | nindent 4 }} + {{- end }} {{- end -}} diff --git a/stable/datadog/values.yaml b/stable/datadog/values.yaml index 2f54f07b52..a1a3a724b5 100644 --- a/stable/datadog/values.yaml +++ b/stable/datadog/values.yaml @@ -980,6 +980,11 @@ clusterChecksRunner: # dedicated: false + ## @param serviceAccountAnnotations - object - required + ## Annotations to add to the ServiceAccount if clusterChecksRunner.rbac.dedicated is true + # + serviceAccountAnnotations: {} + ## @param serviceAccountName - string - required ## Ignored if clusterChecksRunner.rbac.create is true # @@ -1083,6 +1088,21 @@ clusterChecksRunner: # - name: # value: + ## @param volumes - list of objects - optional + ## Specify additional volumes to mount in the cluster checks container + # + volumes: + # - hostPath: + # path: + # name: + + ## @param volumeMounts - list of objects - optional + ## Specify additional volumes to mount in the cluster checks container + # + volumeMounts: + # - name: + # mountPath: + # readOnly: true kube-state-metrics: rbac: