Skip to content
Open
7 changes: 0 additions & 7 deletions api/datadoghq/v2alpha1/datadogagent_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -2395,13 +2395,6 @@ type ExperimentStatus struct {
// ID is the unique experiment ID sent by Fleet Automation.
// +optional
ID string `json:"id,omitempty"`
// Generation is the DDA metadata.generation recorded when the experiment started.
// Used to detect manual spec changes while the experiment is running: if the
// current DDA generation differs from this value, the operator aborts the experiment.
//
// This value must be recorded after the DDA is patched for a startExperiment signal.
// +optional
Generation int64 `json:"generation,omitempty"`
}

// DatadogAgentStatus defines the observed state of DatadogAgent.
Expand Down
7 changes: 0 additions & 7 deletions api/datadoghq/v2alpha1/zz_generated.openapi.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ func run(opts *options) error {
}

if opts.remoteUpdatesEnabled {
if rcErr := setupFleetDaemon(setupLog, mgr, rcUpdater.Client()); rcErr != nil {
if rcErr := setupFleetDaemon(setupLog, mgr, rcUpdater.Client(), opts.createControllerRevisions && opts.datadogAgentInternalEnabled); rcErr != nil {
setupErrorf(setupLog, rcErr, "Unable to setup Fleet daemon")
}
}
Expand Down Expand Up @@ -670,7 +670,7 @@ func setupAndStartHelmMetadataForwarder(logger logr.Logger, mgr manager.Manager,
return mgr.Add(hmf)
}

func setupFleetDaemon(logger logr.Logger, mgr manager.Manager, rcClient remoteconfig.RCClient) error {
daemon := fleet.NewDaemon(logger.WithName("fleet"), rcClient)
func setupFleetDaemon(logger logr.Logger, mgr manager.Manager, rcClient remoteconfig.RCClient, revisionsEnabled bool) error {
daemon := fleet.NewDaemon(rcClient, mgr.GetClient(), revisionsEnabled)
return mgr.Add(daemon)
}
9 changes: 0 additions & 9 deletions config/crd/bases/v1/datadoghq.com_datadogagents.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8492,15 +8492,6 @@ spec:
experiment:
description: Experiment tracks the state of an active or recent Fleet Automation experiment.
properties:
generation:
description: |-
Generation is the DDA metadata.generation recorded when the experiment started.
Used to detect manual spec changes while the experiment is running: if the
current DDA generation differs from this value, the operator aborts the experiment.

This value must be recorded after the DDA is patched for a startExperiment signal.
format: int64
type: integer
id:
description: ID is the unique experiment ID sent by Fleet Automation.
type: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8194,11 +8194,6 @@
"additionalProperties": false,
"description": "Experiment tracks the state of an active or recent Fleet Automation experiment.",
"properties": {
"generation": {
"description": "Generation is the DDA metadata.generation recorded when the experiment started.\nUsed to detect manual spec changes while the experiment is running: if the\ncurrent DDA generation differs from this value, the operator aborts the experiment.\n\nThis value must be recorded after the DDA is patched for a startExperiment signal.",
"format": "int64",
"type": "integer"
},
"id": {
"description": "ID is the unique experiment ID sent by Fleet Automation.",
"type": "string"
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ require (
github.com/DataDog/datadog-agent/pkg/config/model v0.59.0-rc.5
github.com/DataDog/datadog-agent/pkg/config/remote v0.59.0-rc.5
github.com/DataDog/datadog-agent/pkg/proto v0.63.0-rc.1
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.59.0-rc.5
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.77.3
github.com/DataDog/datadog-operator/api v0.0.0-20250130131115-7f198adcc856
github.com/aws/aws-sdk-go-v2 v1.39.6
github.com/aws/aws-sdk-go-v2/config v1.29.17
Expand Down Expand Up @@ -90,7 +90,7 @@ require (
github.com/DataDog/datadog-go/v5 v5.6.0 // indirect
github.com/DataDog/go-libddwaf/v3 v3.3.0 // indirect
github.com/DataDog/go-sqllexer v0.0.15 // indirect
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
github.com/DataDog/go-tuf v1.1.1-0.5.2 // indirect
github.com/DataDog/gostackparse v0.7.0 // indirect
github.com/DataDog/sketches-go v1.4.5 // indirect
github.com/DataDog/viper v1.13.5 // indirect
Expand Down Expand Up @@ -226,7 +226,7 @@ require (
github.com/rubenv/sql-migrate v1.8.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/shirou/gopsutil/v3 v3.24.1 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ github.com/DataDog/datadog-agent/pkg/obfuscate v0.59.0-rc.5 h1:Z+vgXHXmSnVRlCpcP
github.com/DataDog/datadog-agent/pkg/obfuscate v0.59.0-rc.5/go.mod h1:ATVw8kr3U1Eqz3qBz9kS6WFDKji9XyoAsHKSlj3hPTM=
github.com/DataDog/datadog-agent/pkg/proto v0.63.0-rc.1 h1:5Xr7XQoINzwO0PswNKClUW4b/ZfsTefVHxTAjfMY4Qk=
github.com/DataDog/datadog-agent/pkg/proto v0.63.0-rc.1/go.mod h1:QOAaPRsuM4WNXtP3Rbw+gWamge9lGnDH8ZKB6HdzoAs=
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.59.0-rc.5 h1:kCZxrxVVfbYAA8oMB4s7yb8XbO5WMkBmygcgKm3xh7o=
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.59.0-rc.5/go.mod h1:c4th0IFaP0Q1ofRa0GcPB9hJWN+cmUoEfOI1Ub0O50A=
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.77.3 h1:cQvV1Qiq0EBdbGxfU4ECDJ8Nl3xYXcNUe6QzXw73pA4=
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.77.3/go.mod h1:TpW5ZwsQTrlRBPjtZH5/OFwpmOqxV/v2i9BiF4Xfcac=
github.com/DataDog/datadog-agent/pkg/util/backoff v0.59.0-rc.5 h1:mAXwj00h3GqpiY7yECDLwLvCOAXswx3mIiU9N6Ki1GU=
github.com/DataDog/datadog-agent/pkg/util/backoff v0.59.0-rc.5/go.mod h1:2RMfdYkKyeh8hXs6WgaamkkEyK35Xo55C4rFG4dO1k8=
github.com/DataDog/datadog-agent/pkg/util/cache v0.59.0-rc.5 h1:+20QEL2pI+IwOqqesjhzzWkv6GcOe3TrIgUQtg6ZdTE=
Expand Down Expand Up @@ -110,8 +110,8 @@ github.com/DataDog/go-libddwaf/v3 v3.3.0 h1:jS72fuQpFgJZEdEJDmHJCPAgNTEMZoz1EUvi
github.com/DataDog/go-libddwaf/v3 v3.3.0/go.mod h1:Bz/0JkpGf689mzbUjKJeheJINqsyyhM8p9PDuHdK2Ec=
github.com/DataDog/go-sqllexer v0.0.15 h1:rUUu52dP8EQhJLnUw0MIAxZp0BQx2fOTuMztr3vtHUU=
github.com/DataDog/go-sqllexer v0.0.15/go.mod h1:KwkYhpFEVIq+BfobkTC1vfqm4gTi65skV/DpDBXtexc=
github.com/DataDog/go-tuf v1.1.0-0.5.2 h1:4CagiIekonLSfL8GMHRHcHudo1fQnxELS9g4tiAupQ4=
github.com/DataDog/go-tuf v1.1.0-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0=
github.com/DataDog/go-tuf v1.1.1-0.5.2 h1:YWvghV4ZvrQsPcUw8IOUMSDpqc3W5ruOIC+KJxPknv0=
github.com/DataDog/go-tuf v1.1.1-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0=
github.com/DataDog/gostackparse v0.7.0 h1:i7dLkXHvYzHV308hnkvVGDL3BR4FWl7IsXNPz/IGQh4=
github.com/DataDog/gostackparse v0.7.0/go.mod h1:lTfqcJKqS9KnXQGnyQMCugq3u1FP6UZMfWR0aitKFMM=
github.com/DataDog/sketches-go v1.4.5 h1:ki7VfeNz7IcNafq7yI/j5U/YCkO3LJiMDtXz9OMQbyE=
Expand Down Expand Up @@ -1097,8 +1097,8 @@ github.com/santhosh-tekuri/jsonschema/v6 v6.0.2/go.mod h1:JXeL+ps8p7/KNMjDQk3TCw
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
github.com/secure-systems-lab/go-securesystemslib v0.7.0 h1:OwvJ5jQf9LnIAS83waAjPbcMsODrTQUpJ02eNLUoxBg=
github.com/secure-systems-lab/go-securesystemslib v0.7.0/go.mod h1:/2gYnlnHVQ6xeGtfIqFy7Do03K4cdCY0A/GlJLDKLHI=
github.com/secure-systems-lab/go-securesystemslib v0.9.0 h1:rf1HIbL64nUpEIZnjLZ3mcNEL9NBPB0iuVjyxvq3LZc=
github.com/secure-systems-lab/go-securesystemslib v0.9.0/go.mod h1:DVHKMcZ+V4/woA/peqr+L0joiRXbPpQ042GgJckkFgw=
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI=
Expand Down
Loading
Loading