[mq] working branch - merge 8f703ac on top of main at 66a31bc

{"baseBranch":"main","baseCommit":"66a31bc1edb51c9ed0c7c9fa7bd81fd3b1bb5bbf","createdAt":"2024-11-01T20:02:11.719668Z","headSha":"8f703ac2d688afda28708e46dbb6f1d1e7e15184","id":"a639f291-40d5-4fa2-8eb1-534fe9542d8c","priority":"200","pullRequestNumber":"1583","queuedAt":"2024-11-01T20:02:11.719131Z","status":"STATUS_QUEUED"}
DataDog · Nov 1, 2024 · 9966b80 · 9966b80
2 parents 3357401 + 8f703ac
commit 9966b80
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/charts/datadog-operator/CHANGELOG.md b/charts/datadog-operator/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.2.0
+
+* Add clusterRole.allowReadAllResources to allow viewing all resources. This is required for collecting custom resources in the Kubernetes Explorer
+
 ## 2.1.0
 
 * Update Datadog Operator version to 1.9.0.

diff --git a/charts/datadog-operator/Chart.yaml b/charts/datadog-operator/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: datadog-operator
-version: 2.1.0
+version: 2.2.0
 appVersion: 1.9.0
 description: Datadog Operator
 keywords:

diff --git a/charts/datadog-operator/README.md b/charts/datadog-operator/README.md
@@ -1,6 +1,6 @@
 # Datadog Operator
 
-![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![AppVersion: 1.9.0](https://img.shields.io/badge/AppVersion-1.9.0-informational?style=flat-square)
+![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![AppVersion: 1.9.0](https://img.shields.io/badge/AppVersion-1.9.0-informational?style=flat-square)
 
 ## Values
 
@@ -12,6 +12,7 @@
 | appKey | string | `nil` | Your Datadog APP key |
 | appKeyExistingSecret | string | `nil` | Use existing Secret which stores APP key instead of creating a new one |
 | clusterName | string | `nil` | Set a unique cluster name reporting from the Datadog Operator. |
+| clusterRole | object | `{"allowReadAllResources":false}` | Set specific configuration for the cluster role |
 | collectOperatorMetrics | bool | `true` | Configures an openmetrics check to collect operator metrics |
 | containerSecurityContext | object | `{}` | A security context defines privileges and access control settings for a container. |
 | datadogAgent.enabled | bool | `true` | Enables Datadog Agent controller |

diff --git a/charts/datadog-operator/templates/clusterrole.yaml b/charts/datadog-operator/templates/clusterrole.yaml
@@ -794,5 +794,13 @@ rules:
   - patch
   - update
 {{- end }}
+{{- if .Values.clusterRole.allowReadAllResources }}
+- apiGroups:
+  - '*'
+  resources:
+  - '*'
+  verbs:
+  - list
+  - watch
+{{- end }}
 {{- end }}
-
diff --git a/charts/datadog-operator/values.yaml b/charts/datadog-operator/values.yaml
@@ -190,3 +190,9 @@ livenessProbe:
   # timeoutSeconds: 1
   # successThreshold: 1
   # failureThreshold: 3
+
+# clusterRole -- Set specific configuration for the cluster role
+clusterRole:
+  # allowReadAllResources is required to allow the operator to view all custom resources.
+  # If collecting CRDs in the Kubernetes Explorer this is required
+  allowReadAllResources: false