diff --git a/charts/datadog-operator/CHANGELOG.md b/charts/datadog-operator/CHANGELOG.md index 99ab2c957..042556e5e 100644 --- a/charts/datadog-operator/CHANGELOG.md +++ b/charts/datadog-operator/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 2.26.1-dev.4 + +* Add the ability to configure `additionalLabels` in the operator deployment + ## 2.26.0-dev.4 * Stop rendering unsupported ExtendedDaemonSet and registry override settings ([#2875](https://github.com/DataDog/helm-charts/pull/2875)). diff --git a/charts/datadog-operator/Chart.yaml b/charts/datadog-operator/Chart.yaml index 4cc214317..f4ccd870f 100644 --- a/charts/datadog-operator/Chart.yaml +++ b/charts/datadog-operator/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: datadog-operator -version: 2.26.0-dev.4 +version: 2.26.1-dev.4 appVersion: 1.30.0-rc.2 description: Datadog Operator keywords: diff --git a/charts/datadog-operator/README.md b/charts/datadog-operator/README.md index 70230cf71..7f0b14dcd 100644 --- a/charts/datadog-operator/README.md +++ b/charts/datadog-operator/README.md @@ -1,6 +1,6 @@ # Datadog Operator -![Version: 2.26.0-dev.4](https://img.shields.io/badge/Version-2.26.0--dev.4-informational?style=flat-square) ![AppVersion: 1.30.0-rc.2](https://img.shields.io/badge/AppVersion-1.30.0--rc.2-informational?style=flat-square) +![Version: 2.26.1-dev.4](https://img.shields.io/badge/Version-2.26.0--dev.4-informational?style=flat-square) ![AppVersion: 1.30.0-rc.2](https://img.shields.io/badge/AppVersion-1.30.0--rc.2-informational?style=flat-square) ## Values @@ -36,6 +36,7 @@ | datadogMonitor.enabled | bool | `false` | Enables the Datadog Monitor controller | | datadogSLO.enabled | bool | `false` | Enables the Datadog SLO controller | | dd_url | string | `nil` | The host of the Datadog intake server to send Agent data to, only set this option if you need the Agent to send data to a custom URL | +| deployment.additionalLabels | object | `{}` | Additional labels to be added to the deployment resource | | deployment.annotations | object | `{}` | Allows setting additional annotations for the deployment resource | | dnsConfig | object | `{}` | Specify DNS configuration options for Datadog Operator PODs | | env | list | `[]` | Define any environment variables to be passed to the operator. | diff --git a/charts/datadog-operator/templates/deployment.yaml b/charts/datadog-operator/templates/deployment.yaml index 4dbdd8c46..c375439cd 100644 --- a/charts/datadog-operator/templates/deployment.yaml +++ b/charts/datadog-operator/templates/deployment.yaml @@ -9,6 +9,9 @@ metadata: {{- end }} labels: {{ include "datadog-operator.labels" . | indent 4 }} +{{- if .Values.deployment.additionalLabels }} +{{ toYaml .Values.deployment.additionalLabels | indent 4 }} +{{- end }} spec: replicas: {{ .Values.replicaCount }} selector: diff --git a/charts/datadog-operator/values.yaml b/charts/datadog-operator/values.yaml index 80b566540..fc82d9335 100644 --- a/charts/datadog-operator/values.yaml +++ b/charts/datadog-operator/values.yaml @@ -123,6 +123,9 @@ untaintController: # untaintController.eventsEnabled -- Emit Kubernetes Events on Nodes for taint removals and timeout decisions. eventsEnabled: false deployment: + # deployment.additionalLabels -- Additional labels to be added to the deployment resource + additionalLabels: {} + # key: "value" # deployment.annotations -- Allows setting additional annotations for the deployment resource annotations: {} rbac: diff --git a/test/datadog-operator/baseline/Operator_Deployment_default.yaml b/test/datadog-operator/baseline/Operator_Deployment_default.yaml index afb2f2ffb..9e2ba65db 100644 --- a/test/datadog-operator/baseline/Operator_Deployment_default.yaml +++ b/test/datadog-operator/baseline/Operator_Deployment_default.yaml @@ -7,7 +7,7 @@ metadata: namespace: datadog-agent labels: app.kubernetes.io/name: datadog-operator - helm.sh/chart: datadog-operator-2.26.0-dev.3 + helm.sh/chart: datadog-operator-2.26.1-dev.4 app.kubernetes.io/instance: datadog-operator app.kubernetes.io/version: "1.30.0-rc.2" app.kubernetes.io/managed-by: Helm