From efa4d6629c240b545035bc80e05fbafaf83316c1 Mon Sep 17 00:00:00 2001 From: khewonc <39867936+khewonc@users.noreply.github.com> Date: Thu, 10 Oct 2024 14:43:22 -0400 Subject: [PATCH] Update chart for operator v1.9.0 release (#1555) --- charts/datadog-operator/CHANGELOG.md | 5 +++ charts/datadog-operator/Chart.lock | 6 ++-- charts/datadog-operator/Chart.yaml | 6 ++-- charts/datadog-operator/README.md | 6 ++-- .../datadog-operator/templates/_helpers.tpl | 2 +- .../templates/clusterrole.yaml | 36 +++++++++++++++---- .../templates/deployment.yaml | 3 ++ charts/datadog-operator/values.yaml | 7 +++- .../baseline/DatadogAgent_CRD_default.yaml | 2 +- .../baseline/Operator_Deployment_default.yaml | 7 ++-- .../operator_deployment_test.go | 2 +- 11 files changed, 60 insertions(+), 22 deletions(-) diff --git a/charts/datadog-operator/CHANGELOG.md b/charts/datadog-operator/CHANGELOG.md index e631e2761..2f6ee332c 100644 --- a/charts/datadog-operator/CHANGELOG.md +++ b/charts/datadog-operator/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 2.1.0 + +* Update Datadog Operator version to 1.9.0. +* Add DatadogDashboard configuration. + ## 2.0.1 * Make Operator `livenessProbe` configurable. diff --git a/charts/datadog-operator/Chart.lock b/charts/datadog-operator/Chart.lock index 6fd0a13b2..b5c089010 100644 --- a/charts/datadog-operator/Chart.lock +++ b/charts/datadog-operator/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: datadog-crds repository: https://helm.datadoghq.com - version: 2.0.0 -digest: sha256:39f4d700e87701398d61344f3f816586017a20396c07a4953a60da9c46edc74b -generated: "2024-08-16T15:47:01.022149-04:00" + version: 2.1.0 +digest: sha256:8f24ab33303f20421688b071b9fb028c0662795952298300ed4b9a060a4332ac +generated: "2024-10-10T12:48:27.526346-04:00" diff --git a/charts/datadog-operator/Chart.yaml b/charts/datadog-operator/Chart.yaml index cdf2a498e..6577418a7 100644 --- a/charts/datadog-operator/Chart.yaml +++ b/charts/datadog-operator/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: datadog-operator -version: 2.0.1 -appVersion: 1.8.0 +version: 2.1.0 +appVersion: 1.9.0 description: Datadog Operator keywords: - monitoring @@ -17,7 +17,7 @@ maintainers: email: support@datadoghq.com dependencies: - name: datadog-crds - version: "=2.0.0" + version: "=2.1.0" alias: datadogCRDs repository: https://helm.datadoghq.com condition: installCRDs diff --git a/charts/datadog-operator/README.md b/charts/datadog-operator/README.md index 41bdc7883..0bf92862f 100644 --- a/charts/datadog-operator/README.md +++ b/charts/datadog-operator/README.md @@ -1,6 +1,6 @@ # Datadog Operator -![Version: 2.0.1](https://img.shields.io/badge/Version-2.0.1-informational?style=flat-square) ![AppVersion: 1.8.0](https://img.shields.io/badge/AppVersion-1.8.0-informational?style=flat-square) +![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) ## Values @@ -17,10 +17,12 @@ | datadogAgent.enabled | bool | `true` | Enables Datadog Agent controller | | datadogAgentProfile.enabled | bool | `false` | If true, enables DatadogAgentProfile controller (beta). Requires v1.5.0+ | | datadogCRDs.crds.datadogAgents | bool | `true` | Set to true to deploy the DatadogAgents CRD | +| datadogCRDs.crds.datadogDashboards | bool | `false` | Set to true to deploy the DatadogDashboard CRD | | datadogCRDs.crds.datadogMetrics | bool | `true` | Set to true to deploy the DatadogMetrics CRD | | datadogCRDs.crds.datadogMonitors | bool | `true` | Set to true to deploy the DatadogMonitors CRD | | datadogCRDs.crds.datadogPodAutoscalers | bool | `true` | Set to true to deploy the DatadogPodAutoscalers CRD | | datadogCRDs.crds.datadogSLOs | bool | `false` | Set to true to deploy the DatadogSLO CRD | +| datadogDashboard.enabled | bool | `false` | Enables the Datadog Dashboard controller | | 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 | @@ -30,7 +32,7 @@ | image.doNotCheckTag | bool | `false` | Permit skipping operator image tag compatibility with the chart. | | image.pullPolicy | string | `"IfNotPresent"` | Define the pullPolicy for Datadog Operator image | | image.repository | string | `"gcr.io/datadoghq/operator"` | Repository to use for Datadog Operator image | -| image.tag | string | `"1.8.0"` | Define the Datadog Operator version to use | +| image.tag | string | `"1.9.0"` | Define the Datadog Operator version to use | | imagePullSecrets | list | `[]` | Datadog Operator repository pullSecret (ex: specify docker registry credentials) | | installCRDs | bool | `true` | Set to true to deploy the Datadog's CRDs | | introspection.enabled | bool | `false` | If true, enables introspection feature (beta). Requires v1.4.0+ | diff --git a/charts/datadog-operator/templates/_helpers.tpl b/charts/datadog-operator/templates/_helpers.tpl index 695d66d0a..2ec94580f 100644 --- a/charts/datadog-operator/templates/_helpers.tpl +++ b/charts/datadog-operator/templates/_helpers.tpl @@ -85,6 +85,6 @@ Check operator image tag version. {{- if not .Values.image.doNotCheckTag -}} {{- .Values.image.tag -}} {{- else -}} -{{ "1.8.0" }} +{{ "1.9.0" }} {{- end -}} {{- end -}} diff --git a/charts/datadog-operator/templates/clusterrole.yaml b/charts/datadog-operator/templates/clusterrole.yaml index 7dc6b54bb..1b90e330a 100644 --- a/charts/datadog-operator/templates/clusterrole.yaml +++ b/charts/datadog-operator/templates/clusterrole.yaml @@ -200,15 +200,9 @@ rules: - admissionregistration.k8s.io resources: - mutatingwebhookconfigurations - verbs: - - '*' -- apiGroups: - - admissionregistration.k8s.io - resources: - validatingwebhookconfigurations verbs: - - list - - watch + - '*' - apiGroups: - apiextensions.k8s.io resources: @@ -772,5 +766,33 @@ rules: - patch - update {{- end }} +{{- if .Values.datadogDashboard.enabled }} +- apiGroups: + - datadoghq.com + resources: + - datadogdashboards + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - datadoghq.com + resources: + - datadogdashboards/finalizers + verbs: + - update +- apiGroups: + - datadoghq.com + resources: + - datadogdashboards/status + verbs: + - get + - patch + - update +{{- end }} {{- end }} diff --git a/charts/datadog-operator/templates/deployment.yaml b/charts/datadog-operator/templates/deployment.yaml index 28c9da80b..1bb1b1322 100644 --- a/charts/datadog-operator/templates/deployment.yaml +++ b/charts/datadog-operator/templates/deployment.yaml @@ -129,6 +129,9 @@ spec: {{- if (semverCompare ">=1.3.0" $version) }} - "-datadogSLOEnabled={{ .Values.datadogSLO.enabled }}" {{- end }} + {{- if (semverCompare ">=1.9.0-0" $version) }} + - "-datadogDashboardEnabled={{ .Values.datadogDashboard.enabled }}" + {{- end }} {{- if (semverCompare ">=1.7.0" $version) }} - "-remoteConfigEnabled={{ .Values.remoteConfiguration.enabled }}" {{- end }} diff --git a/charts/datadog-operator/values.yaml b/charts/datadog-operator/values.yaml index 6e8838726..fbd4339e9 100644 --- a/charts/datadog-operator/values.yaml +++ b/charts/datadog-operator/values.yaml @@ -47,7 +47,7 @@ image: # image.repository -- Repository to use for Datadog Operator image repository: gcr.io/datadoghq/operator # image.tag -- Define the Datadog Operator version to use - tag: 1.8.0 + tag: 1.9.0 # image.pullPolicy -- Define the pullPolicy for Datadog Operator image pullPolicy: IfNotPresent # image.doNotCheckTag -- Permit skipping operator image tag compatibility with the chart. @@ -84,6 +84,9 @@ secretBackend: datadogAgent: # datadogAgent.enabled -- Enables Datadog Agent controller enabled: true +datadogDashboard: + # datadogDashboard.enabled -- Enables the Datadog Dashboard controller + enabled: false datadogMonitor: # datadogMonitor.enabled -- Enables the Datadog Monitor controller enabled: false @@ -142,6 +145,8 @@ datadogCRDs: datadogMonitors: true # datadogCRDs.crds.datadogSLOs -- Set to true to deploy the DatadogSLO CRD datadogSLOs: false + # datadogCRDs.crds.datadogDashboards -- Set to true to deploy the DatadogDashboard CRD + datadogDashboards: false # podAnnotations -- Allows setting additional annotations for Datadog Operator PODs podAnnotations: {} diff --git a/test/datadog-operator/baseline/DatadogAgent_CRD_default.yaml b/test/datadog-operator/baseline/DatadogAgent_CRD_default.yaml index d241a6bc6..22931c5af 100644 --- a/test/datadog-operator/baseline/DatadogAgent_CRD_default.yaml +++ b/test/datadog-operator/baseline/DatadogAgent_CRD_default.yaml @@ -7,7 +7,7 @@ metadata: controller-gen.kubebuilder.io/version: v0.14.0 name: datadogagents.datadoghq.com labels: - helm.sh/chart: 'datadogCRDs-2.0.0' + helm.sh/chart: 'datadogCRDs-2.1.0' app.kubernetes.io/managed-by: 'Helm' app.kubernetes.io/name: 'datadogCRDs' app.kubernetes.io/instance: 'datadog-operator' diff --git a/test/datadog-operator/baseline/Operator_Deployment_default.yaml b/test/datadog-operator/baseline/Operator_Deployment_default.yaml index 4e2bef0f7..48ea073c0 100644 --- a/test/datadog-operator/baseline/Operator_Deployment_default.yaml +++ b/test/datadog-operator/baseline/Operator_Deployment_default.yaml @@ -7,9 +7,9 @@ metadata: namespace: datadog-agent labels: app.kubernetes.io/name: datadog-operator - helm.sh/chart: datadog-operator-2.0.1 + helm.sh/chart: datadog-operator-2.1.0 app.kubernetes.io/instance: datadog-operator - app.kubernetes.io/version: "1.8.0" + app.kubernetes.io/version: "1.9.0" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -35,7 +35,7 @@ spec: serviceAccountName: datadog-operator containers: - name: datadog-operator - image: "gcr.io/datadoghq/operator:1.8.0" + image: "gcr.io/datadoghq/operator:1.9.0" imagePullPolicy: IfNotPresent env: - name: WATCH_NAMESPACE @@ -59,6 +59,7 @@ spec: - "-datadogMonitorEnabled=false" - "-datadogAgentEnabled=true" - "-datadogSLOEnabled=false" + - "-datadogDashboardEnabled=false" - "-remoteConfigEnabled=false" ports: - name: metrics diff --git a/test/datadog-operator/operator_deployment_test.go b/test/datadog-operator/operator_deployment_test.go index c59bc2c7a..1bfa22777 100644 --- a/test/datadog-operator/operator_deployment_test.go +++ b/test/datadog-operator/operator_deployment_test.go @@ -104,7 +104,7 @@ func verifyDeployment(t *testing.T, manifest string) { assert.Equal(t, 1, len(deployment.Spec.Template.Spec.Containers)) operatorContainer := deployment.Spec.Template.Spec.Containers[0] assert.Equal(t, v1.PullPolicy("IfNotPresent"), operatorContainer.ImagePullPolicy) - assert.Equal(t, "gcr.io/datadoghq/operator:1.8.0", operatorContainer.Image) + assert.Equal(t, "gcr.io/datadoghq/operator:1.9.0", operatorContainer.Image) assert.NotContains(t, operatorContainer.Args, "-webhookEnabled=false") assert.NotContains(t, operatorContainer.Args, "-webhookEnabled=true") }