Merge remote-tracking branch 'origin/main' into mrmcpat-apm-uselocals…

…ervice # Conflicts: # charts/datadog/CHANGELOG.md # charts/datadog/Chart.yaml # charts/datadog/README.md
DataDog · Nov 19, 2024 · 2009011 · 2009011
2 parents 514445b + 9479b17
commit 2009011
Show file tree

Hide file tree

Showing 82 changed files with 2,703 additions and 360 deletions.
diff --git a/.github/helm-docs.sh b/.github/helm-docs.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -euo pipefail
 
-HELM_DOCS_VERSION="1.10.0"
+HELM_DOCS_VERSION="1.14.2"
 OS=$(uname)
 ARCH=$(uname -m)
 

diff --git a/.github/kubeconform.sh b/.github/kubeconform.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -euo pipefail
 
-KUBECONFORM_VERSION="v0.6.4"
+KUBECONFORM_VERSION="v0.6.7"
 # https://github.com/yannh/kubeconform/issues/51
 CRD_SPEC_URL="https://raw.githubusercontent.com/kubernetes/kubernetes/master/api/openapi-spec/v3/apis__apiextensions.k8s.io__v1_openapi.json"
 # Remove after v1.16 support / testing is dropped

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -5,14 +5,19 @@ 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
     outputs:
       charts: ${{ steps.list-changed.outputs.changed }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Helm
@@ -23,7 +28,7 @@ jobs:
         with:
           python-version: 3.7
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.3.1
+        uses: helm/chart-testing-action@v2.6.1
       - name: Run chart-testing (list-changed)
         id: list-changed
         env:
@@ -47,14 +52,14 @@ jobs:
       - changed
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/setup-python@v4
         with:
           python-version: 3.7
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.3.1
+        uses: helm/chart-testing-action@v2.6.1
       - name: Run chart-testing (lint)
         run: ct lint --config .github/ct.yaml
 
@@ -64,7 +69,7 @@ jobs:
       - changed
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Run helm-docs
@@ -87,10 +92,15 @@ jobs:
           - v1.22.17
           - v1.24.17
           - v1.25.16
-          - v1.26.13
+          - v1.26.15
+          - v1.27.16
+          - v1.28.13
+          - v1.29.8
+          - v1.30.4
+          - v1.31.1
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Add datadog helm repo
@@ -112,27 +122,43 @@ jobs:
       - kubeconform-chart
     strategy:
       matrix:
-        k8s:
-          - v1.18.20
-          - v1.22.9
-          - v1.24.2
-          - v1.25.16
-          - v1.26.13
+        versions:
+          - k8s: v1.18.20
+            kind: v0.17.0
+          - k8s: v1.22.17
+            kind: v0.22.0
+          - k8s: v1.24.17
+            kind: v0.22.0
+          - k8s: v1.25.16
+            kind: v0.22.0
+          - k8s: v1.26.15
+            kind: v0.22.0
+          - k8s: v1.27.16
+            kind: v0.22.0
+          - k8s: v1.28.13
+            kind: v0.22.0
+          - k8s: v1.29.8
+            kind: v0.22.0
+          - k8s: v1.30.4
+            kind: v0.22.0
+          - k8s: v1.31.1
+            kind: v0.22.0
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Create kind ${{ matrix.k8s }} cluster
-        uses: helm/kind-action@v1.5.0
+      - name: Create kind ${{ matrix.versions.k8s }} cluster with kind version ${{ matrix.versions.kind }}
+        uses: helm/kind-action@v1.10.0
         with:
-          node_image: kindest/node:${{ matrix.k8s }}
+          version: ${{ matrix.versions.kind }}
+          node_image: kindest/node:${{ matrix.versions.k8s}}
           config: .github/kind_config.yaml
       - uses: actions/setup-python@v4
         with:
           python-version: 3.7
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.3.1
+        uses: helm/chart-testing-action@v2.6.1
       - name: Run chart-testing (install)
         run: ct install --config .github/ct.yaml
 

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"
@@ -21,9 +27,9 @@ jobs:
         go-version: 1.21
       id: go
     - name: Set up Helm
-      uses: azure/setup-helm@v3.5
+      uses: azure/setup-helm@v4.2.0
       with:
-        version: v3.10.1
+        version: v3.14.0
     - name: Add Datadog Helm repo
       run: helm repo add datadog https://helm.datadoghq.com && helm repo update
     - name: Check out code into the Go module directory
@@ -39,27 +45,40 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        k8s:
-          - v1.16.15
-          - v1.18.20
-          - v1.22.9
-          - v1.24.2
-          - v1.25.2
-          - v1.26.6
-          - v1.27.3
-          - v1.28.7
-          - v1.29.2
-          - v1.30.0
+        versions:
+          - k8s: v1.16.15
+            kind: v0.15.0
+          - k8s: v1.18.20
+            kind: v0.17.0
+          - k8s: v1.22.17
+            kind: v0.22.0
+          - k8s: v1.24.17
+            kind: v0.22.0
+          - k8s: v1.25.16
+            kind: v0.22.0
+          - k8s: v1.26.15
+            kind: v0.22.0
+          - k8s: v1.27.16
+            kind: v0.22.0
+          - k8s: v1.28.13
+            kind: v0.22.0
+          - k8s: v1.29.8
+            kind: v0.22.0
+          - k8s: v1.30.4
+            kind: v0.22.0
+          - k8s: v1.31.1
+            kind: v0.22.0
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Create kind ${{ matrix.k8s }} cluster
-        uses: helm/kind-action@v1.5.0
+      - name: Create K8s ${{ matrix.versions.k8s }} cluster with kind version ${{ matrix.versions.kind }}
+        uses: helm/kind-action@v1.10.0
         with:
-          node_image: kindest/node:${{ matrix.k8s }}
-          cluster_name: operator-ci-${{ matrix.k8s }}
+          version: ${{ matrix.versions.kind }}
+          node_image: kindest/node:${{ matrix.versions.k8s }}
+          cluster_name: operator-ci-${{ matrix.versions.k8s }}
           config: .github/kind_config.yaml
       - name: Add Cert Manager Helm repo
         run: helm repo add jetstack https://charts.jetstack.io && helm repo update
@@ -69,8 +88,8 @@ jobs:
         env:
           API_KEY: ${{ secrets.GO_INTEG_TEST_API_KEY }}
           APP_KEY: ${{ secrets.GO_INTEG_TEST_APP_KEY }}
-          CLUSTER_NAME: operator-ci-${{ matrix.k8s }}
-          K8S_VERSION: ${{ matrix.k8s }}
+          CLUSTER_NAME: operator-ci-${{ matrix.versions.k8s }}
+          K8S_VERSION: ${{ matrix.versions.k8s }}
         run: |
           kubectl cluster-info
           kubectl get nodes

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,14 @@
 # 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.
+* Add DatadogDashboards CRD.
+
 ## 2.0.0
 
 * Update CRDs from Datadog Operator v1.8.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.0.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.0.0](https://img.shields.io/badge/Version-2.0.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`.
 
@@ -24,6 +24,7 @@ But the recommended Kubernetes versions are `1.16+`.
 |-----|------|---------|-------------|
 | crds.datadogAgentProfiles | bool | `false` | Set to true to deploy the DatadogAgentProfiles CRD |
 | crds.datadogAgents | bool | `false` | Set to true to deploy the DatadogAgents CRD |
+| crds.datadogDashboards | bool | `false` | Set to true to deploy the DatadogDashboards 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.datadogPodAutoscalers | bool | `false` | Set to true to deploy the DatadogPodAutoscalers CRD |

diff --git a/charts/datadog-crds/templates/datadoghq.com_datadogagentprofiles_v1.yaml b/charts/datadog-crds/templates/datadoghq.com_datadogagentprofiles_v1.yaml
@@ -250,7 +250,40 @@ spec:
                               If not specified, the pod priority will be default or zero if there is no
                               default.
                             type: string
+                          updateStrategy:
+                            description: |-
+                              The deployment strategy to use to replace existing pods with new ones.
+                              Valid types are `RollingUpdate` or `OnDelete` for DaemonSets
+                            properties:
+                              rollingUpdate:
+                                description: Configure the rolling update strategy of the Deployment or DaemonSet.
+                                properties:
+                                  maxSurge:
+                                    anyOf:
+                                      - type: integer
+                                      - type: string
+                                    description: |-
+                                      MaxSurge behaves differently based on the Kubernetes resource. Refer to the
+                                      Kubernetes API documentation for additional details.
+                                    x-kubernetes-int-or-string: true
+                                  maxUnavailable:
+                                    anyOf:
+                                      - type: integer
+                                      - type: string
+                                    description: |-
+                                      The maximum number of pods that can be unavailable during the update.
+                                      Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%).
+                                      Refer to the Kubernetes API documentation for additional details..
+                                    x-kubernetes-int-or-string: true
+                                type: object
+                              type:
+                                description: |-
+                                  Type can be "RollingUpdate" or "OnDelete" for DaemonSets and "RollingUpdate"
+                                  or "Recreate" for Deployments
+                                type: string
+                            type: object
                         type: object
+                      description: Override the default configurations of the node agent.
                       type: object
                   type: object
                 profileAffinity:
@@ -373,6 +406,29 @@ spec:
                   x-kubernetes-list-map-keys:
                     - type
                   x-kubernetes-list-type: map
+                createStrategy:
+                  description: CreateStrategy is the state of the create strategy feature.
+                  properties:
+                    lastTransition:
+                      description: LastTransition is the last time the status was updated.
+                      format: date-time
+                      type: string
+                    maxUnavailable:
+                      description: MaxUnavailable shows the number of pods that can be in an unready state.
+                      format: int32
+                      type: integer
+                    nodesLabeled:
+                      description: NodesLabeled shows the number of nodes currently labeled.
+                      format: int32
+                      type: integer
+                    podsReady:
+                      description: PodsReady shows the number of pods in the ready state.
+                      format: int32
+                      type: integer
+                    status:
+                      description: Status shows the current state of the feature.
+                      type: string
+                  type: object
                 currentHash:
                   description: CurrentHash is the stored hash of the DatadogAgentProfile.
                   type: string