Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into bundle-unspecified-…
Browse files Browse the repository at this point in the history 
…events
  • Loading branch information
@jscaltreto
jscaltreto committed Feb 13, 2025
2 parents 33fcdce + a1a226e commit 0e803d2
Show file tree
Hide file tree
Showing 54 changed files with 1,090 additions and 131 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ jobs:
charts: ${{ steps.list-changed.outputs.changed }}
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
- name: Set up Helm
uses: azure/setup-helm@v3.5
uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3.5.0
with:
version: v3.6.3
- uses: actions/setup-python@v4
- uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
with:
python-version: 3.12
- name: Set up chart-testing
uses: helm/chart-testing-action@v2.6.1
uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992 # v2.6.1
- name: Run chart-testing (list-changed)
id: list-changed
env:
Expand All @@ -52,14 +52,14 @@ jobs:
- changed
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
- uses: actions/setup-python@v4
- uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
with:
python-version: 3.12
- name: Set up chart-testing
uses: helm/chart-testing-action@v2.6.1
uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992 # v2.6.1
- name: Run chart-testing (lint)
run: ct lint --config .github/ct.yaml

Expand All @@ -69,7 +69,7 @@ jobs:
- changed
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
- name: Run helm-docs
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
- v1.31.1
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
- name: Add datadog helm repo
Expand Down Expand Up @@ -145,20 +145,20 @@ jobs:
kind: v0.22.0
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
- name: Create kind ${{ matrix.versions.k8s }} cluster with kind version ${{ matrix.versions.kind }}
uses: helm/kind-action@v1.10.0
uses: helm/kind-action@0025e74a8c7512023d06dc019c617aa3cf561fde # v1.10.0
with:
version: ${{ matrix.versions.kind }}
node_image: kindest/node:${{ matrix.versions.k8s}}
config: .github/kind_config.yaml
- uses: actions/setup-python@v4
- uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
with:
python-version: 3.12
- name: Set up chart-testing
uses: helm/chart-testing-action@v2.6.1
uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992 # v2.6.1
- name: Run chart-testing (install)
run: ct install --config .github/ct.yaml

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/go-test-private-action-runner.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@0caeaed6fd66a828038c2da3c0f662a42862658f # v1.1.3
with:
go-version: 1.21
id: go
- name: Set up Helm
uses: azure/setup-helm@v3.5
uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3.5.0
with:
version: v3.10.1
- 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
uses: actions/checkout@v1
uses: actions/checkout@50fbc622fc4ef5163becd7fab6573eac35f8462e # v1.2.0
- name: run Go tests
run: |
helm dependency build ./charts/private-action-runner
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/go-test.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@0caeaed6fd66a828038c2da3c0f662a42862658f # v1.1.3
with:
go-version: 1.21
id: go
- name: Set up Helm
uses: azure/setup-helm@v4.2.0
uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
with:
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
uses: actions/checkout@v1
uses: actions/checkout@50fbc622fc4ef5163becd7fab6573eac35f8462e # v1.2.0
- name: run Go tests
run: |
helm dependency build ./charts/datadog-operator
Expand Down Expand Up @@ -70,11 +70,11 @@ jobs:
kind: v0.22.0
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
- name: Create K8s ${{ matrix.versions.k8s }} cluster with kind version ${{ matrix.versions.kind }}
uses: helm/kind-action@v1.10.0
uses: helm/kind-action@0025e74a8c7512023d06dc019c617aa3cf561fde # v1.10.0
with:
version: ${{ matrix.versions.kind }}
node_image: kindest/node:${{ matrix.versions.k8s }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-labeler.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
pull-requests: write
timeout-minutes: 5
steps:
- uses: actions/labeler@v5
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
configuration-path: .github/workflows/labeler/labels.yaml
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
contents: write
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
with:
fetch-depth: 0
- name: Configure Git
Expand All @@ -29,7 +29,7 @@ jobs:
helm repo add datadog https://helm.datadoghq.com
helm repo add kube-state-metrics https://prometheus-community.github.io/helm-charts
- name: Run chart-releaser
uses: helm/chart-releaser-action@v1.5.0
uses: helm/chart-releaser-action@be16258da8010256c6e82849661221415f031968 # v1.5.0
env:
CR_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
CR_SKIP_EXISTING: true # Ignore chart changes when version was not updated (documentation)
8 changes: 8 additions & 0 deletions charts/datadog-crds/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

# 2.4.1

* Add DatadogGenericResources CRD.

# 2.4.0

* Update CRDs from Datadog Operator v1.12.0 tag.

# 2.3.0

* Update CRDs from Datadog Operator v1.11.0 tag.
Expand Down
2 changes: 1 addition & 1 deletion charts/datadog-crds/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: datadog-crds
description: Datadog Kubernetes CRDs chart
version: 2.3.0
version: 2.4.1
appVersion: "1"
keywords:
- monitoring
Expand Down
3 changes: 2 additions & 1 deletion charts/datadog-crds/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Datadog CRDs

![Version: 2.3.0](https://img.shields.io/badge/Version-2.3.0-informational?style=flat-square) ![AppVersion: 1](https://img.shields.io/badge/AppVersion-1-informational?style=flat-square)
![Version: 2.4.1](https://img.shields.io/badge/Version-2.4.1-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`.

Expand All @@ -25,6 +25,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.datadogGenericResources | bool | `false` | Set to true to deploy the DatadogGenericResources 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 |
Expand Down
6 changes: 6 additions & 0 deletions charts/datadog-crds/templates/datadoghq.com_datadogagentprofiles_v1.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,12 @@ spec:
If not specified, the pod priority will be default or zero if there is no
default.
type: string
runtimeClassName:
description: |-
If specified, indicates the pod's RuntimeClass kubelet should use to run the pod.
If the named RuntimeClass does not exist, or the CRI cannot run the corresponding handler, the pod enters the Failed terminal phase.
If no runtimeClassName is specified, the default RuntimeHandler is used, which is equivalent to the behavior when the RuntimeClass feature is disabled.
type: string
updateStrategy:
description: |-
The deployment strategy to use to replace existing pods with new ones.
Expand Down
138 changes: 138 additions & 0 deletions charts/datadog-crds/templates/datadoghq.com_datadogagents_v1.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,11 @@ spec:
type: boolean
failurePolicy:
type: string
kubernetesAdmissionEvents:
properties:
enabled:
type: boolean
type: object
mutateUnlabelled:
type: boolean
mutation:
Expand Down Expand Up @@ -708,6 +713,69 @@ spec:
scrubContainers:
type: boolean
type: object
otelCollector:
properties:
conf:
properties:
configData:
type: string
configMap:
properties:
items:
items:
properties:
key:
type: string
mode:
format: int32
type: integer
path:
type: string
required:
- key
- path
type: object
type: array
x-kubernetes-list-map-keys:
- key
x-kubernetes-list-type: map
name:
type: string
type: object
type: object
coreConfig:
properties:
enabled:
type: boolean
extensionTimeout:
type: integer
extensionURL:
type: string
type: object
enabled:
type: boolean
ports:
items:
properties:
containerPort:
format: int32
type: integer
hostIP:
type: string
hostPort:
format: int32
type: integer
name:
type: string
protocol:
default: TCP
type: string
required:
- containerPort
type: object
type: array
x-kubernetes-list-type: atomic
type: object
otlp:
properties:
receiver:
Expand Down Expand Up @@ -2444,6 +2512,8 @@ spec:
replicas:
format: int32
type: integer
runtimeClassName:
type: string
securityContext:
properties:
appArmorProfile:
Expand Down Expand Up @@ -3741,6 +3811,11 @@ spec:
type: boolean
failurePolicy:
type: string
kubernetesAdmissionEvents:
properties:
enabled:
type: boolean
type: object
mutateUnlabelled:
type: boolean
mutation:
Expand Down Expand Up @@ -4188,6 +4263,69 @@ spec:
scrubContainers:
type: boolean
type: object
otelCollector:
properties:
conf:
properties:
configData:
type: string
configMap:
properties:
items:
items:
properties:
key:
type: string
mode:
format: int32
type: integer
path:
type: string
required:
- key
- path
type: object
type: array
x-kubernetes-list-map-keys:
- key
x-kubernetes-list-type: map
name:
type: string
type: object
type: object
coreConfig:
properties:
enabled:
type: boolean
extensionTimeout:
type: integer
extensionURL:
type: string
type: object
enabled:
type: boolean
ports:
items:
properties:
containerPort:
format: int32
type: integer
hostIP:
type: string
hostPort:
format: int32
type: integer
name:
type: string
protocol:
default: TCP
type: string
required:
- containerPort
type: object
type: array
x-kubernetes-list-type: atomic
type: object
otlp:
properties:
receiver:
Expand Down
Loading

0 comments on commit 0e803d2

Please sign in to comment.