Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add helm option to enable kubernetesUseEndpointSlices and add endpointslices to DCA RBAC #1636

Merged
merged 6 commits into from
Dec 20, 2024
+21 −2
Merged

Add helm option to enable kubernetesUseEndpointSlices and add endpointslices to DCA RBAC #1636

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5ccd3ab
Added kubernetesUseEndpointSlices config option and endpointslices to…
ewoodthomas Dec 16, 2024
e7d040a
Removed DS_Store from tracked files
ewoodthomas Dec 16, 2024
aec6008
Merge branch 'main' into ewoodthomas/CONTINT-4526_expose_kubernetes_u…
ewoodthomas Dec 16, 2024
6d048c0
Version bump in readme
ewoodthomas Dec 16, 2024
6be0b76
Set endpointslices as default in RBAC
ewoodthomas Dec 20, 2024
8204bd2
Merge branch 'main' into ewoodthomas/CONTINT-4526_expose_kubernetes_u…
ewoodthomas Dec 20, 2024
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
5 changes: 5 additions & 0 deletions charts/datadog/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Datadog changelog

## 3.83.1

* Add `endpointslices.discovery.k8s.io` to the list of resources to collect in the Cluster Agent RBAC when `datadog.kubernetesUseEndpointSlices` is enabled.
* Add configuration option for `datadog.kubernetesUseEndpointSlices` to map Kubernetes services to endpoint slices instead of endpoints. Disabled by default.

## 3.83.0

* Added the configuration value `datadog.disablePasswdMount` to disable mounting the `/etc/passwd` path from the host filesystem. This option should be used when the underlying OS does not have these files (e.g., Talos OS).
Expand Down
2 changes: 1 addition & 1 deletion charts/datadog/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
apiVersion: v1
name: datadog
version: 3.83.0
version: 3.83.1
appVersion: "7"
description: Datadog Agent
keywords:
Expand Down
3 changes: 2 additions & 1 deletion charts/datadog/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Datadog

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

Expand Down Expand Up @@ -775,6 +775,7 @@ helm install <RELEASE_NAME> \
| datadog.kubernetesEvents.unbundleEvents | bool | `false` | Allow unbundling kubernetes events, 1:1 mapping between Kubernetes and Datadog events. (Requires Cluster Agent 7.42.0+). |
| datadog.kubernetesResourcesAnnotationsAsTags | object | `{}` | Provide a mapping of Kubernetes Resources Annotations to Datadog Tags |
| datadog.kubernetesResourcesLabelsAsTags | object | `{}` | Provide a mapping of Kubernetes Resources Labels to Datadog Tags |
| datadog.kubernetesUseEndpointSlices | bool | `false` | Enable this to map Kubernetes services to endpointslices instead of endpoints. (Requires Cluster Agent 7.62.0+). |
| datadog.leaderElection | bool | `true` | Enables leader election mechanism for event collection |
| datadog.leaderElectionResource | string | `"configmap"` | Selects the default resource to use for leader election. Can be: * "lease" / "leases". Only supported in agent 7.47+ * "configmap" / "configmaps". "" to automatically detect which one to use. |
| datadog.leaderLeaseDuration | string | `nil` | Set the lease time for leader election in second |
Expand Down
2 changes: 2 additions & 0 deletions charts/datadog/templates/cluster-agent-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,8 @@ spec:
- name: DD_COLLECT_KUBERNETES_EVENTS
value: {{ .Values.datadog.collectEvents | quote }}
{{- end }}
- name: DD_KUBERNETES_USE_ENDPOINT_SLICES
value: {{ .Values.datadog.kubernetesUseEndpointSlices | quote }}
- name: DD_KUBERNETES_EVENTS_SOURCE_DETECTION_ENABLED
value: {{ .Values.datadog.kubernetesEvents.sourceDetectionEnabled | quote }}
- name: DD_CLUSTER_AGENT_KUBERNETES_SERVICE_NAME
Expand Down
10 changes: 10 additions & 0 deletions charts/datadog/templates/cluster-agent-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,16 @@ rules:
- list
- watch
- create
{{- if .Values.datadog.kubernetesUseEndpointSlices }}
- apiGroups:
- "discovery.k8s.io"
resources:
- endpointslices
verbs:
- get
- list
- watch
{{- end }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO it can be part of the default RBAC, because we already have it for service and endpoints

- apiGroups: ["quota.openshift.io"]
resources:
- clusterresourcequotas
Expand Down
3 changes: 3 additions & 0 deletions charts/datadog/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,9 @@ datadog:
## ref: https://docs.datadoghq.com/agent/kubernetes/#event-collection
collectEvents: true

# datadog.kubernetesUseEndpointSlices -- Enable this to map Kubernetes services to endpointslices instead of endpoints. (Requires Cluster Agent 7.62.0+).
kubernetesUseEndpointSlices: false

# Configure Kubernetes events collection
kubernetesEvents:
# datadog.kubernetesEvents.sourceDetectionEnabled -- Enable this to map Kubernetes events to integration sources based on controller names. (Requires Cluster Agent 7.56.0+).
Expand Down
Loading