From 0a95180615010416ec50b6274504ffae46722919 Mon Sep 17 00:00:00 2001 From: khewonc <39867936+khewonc@users.noreply.github.com> Date: Tue, 7 May 2024 12:57:42 -0400 Subject: [PATCH] Fix clusterrole for dap (#1386) --- charts/datadog-operator/CHANGELOG.md | 4 ++++ charts/datadog-operator/Chart.yaml | 2 +- charts/datadog-operator/README.md | 2 +- charts/datadog-operator/templates/clusterrole.yaml | 2 +- .../baseline/Operator_Deployment_default.yaml | 2 +- .../baseline/Operator_Deployment_with_certManager.yaml | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/charts/datadog-operator/CHANGELOG.md b/charts/datadog-operator/CHANGELOG.md index 53cf3c005..0626cf7e0 100644 --- a/charts/datadog-operator/CHANGELOG.md +++ b/charts/datadog-operator/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 1.6.1 + +* Fix clusterRole when DatadogAgentProfiles are enabled. + ## 1.6.0 * Update Datadog Operator version to 1.5.0. diff --git a/charts/datadog-operator/Chart.yaml b/charts/datadog-operator/Chart.yaml index 5b9e088fd..0ed41ed95 100644 --- a/charts/datadog-operator/Chart.yaml +++ b/charts/datadog-operator/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: datadog-operator -version: 1.6.0 +version: 1.6.1 appVersion: 1.5.0 description: Datadog Operator keywords: diff --git a/charts/datadog-operator/README.md b/charts/datadog-operator/README.md index 1bca7e62d..17cb42a76 100644 --- a/charts/datadog-operator/README.md +++ b/charts/datadog-operator/README.md @@ -1,6 +1,6 @@ # Datadog Operator -![Version: 1.6.0](https://img.shields.io/badge/Version-1.6.0-informational?style=flat-square) ![AppVersion: 1.5.0](https://img.shields.io/badge/AppVersion-1.5.0-informational?style=flat-square) +![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![AppVersion: 1.5.0](https://img.shields.io/badge/AppVersion-1.5.0-informational?style=flat-square) ## Values diff --git a/charts/datadog-operator/templates/clusterrole.yaml b/charts/datadog-operator/templates/clusterrole.yaml index 15bbfb51b..0727369e3 100644 --- a/charts/datadog-operator/templates/clusterrole.yaml +++ b/charts/datadog-operator/templates/clusterrole.yaml @@ -696,7 +696,7 @@ rules: verbs: - list - watch -{{- if .Values.enableDatadogAgentProfile }} +{{- if .Values.datadogAgentProfile.enabled }} - apiGroups: - "" resources: diff --git a/test/datadog-operator/baseline/Operator_Deployment_default.yaml b/test/datadog-operator/baseline/Operator_Deployment_default.yaml index cd87f7825..0140aea4e 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-1.6.0 + helm.sh/chart: datadog-operator-1.6.1 app.kubernetes.io/instance: datadog-operator app.kubernetes.io/version: "1.5.0" app.kubernetes.io/managed-by: Helm diff --git a/test/datadog-operator/baseline/Operator_Deployment_with_certManager.yaml b/test/datadog-operator/baseline/Operator_Deployment_with_certManager.yaml index 00c01a31b..9d3e5e10e 100644 --- a/test/datadog-operator/baseline/Operator_Deployment_with_certManager.yaml +++ b/test/datadog-operator/baseline/Operator_Deployment_with_certManager.yaml @@ -7,7 +7,7 @@ metadata: namespace: datadog-agent labels: app.kubernetes.io/name: datadog-operator - helm.sh/chart: datadog-operator-1.6.0 + helm.sh/chart: datadog-operator-1.6.1 app.kubernetes.io/instance: datadog-operator app.kubernetes.io/version: "1.5.0" app.kubernetes.io/managed-by: Helm