Skip to content

Commit

Permalink
Merge branch 'main' into levan-m/gh-token-permission
Browse files Browse the repository at this point in the history
  • Loading branch information
@levan-m
levan-m authored Nov 8, 2024
2 parents 5f9e37f + b6f5372 commit 8e000e7
Show file tree
Hide file tree
Showing 18 changed files with 522 additions and 106 deletions.
4 changes: 4 additions & 0 deletions charts/datadog-crds/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

# 2.2.0

* Update CRDs from Datadog Operator v1.10.0 tag.

## 2.1.0

* Update CRDs from Datadog Operator v1.9.0 tag.
Expand Down
2 changes: 1 addition & 1 deletion charts/datadog-crds/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: datadog-crds
description: Datadog Kubernetes CRDs chart
version: 2.1.0
version: 2.2.0
appVersion: "1"
keywords:
- monitoring
Expand Down
2 changes: 1 addition & 1 deletion charts/datadog-crds/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Datadog CRDs

![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![AppVersion: 1](https://img.shields.io/badge/AppVersion-1-informational?style=flat-square)
![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![AppVersion: 1](https://img.shields.io/badge/AppVersion-1-informational?style=flat-square)

This chart was designed to allow other "datadog" charts to share `CustomResourceDefinitions` such as the `DatadogMetric`.

Expand Down
163 changes: 163 additions & 0 deletions charts/datadog-crds/templates/datadoghq.com_datadogagents_v1.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -701,13 +701,29 @@ spec:
type: boolean
endpoint:
type: string
hostPortConfig:
properties:
enabled:
type: boolean
hostPort:
format: int32
type: integer
type: object
type: object
http:
properties:
enabled:
type: boolean
endpoint:
type: string
hostPortConfig:
properties:
enabled:
type: boolean
hostPort:
format: int32
type: integer
type: object
type: object
type: object
type: object
Expand Down Expand Up @@ -851,6 +867,73 @@ spec:
url:
type: string
type: object
env:
items:
properties:
name:
type: string
value:
type: string
valueFrom:
properties:
configMapKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
fieldRef:
properties:
apiVersion:
type: string
fieldPath:
type: string
required:
- fieldPath
type: object
x-kubernetes-map-type: atomic
resourceFieldRef:
properties:
containerName:
type: string
divisor:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
resource:
type: string
required:
- resource
type: object
x-kubernetes-map-type: atomic
secretKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
fips:
properties:
customFIPSConfig:
Expand Down Expand Up @@ -1006,6 +1089,18 @@ spec:
tlsVerify:
type: boolean
type: object
kubernetesResourcesAnnotationsAsTags:
additionalProperties:
additionalProperties:
type: string
type: object
type: object
kubernetesResourcesLabelsAsTags:
additionalProperties:
additionalProperties:
type: string
type: object
type: object
localService:
properties:
forceEnableLocalService:
Expand Down Expand Up @@ -1076,6 +1171,31 @@ spec:
type: object
registry:
type: string
secretBackend:
properties:
args:
type: string
command:
type: string
enableGlobalPermissions:
type: boolean
roles:
items:
properties:
namespace:
type: string
secrets:
items:
type: string
type: array
x-kubernetes-list-type: set
type: object
type: array
x-kubernetes-list-type: atomic
timeout:
format: int32
type: integer
type: object
site:
type: string
tags:
Expand Down Expand Up @@ -1975,6 +2095,29 @@ spec:
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
envFrom:
items:
properties:
configMapRef:
properties:
name:
type: string
optional:
type: boolean
type: object
x-kubernetes-map-type: atomic
prefix:
type: string
secretRef:
properties:
name:
type: string
optional:
type: boolean
type: object
x-kubernetes-map-type: atomic
type: object
type: array
extraChecksd:
properties:
configDataMap:
Expand Down Expand Up @@ -2137,6 +2280,10 @@ spec:
type: string
type: object
type: object
serviceAccountAnnotations:
additionalProperties:
type: string
type: object
serviceAccountName:
type: string
tolerations:
Expand Down Expand Up @@ -3723,13 +3870,29 @@ spec:
type: boolean
endpoint:
type: string
hostPortConfig:
properties:
enabled:
type: boolean
hostPort:
format: int32
type: integer
type: object
type: object
http:
properties:
enabled:
type: boolean
endpoint:
type: string
hostPortConfig:
properties:
enabled:
type: boolean
hostPort:
format: int32
type: integer
type: object
type: object
type: object
type: object
Expand Down
8 changes: 8 additions & 0 deletions charts/datadog/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Datadog changelog

## 3.78.0

* Set default `Agent` and `Cluster-Agent` version to `7.59.0`.

## 3.77.3

* Update version required for datadog.processAgent.runInCoreAgent and remove experimental status.

## 3.77.2

* Add the ability to include Security Contexts at the container level for Cluster Checks Runners.
Expand Down
2 changes: 1 addition & 1 deletion charts/datadog/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: datadog
version: 3.77.2
version: 3.78.0
appVersion: "7"
description: Datadog Agent
keywords:
Expand Down
10 changes: 5 additions & 5 deletions charts/datadog/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Datadog

![Version: 3.77.2](https://img.shields.io/badge/Version-3.77.2-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
![Version: 3.78.0](https://img.shields.io/badge/Version-3.78.0-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/).

Expand Down Expand Up @@ -515,7 +515,7 @@ helm install <RELEASE_NAME> \
| agents.image.pullPolicy | string | `"IfNotPresent"` | Datadog Agent image pull policy |
| agents.image.pullSecrets | list | `[]` | Datadog Agent repository pullSecret (ex: specify docker registry credentials) |
| agents.image.repository | string | `nil` | Override default registry + image.name for Agent |
| agents.image.tag | string | `"7.58.0"` | Define the Agent version to use |
| agents.image.tag | string | `"7.59.0"` | Define the Agent version to use |
| agents.image.tagSuffix | string | `""` | Suffix to append to Agent tag |
| agents.localService.forceLocalServiceEnabled | bool | `false` | Force the creation of the internal traffic policy service to target the agent running on the local node. By default, the internal traffic service is created only on Kubernetes 1.22+ where the feature became beta and enabled by default. This option allows to force the creation of the internal traffic service on kubernetes 1.21 where the feature was alpha and required a feature gate to be explicitly enabled. |
| agents.localService.overrideName | string | `""` | Name of the internal traffic service to target the agent running on the local node |
Expand Down Expand Up @@ -590,7 +590,7 @@ helm install <RELEASE_NAME> \
| clusterAgent.image.pullPolicy | string | `"IfNotPresent"` | Cluster Agent image pullPolicy |
| clusterAgent.image.pullSecrets | list | `[]` | Cluster Agent repository pullSecret (ex: specify docker registry credentials) |
| clusterAgent.image.repository | string | `nil` | Override default registry + image.name for Cluster Agent |
| clusterAgent.image.tag | string | `"7.58.0"` | Cluster Agent image tag to use |
| clusterAgent.image.tag | string | `"7.59.0"` | Cluster Agent image tag to use |
| clusterAgent.livenessProbe | object | Every 15s / 6 KO / 1 OK | Override default Cluster Agent liveness probe settings |
| clusterAgent.metricsProvider.aggregator | string | `"avg"` | Define the aggregator the cluster agent will use to process the metrics. The options are (avg, min, max, sum) |
| clusterAgent.metricsProvider.createReaderRbac | bool | `true` | Create `external-metrics-reader` RBAC automatically (to allow HPA to read data from Cluster Agent) |
Expand Down Expand Up @@ -644,7 +644,7 @@ helm install <RELEASE_NAME> \
| clusterChecksRunner.image.pullPolicy | string | `"IfNotPresent"` | Datadog Agent image pull policy |
| clusterChecksRunner.image.pullSecrets | list | `[]` | Datadog Agent repository pullSecret (ex: specify docker registry credentials) |
| clusterChecksRunner.image.repository | string | `nil` | Override default registry + image.name for Cluster Check Runners |
| clusterChecksRunner.image.tag | string | `"7.58.0"` | Define the Agent version to use |
| clusterChecksRunner.image.tag | string | `"7.59.0"` | Define the Agent version to use |
| clusterChecksRunner.image.tagSuffix | string | `""` | Suffix to append to Agent tag |
| clusterChecksRunner.livenessProbe | object | Every 15s / 6 KO / 1 OK | Override default agent liveness probe settings |
| clusterChecksRunner.networkPolicy.create | bool | `false` | If true, create a NetworkPolicy for the cluster checks runners. DEPRECATED. Use datadog.networkPolicy.create instead |
Expand Down Expand Up @@ -792,7 +792,7 @@ helm install <RELEASE_NAME> \
| datadog.processAgent.enabled | bool | `true` | Set this to true to enable live process monitoring agent DEPRECATED. Set `datadog.processAgent.processCollection` or `datadog.processAgent.containerCollection` instead. # Note: /etc/passwd is automatically mounted when `processCollection`, `processDiscovery`, or `containerCollection` is enabled. # ref: https://docs.datadoghq.com/graphing/infrastructure/process/#kubernetes-daemonset |
| datadog.processAgent.processCollection | bool | `false` | Set this to true to enable process collection |
| datadog.processAgent.processDiscovery | bool | `true` | Enables or disables autodiscovery of integrations |
| datadog.processAgent.runInCoreAgent | bool | `false` | Set this to true to run the following features in the core agent: Live Processes, Live Containers, Process Discovery. # This is an experimental feature requiring Agent 7.53.0+ and Linux. Currently not compatible with APM Single Step Instrumentation. |
| datadog.processAgent.runInCoreAgent | bool | `false` | Set this to true to run the following features in the core agent: Live Processes, Live Containers, Process Discovery. # This requires Agent 7.57.0+ and Linux. |
| datadog.processAgent.stripProcessArguments | bool | `false` | Set this to scrub all arguments from collected processes # Requires datadog.processAgent.processCollection to be set to true to have any effect # ref: https://docs.datadoghq.com/infrastructure/process/?tab=linuxwindows#process-arguments-scrubbing |
| datadog.profiling.enabled | string | `nil` | Enable Continuous Profiler by injecting `DD_PROFILING_ENABLED` environment variable with the same value to all pods in the cluster Valid values are: - false: Profiler is turned off and can not be turned on by other means. - null: Profiler is turned off, but can be turned on by other means. - auto: Profiler is turned off, but the library will turn it on if the application is a good candidate for profiling. - true: Profiler is turned on. |
| datadog.prometheusScrape.additionalConfigs | list | `[]` | Allows adding advanced openmetrics check configurations with custom discovery rules. (Requires Agent version 7.27+) |
Expand Down
4 changes: 2 additions & 2 deletions charts/datadog/templates/_helpers.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{{- $version = "6.55.1" -}}
{{- end -}}
{{- if and (eq $length 1) (or (eq $version "7") (eq $version "latest")) -}}
{{- $version = "7.55.1" -}}
{{- $version = "7.58.1" -}}
{{- end -}}
{{- $version -}}
{{- end -}}
Expand Down Expand Up @@ -971,7 +971,7 @@ Create RBACs for custom resources
false
{{- else if (ne (include "get-process-checks-in-core-agent-envvar" .) "") -}}
{{- include "get-process-checks-in-core-agent-envvar" . -}}
{{- else if and (not .Values.agents.image.doNotCheckTag) .Values.datadog.processAgent.runInCoreAgent (semverCompare ">=7.53.0-0" (include "get-agent-version" .)) -}}
{{- else if and (not .Values.agents.image.doNotCheckTag) .Values.datadog.processAgent.runInCoreAgent (semverCompare ">=7.57.0-0" (include "get-agent-version" .)) -}}
true
{{- else -}}
false
Expand Down
8 changes: 4 additions & 4 deletions charts/datadog/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ datadog:
processDiscovery: true

# datadog.processAgent.runInCoreAgent -- Set this to true to run the following features in the core agent: Live Processes, Live Containers, Process Discovery.
## This is an experimental feature requiring Agent 7.53.0+ and Linux. Currently not compatible with APM Single Step Instrumentation.
## This requires Agent 7.57.0+ and Linux.
runInCoreAgent: false

# datadog.processAgent.containerCollection -- Set this to true to enable container collection
Expand Down Expand Up @@ -1008,7 +1008,7 @@ clusterAgent:
name: cluster-agent

# clusterAgent.image.tag -- Cluster Agent image tag to use
tag: 7.58.0
tag: 7.59.0

# clusterAgent.image.digest -- Cluster Agent image digest to use, takes precedence over tag if specified
digest: ""
Expand Down Expand Up @@ -1501,7 +1501,7 @@ agents:
name: agent

# agents.image.tag -- Define the Agent version to use
tag: 7.58.0
tag: 7.59.0

# agents.image.digest -- Define Agent image digest to use, takes precedence over tag if specified
digest: ""
Expand Down Expand Up @@ -2007,7 +2007,7 @@ clusterChecksRunner:
name: agent

# clusterChecksRunner.image.tag -- Define the Agent version to use
tag: 7.58.0
tag: 7.59.0

# clusterChecksRunner.image.digest -- Define Agent image digest to use, takes precedence over tag if specified
digest: ""
Expand Down
Loading

0 comments on commit 8e000e7

Please sign in to comment.