Merge branch 'main' into fanny/autopilot-cont-res

DataDog · Feb 9, 2024 · 87aa65e · 87aa65e
2 parents 6be1ff2 + 7d8e76c
commit 87aa65e
Show file tree

Hide file tree

Showing 50 changed files with 963 additions and 785 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -14,4 +14,5 @@ charts/datadog/templates/container-system-probe.yaml @DataDog/ebpf-platform @Dat
 charts/datadog/templates/system-probe-configmap.yaml @DataDog/ebpf-platform @DataDog/container-helm-chart-maintainers
 charts/datadog/templates/system-probe-init.yaml      @DataDog/ebpf-platform @DataDog/container-helm-chart-maintainers
 charts/synthetics-private-location/                  @Datadog/synthetics
-charts/observability-pipelines-worker                @DataDog/observability-pipelines-worker
+charts/observability-pipelines-worker                @DataDog/observability-pipelines
+charts/datadog/templates/_container-trace-agent.yaml @DataDog/agent-apm @DataDog/container-helm-chart-maintainers
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -11,6 +11,9 @@ We aim to follow high quality standards, thus your PR must follow some rules:
 - Make sure your changes are compatible (or protected) with older Kubernetes version (CI will validate this down to 1.14)
 - Make sure you updated documentation (after bumping `Chart.yaml`) by running `.github/helm-docs.sh`
 
+Additionally, your commits need to be signed and marked as verified by Github. See [About commit signature verification
+](https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification).
+
 Our team will then happily review and merge contributions!
 
 ## Go Tests
@@ -113,4 +116,4 @@ In each chart, the `README.md` file is generated from the corresponding `README.
 [pulumi]:https://www.pulumi.com/
 [test-infra-repo]:https://github.com/DataDog/test-infra-definitions
 [agent-e2e-source]:https://github.com/DataDog/datadog-agent/tree/main/test/new-e2e
-[test-infra-quickstart]:https://github.com/DataDog/test-infra-definitions#quick-start-guide
+[test-infra-quickstart]:https://github.com/DataDog/test-infra-definitions#quick-start-guide
diff --git a/charts/datadog-crds/CHANGELOG.md b/charts/datadog-crds/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.3.0
+* Update CRDs from Datadog Operator v1.3.0 tag.
+
 ## 1.2.0
 * Update CRDs from Datadog Operator v1.2.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: 1.2.0
+version: 1.3.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: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![AppVersion: 1](https://img.shields.io/badge/AppVersion-1-informational?style=flat-square)
+![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.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`.
 
@@ -25,6 +25,7 @@ But the recommended Kubernetes versions are `1.16+`.
 | crds.datadogAgents | bool | `false` | Set to true to deploy the DatadogAgents CRD |
 | crds.datadogMetrics | bool | `false` | Set to true to deploy the DatadogMetrics CRD |
 | crds.datadogMonitors | bool | `false` | Set to true to deploy the DatadogMonitors CRD |
+| crds.datadogSLOs | bool | `false` | Set to true to deploy the DatadogSLO CRD |
 | fullnameOverride | string | `""` | Override the fully qualified app name |
 | migration.datadogAgents.conversionWebhook.enabled | bool | `false` |  |
 | migration.datadogAgents.conversionWebhook.name | string | `"datadog-operator-webhook-service"` |  |

diff --git a/charts/datadog-crds/templates/datadoghq.com_datadogagents_v1.yaml b/charts/datadog-crds/templates/datadoghq.com_datadogagents_v1.yaml
@@ -6064,6 +6064,8 @@ spec:
                           type: object
                         originDetectionEnabled:
                           type: boolean
+                        tagCardinality:
+                          type: string
                         unixDomainSocketConfig:
                           properties:
                             enabled:
@@ -6119,6 +6121,8 @@ spec:
                         port:
                           format: int32
                           type: integer
+                        registerAPIService:
+                          type: boolean
                         useDatadogMetrics:
                           type: boolean
                         wpaController:
@@ -6275,6 +6279,11 @@ spec:
                               type: object
                           type: object
                       type: object
+                    processDiscovery:
+                      properties:
+                        enabled:
+                          type: boolean
+                      type: object
                     prometheusScrape:
                       properties:
                         additionalConfigs:
@@ -6291,6 +6300,31 @@ spec:
                         enabled:
                           type: boolean
                       type: object
+                    sbom:
+                      properties:
+                        containerImage:
+                          properties:
+                            analyzers:
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: set
+                            enabled:
+                              type: boolean
+                          type: object
+                        enabled:
+                          type: boolean
+                        host:
+                          properties:
+                            analyzers:
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: set
+                            enabled:
+                              type: boolean
+                          type: object
+                      type: object
                     tcpQueueLength:
                       properties:
                         enabled:
@@ -7501,148 +7535,6 @@ spec:
                                 type: string
                             type: object
                         type: object
-                      securityContextConstraints:
-                        properties:
-                          create:
-                            type: boolean
-                          customConfiguration:
-                            properties:
-                              allowHostDirVolumePlugin:
-                                type: boolean
-                              allowHostIPC:
-                                type: boolean
-                              allowHostNetwork:
-                                type: boolean
-                              allowHostPID:
-                                type: boolean
-                              allowHostPorts:
-                                type: boolean
-                              allowPrivilegedContainer:
-                                type: boolean
-                              allowedCapabilities:
-                                items:
-                                  type: string
-                                type: array
-                              allowedFlexVolumes:
-                                items:
-                                  properties:
-                                    driver:
-                                      type: string
-                                  type: object
-                                type: array
-                              apiVersion:
-                                type: string
-                              defaultAddCapabilities:
-                                items:
-                                  type: string
-                                type: array
-                              fsGroup:
-                                properties:
-                                  ranges:
-                                    items:
-                                      properties:
-                                        max:
-                                          format: int64
-                                          type: integer
-                                        min:
-                                          format: int64
-                                          type: integer
-                                      type: object
-                                    type: array
-                                  type:
-                                    type: string
-                                type: object
-                              groups:
-                                items:
-                                  type: string
-                                type: array
-                              kind:
-                                type: string
-                              metadata:
-                                type: object
-                              priority:
-                                format: int32
-                                type: integer
-                              readOnlyRootFilesystem:
-                                type: boolean
-                              requiredDropCapabilities:
-                                items:
-                                  type: string
-                                type: array
-                              runAsUser:
-                                properties:
-                                  type:
-                                    type: string
-                                  uid:
-                                    format: int64
-                                    type: integer
-                                  uidRangeMax:
-                                    format: int64
-                                    type: integer
-                                  uidRangeMin:
-                                    format: int64
-                                    type: integer
-                                type: object
-                              seLinuxContext:
-                                properties:
-                                  seLinuxOptions:
-                                    properties:
-                                      level:
-                                        type: string
-                                      role:
-                                        type: string
-                                      type:
-                                        type: string
-                                      user:
-                                        type: string
-                                    type: object
-                                  type:
-                                    type: string
-                                type: object
-                              seccompProfiles:
-                                items:
-                                  type: string
-                                type: array
-                              supplementalGroups:
-                                properties:
-                                  ranges:
-                                    items:
-                                      properties:
-                                        max:
-                                          format: int64
-                                          type: integer
-                                        min:
-                                          format: int64
-                                          type: integer
-                                      type: object
-                                    type: array
-                                  type:
-                                    type: string
-                                type: object
-                              users:
-                                items:
-                                  type: string
-                                type: array
-                              volumes:
-                                items:
-                                  type: string
-                                type: array
-                            required:
-                              - allowHostDirVolumePlugin
-                              - allowHostIPC
-                              - allowHostNetwork
-                              - allowHostPID
-                              - allowHostPorts
-                              - allowPrivilegedContainer
-                              - allowedCapabilities
-                              - allowedFlexVolumes
-                              - defaultAddCapabilities
-                              - priority
-                              - readOnlyRootFilesystem
-                              - requiredDropCapabilities
-                              - volumes
-                            type: object
-                        type: object
                       serviceAccountName:
                         type: string
                       tolerations: