Skip to content

Commit

Permalink
Merge branch 'main' into fanny/CECO-1438/gdce
Browse files Browse the repository at this point in the history
  • Loading branch information
fanny-jiang committed Nov 1, 2024
2 parents 1bbab98 + fd50dbe commit 5e08e3a
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 13 deletions.
4 changes: 4 additions & 0 deletions charts/datadog-operator/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion charts/datadog-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
3 changes: 2 additions & 1 deletion charts/datadog-operator/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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 |
Expand Down
10 changes: 9 additions & 1 deletion charts/datadog-operator/templates/clusterrole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -794,5 +794,13 @@ rules:
- patch
- update
{{- end }}
{{- if .Values.clusterRole.allowReadAllResources }}
- apiGroups:
- '*'
resources:
- '*'
verbs:
- list
- watch
{{- end }}
{{- end }}

6 changes: 6 additions & 0 deletions charts/datadog-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions charts/observability-pipelines-worker/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 2.2.1

* Official image `2.2.1`

## 2.2.0

* Official image `2.2.0`
Expand Down
4 changes: 2 additions & 2 deletions charts/observability-pipelines-worker/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: observability-pipelines-worker
version: "2.2.0"
version: "2.2.1"
description: Observability Pipelines Worker
type: application
keywords:
Expand All @@ -13,7 +13,7 @@ icon: https://datadog-live.imgix.net/img/dd_logo_70x75.png
maintainers:
- name: Datadog
email: support@datadoghq.com
appVersion: "2.2.0"
appVersion: "2.2.1"
annotations:
artifacthub.io/links: |
- name: Chart Source
Expand Down
4 changes: 2 additions & 2 deletions charts/observability-pipelines-worker/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Observability Pipelines Worker

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

## How to use Datadog Helm repository

Expand Down Expand Up @@ -110,7 +110,7 @@ The command removes all the Kubernetes components associated with the chart and
| image.pullPolicy | string | `"IfNotPresent"` | Specify the [pullPolicy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy). |
| image.pullSecrets | list | `[]` | Specify the [imagePullSecrets](https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod). |
| image.repository | string | `"gcr.io/datadoghq"` | Specify the image repository to use. |
| image.tag | string | `"2.2.0"` | Specify the image tag to use. |
| image.tag | string | `"2.2.1"` | Specify the image tag to use. |
| ingress.annotations | object | `{}` | Specify annotations for the Ingress. |
| ingress.className | string | `""` | Specify the [ingressClassName](https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress), requires Kubernetes >= 1.18. |
| ingress.enabled | bool | `false` | If **true**, create an Ingress resource. |
Expand Down
2 changes: 1 addition & 1 deletion charts/observability-pipelines-worker/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ image:
# image.name -- Specify the image name to use (relative to `image.repository`).
name: observability-pipelines-worker
# image.tag -- Specify the image tag to use.
tag: 2.2.0
tag: 2.2.1
# image.digest -- (string) Specify the image digest to use; takes precedence over `image.tag`.
digest:
## Currently, we offer images at:
Expand Down
10 changes: 5 additions & 5 deletions repository.datadog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ github_teams_restrictions:
- container-helm-chart-maintainers
- container-integrations
- container-t2
- Synthetics
- Documentation
- Observability Pipelines
- Telemetry and Analytics
- Vector
- synthetics
- documentation
- observability-pipelines
- telemetry-and-analytics
- vector
github_users_restrictions:
- cahillsf
- clamoriniere
Expand Down

0 comments on commit 5e08e3a

Please sign in to comment.