Skip to content

Allow specifying additional deployment labels #2877

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

Open
josh-ferrell wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow specifying additional deployment labels #2877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions charts/datadog-operator/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)).
Expand Down
2 changes: 1 addition & 1 deletion charts/datadog-operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
3 changes: 2 additions & 1 deletion charts/datadog-operator/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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. |
Expand Down
3 changes: 3 additions & 0 deletions charts/datadog-operator/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions charts/datadog-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test/datadog-operator/baseline/Operator_Deployment_default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down