Merge branch 'main' into fanny/CECO-1438/gdce

# Conflicts: # charts/datadog/CHANGELOG.md # test/datadog-operator/baseline/Operator_Deployment_default.yaml # test/datadog/baseline/agent-clusterchecks-deployment_default.yaml # test/datadog/baseline/cluster-agent-deployment_default.yaml # test/datadog/baseline/cluster-agent-deployment_default_advanced_AC_injection.yaml # test/datadog/baseline/cluster-agent-deployment_default_minimal_AC_injection.yaml # test/datadog/baseline/daemonset_default.yaml # test/datadog/baseline/other_default.yaml
DataDog · Nov 11, 2024 · 786bd1d · 786bd1d
2 parents c58dbaa + db5854c
commit 786bd1d
Show file tree

Hide file tree

Showing 38 changed files with 735 additions and 91 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -5,6 +5,11 @@ on:
     paths:
       - "charts/**"
 
+# Permission forced by repo-level setting; only elevate on job-level
+permissions:
+  contents: read
+  # packages: read
+
 jobs:
   changed:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/go-test-private-action-runner.yaml b/.github/workflows/go-test-private-action-runner.yaml
@@ -8,6 +8,12 @@ on:
     paths:
       - 'test/private-action-runner/**'
       - 'charts/private-action-runner/**'
+
+# Permission forced by repo-level setting; only elevate on job-level
+permissions:
+  contents: read
+  # packages: read
+
 env:
   GO111MODULE: "on"
   PROJECTNAME: "helm-charts"

diff --git a/.github/workflows/go-test.yaml b/.github/workflows/go-test.yaml
@@ -8,6 +8,12 @@ on:
     paths:
       - 'test/datadog-operator/**'
       - 'charts/datadog-operator/**'
+
+# Permission forced by repo-level setting; only elevate on job-level
+permissions:
+  contents: read
+  # packages: read
+
 env:
   GO111MODULE: "on"
   PROJECTNAME: "helm-charts"

diff --git a/.github/workflows/pr-labeler.yaml b/.github/workflows/pr-labeler.yaml
@@ -4,10 +4,17 @@ on:
     branches:
       - main
 
+# Permission forced by repo-level setting; only elevate on job-level
+permissions:
+  contents: read
+  # packages: read
+
 jobs:
   label:
     name: Add label for PRs
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
     timeout-minutes: 5
     steps:
       - uses: actions/labeler@v5

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -7,9 +7,14 @@ on:
     paths:
       - 'charts/**'
 
+permissions: {}
+
 jobs:
   release:
     runs-on: ubuntu-latest
+    permissions:
+      # https://github.com/helm/chart-releaser-action
+      contents: write
     steps:
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/charts/datadog-crds/CHANGELOG.md b/charts/datadog-crds/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+# 2.2.0
+
+* Update CRDs from Datadog Operator v1.10.0 tag.
+
 ## 2.1.0
 
 * Update CRDs from Datadog Operator v1.9.0 tag.

diff --git a/charts/datadog-crds/Chart.yaml b/charts/datadog-crds/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: datadog-crds
 description: Datadog Kubernetes CRDs chart
-version: 2.1.0
+version: 2.2.0
 appVersion: "1"
 keywords:
 - monitoring

diff --git a/charts/datadog-crds/README.md b/charts/datadog-crds/README.md
@@ -1,6 +1,6 @@
 # Datadog CRDs
 
-![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![AppVersion: 1](https://img.shields.io/badge/AppVersion-1-informational?style=flat-square)
+![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![AppVersion: 1](https://img.shields.io/badge/AppVersion-1-informational?style=flat-square)
 
 This chart was designed to allow other "datadog" charts to share `CustomResourceDefinitions` such as the `DatadogMetric`.
 

diff --git a/charts/datadog-crds/templates/datadoghq.com_datadogagents_v1.yaml b/charts/datadog-crds/templates/datadoghq.com_datadogagents_v1.yaml
@@ -701,13 +701,29 @@ spec:
                                       type: boolean
                                     endpoint:
                                       type: string
+                                    hostPortConfig:
+                                      properties:
+                                        enabled:
+                                          type: boolean
+                                        hostPort:
+                                          format: int32
+                                          type: integer
+                                      type: object
                                   type: object
                                 http:
                                   properties:
                                     enabled:
                                       type: boolean
                                     endpoint:
                                       type: string
+                                    hostPortConfig:
+                                      properties:
+                                        enabled:
+                                          type: boolean
+                                        hostPort:
+                                          format: int32
+                                          type: integer
+                                      type: object
                                   type: object
                               type: object
                           type: object
@@ -851,6 +867,73 @@ spec:
                         url:
                           type: string
                       type: object
+                    env:
+                      items:
+                        properties:
+                          name:
+                            type: string
+                          value:
+                            type: string
+                          valueFrom:
+                            properties:
+                              configMapKeyRef:
+                                properties:
+                                  key:
+                                    type: string
+                                  name:
+                                    type: string
+                                  optional:
+                                    type: boolean
+                                required:
+                                  - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              fieldRef:
+                                properties:
+                                  apiVersion:
+                                    type: string
+                                  fieldPath:
+                                    type: string
+                                required:
+                                  - fieldPath
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              resourceFieldRef:
+                                properties:
+                                  containerName:
+                                    type: string
+                                  divisor:
+                                    anyOf:
+                                      - type: integer
+                                      - type: string
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  resource:
+                                    type: string
+                                required:
+                                  - resource
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              secretKeyRef:
+                                properties:
+                                  key:
+                                    type: string
+                                  name:
+                                    type: string
+                                  optional:
+                                    type: boolean
+                                required:
+                                  - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            type: object
+                        required:
+                          - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                        - name
+                      x-kubernetes-list-type: map
                     fips:
                       properties:
                         customFIPSConfig:
@@ -1006,6 +1089,18 @@ spec:
                         tlsVerify:
                           type: boolean
                       type: object
+                    kubernetesResourcesAnnotationsAsTags:
+                      additionalProperties:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      type: object
+                    kubernetesResourcesLabelsAsTags:
+                      additionalProperties:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      type: object
                     localService:
                       properties:
                         forceEnableLocalService:
@@ -1076,6 +1171,31 @@ spec:
                       type: object
                     registry:
                       type: string
+                    secretBackend:
+                      properties:
+                        args:
+                          type: string
+                        command:
+                          type: string
+                        enableGlobalPermissions:
+                          type: boolean
+                        roles:
+                          items:
+                            properties:
+                              namespace:
+                                type: string
+                              secrets:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: set
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        timeout:
+                          format: int32
+                          type: integer
+                      type: object
                     site:
                       type: string
                     tags:
@@ -1975,6 +2095,29 @@ spec:
                         x-kubernetes-list-map-keys:
                           - name
                         x-kubernetes-list-type: map
+                      envFrom:
+                        items:
+                          properties:
+                            configMapRef:
+                              properties:
+                                name:
+                                  type: string
+                                optional:
+                                  type: boolean
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            prefix:
+                              type: string
+                            secretRef:
+                              properties:
+                                name:
+                                  type: string
+                                optional:
+                                  type: boolean
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        type: array
                       extraChecksd:
                         properties:
                           configDataMap:
@@ -2137,6 +2280,10 @@ spec:
                                 type: string
                             type: object
                         type: object
+                      serviceAccountAnnotations:
+                        additionalProperties:
+                          type: string
+                        type: object
                       serviceAccountName:
                         type: string
                       tolerations:
@@ -3723,13 +3870,29 @@ spec:
                                           type: boolean
                                         endpoint:
                                           type: string
+                                        hostPortConfig:
+                                          properties:
+                                            enabled:
+                                              type: boolean
+                                            hostPort:
+                                              format: int32
+                                              type: integer
+                                          type: object
                                       type: object
                                     http:
                                       properties:
                                         enabled:
                                           type: boolean
                                         endpoint:
                                           type: string
+                                        hostPortConfig:
+                                          properties:
+                                            enabled:
+                                              type: boolean
+                                            hostPort:
+                                              format: int32
+                                              type: integer
+                                          type: object
                                       type: object
                                   type: object
                               type: object

diff --git a/charts/datadog-operator/CHANGELOG.md b/charts/datadog-operator/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.3.0
+
+* Update Datadog Operator version to 1.10.0.
+
 ## 2.2.0
 
 * Add clusterRole.allowReadAllResources to allow viewing all resources. This is required for collecting custom resources in the Kubernetes Explorer

diff --git 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.1.0
-digest: sha256:8f24ab33303f20421688b071b9fb028c0662795952298300ed4b9a060a4332ac
-generated: "2024-10-10T12:48:27.526346-04:00"
+  version: 2.2.0
+digest: sha256:42b9b7296f565f17f11adea26fa8cb003c0f01551a84793873a3ae6c73efedc2
+generated: "2024-11-08T14:03:54.721912-05:00"
diff --git a/charts/datadog-operator/Chart.yaml b/charts/datadog-operator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: datadog-operator
-version: 2.2.0
-appVersion: 1.9.0
+version: 2.3.0
+appVersion: 1.10.0
 description: Datadog Operator
 keywords:
 - monitoring
@@ -17,7 +17,7 @@ maintainers:
   email: support@datadoghq.com
 dependencies:
 - name: datadog-crds
-  version: "=2.1.0"
+  version: "=2.2.0"
   alias: datadogCRDs
   repository: https://helm.datadoghq.com
   condition: installCRDs

diff --git a/charts/datadog-operator/README.md b/charts/datadog-operator/README.md
@@ -1,6 +1,6 @@
 # Datadog Operator
 
-![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)
+![Version: 2.3.0](https://img.shields.io/badge/Version-2.3.0-informational?style=flat-square) ![AppVersion: 1.10.0](https://img.shields.io/badge/AppVersion-1.10.0-informational?style=flat-square)
 
 ## Values
 
@@ -33,7 +33,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.9.0"` | Define the Datadog Operator version to use |
+| image.tag | string | `"1.10.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
@@ -85,6 +85,6 @@ Check operator image tag version.
 {{- if not .Values.image.doNotCheckTag -}}
 {{- .Values.image.tag -}}
 {{- else -}}
-{{ "1.9.0" }}
+{{ "1.10.0" }}
 {{- end -}}
 {{- end -}}
diff --git 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.9.0
+  tag: 1.10.0
   # image.pullPolicy -- Define the pullPolicy for Datadog Operator image
   pullPolicy: IfNotPresent
   # image.doNotCheckTag -- Permit skipping operator image tag compatibility with the chart.