diff --git a/charts/datadog/CHANGELOG.md b/charts/datadog/CHANGELOG.md index 987b77c91..863f1023b 100644 --- a/charts/datadog/CHANGELOG.md +++ b/charts/datadog/CHANGELOG.md @@ -1,5 +1,8 @@ # Datadog changelog +## 3.73.4 +* Added ports for gRPC and HTTP OTLP ingest in NetworkPolicy and CiliumNetworkPolicy when `datadog.networkPolicy.create` and `datadog.networkPolicy.flavor` are configured respectively as `"kubernetes"` or `"cilium"`. + ## 3.73.3 * Fix a few typos on OTel Agent configs. diff --git a/charts/datadog/Chart.yaml b/charts/datadog/Chart.yaml index c5bb5d951..3957ba91e 100644 --- a/charts/datadog/Chart.yaml +++ b/charts/datadog/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: datadog -version: 3.73.3 +version: 3.73.4 appVersion: "7" description: Datadog Agent keywords: diff --git a/charts/datadog/README.md b/charts/datadog/README.md index 5c578c07f..a037d0ca9 100644 --- a/charts/datadog/README.md +++ b/charts/datadog/README.md @@ -1,6 +1,6 @@ # Datadog -![Version: 3.73.3](https://img.shields.io/badge/Version-3.73.3-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square) +![Version: 3.73.4](https://img.shields.io/badge/Version-3.73.4-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/). diff --git a/charts/datadog/templates/agent-cilium-network-policy.yaml b/charts/datadog/templates/agent-cilium-network-policy.yaml index 480ac0a7e..5fe58911a 100644 --- a/charts/datadog/templates/agent-cilium-network-policy.yaml +++ b/charts/datadog/templates/agent-cilium-network-policy.yaml @@ -172,6 +172,38 @@ specs: - port: "{{ $.Values.datadog.apm.port }}" protocol: TCP {{- end }} +{{- if .Values.datadog.otlp.receiver.protocols.grpc.enabled }} + - description: "Ingress for gRPC OTLP" + endpointSelector: + matchLabels: + app: {{ template "datadog.fullname" . }} + {{- if .Values.agents.podLabels }} + {{ toYaml .Values.agents.podLabels | indent 8 }} + {{- end }} + ingress: + - fromEndpoints: + - {} + toPorts: + - ports: + - port: "{{ .Values.datadog.otlp.receiver.protocols.grpc.endpoint | regexFind ":[0-9]+$" | trimPrefix ":" }}" + protocol: TCP +{{- end }} +{{- if .Values.datadog.otlp.receiver.protocols.http.enabled }} + - description: "Ingress for HTTP OTLP" + endpointSelector: + matchLabels: + app: {{ template "datadog.fullname" . }} + {{- if .Values.agents.podLabels }} + {{ toYaml .Values.agents.podLabels | indent 8 }} + {{- end }} + ingress: + - fromEndpoints: + - {} + toPorts: + - ports: + - port: "{{ .Values.datadog.otlp.receiver.protocols.http.endpoint | regexFind ":[0-9]+$" | trimPrefix ":" }}" + protocol: TCP +{{- end }} # The agents are susceptible to an issue connecting to any pod that # is annotated with auto-discovery annotations. # diff --git a/charts/datadog/templates/agent-network-policy.yaml b/charts/datadog/templates/agent-network-policy.yaml index a74ef0c8b..9514f3826 100644 --- a/charts/datadog/templates/agent-network-policy.yaml +++ b/charts/datadog/templates/agent-network-policy.yaml @@ -25,6 +25,18 @@ spec: ports: - port: {{ $.Values.datadog.apm.port }} protocol: TCP +{{- end }} +{{- if .Values.datadog.otlp.receiver.protocols.grpc.enabled }} + - # Ingress for gRPC OTLP + ports: + - port: {{ .Values.datadog.otlp.receiver.protocols.grpc.endpoint | regexFind ":[0-9]+$" | trimPrefix ":" }} + protocol: TCP +{{- end }} +{{- if .Values.datadog.otlp.receiver.protocols.http.enabled }} + - # Ingress for HTTP OTLP + ports: + - port: {{ .Values.datadog.otlp.receiver.protocols.http.endpoint | regexFind ":[0-9]+$" | trimPrefix ":" }} + protocol: TCP {{- end }} egress: - # Egress to