From dde765722646b16e20a9c6fa1256a10a4fce27d5 Mon Sep 17 00:00:00 2001 From: Kacper Date: Wed, 6 Apr 2022 19:01:15 +0200 Subject: [PATCH] Final versions + prelude --- go.mod | 14 +++++++------- pkg/otlp/model/go.mod | 2 +- pkg/util/log/go.mod | 2 +- pkg/util/winutil/go.mod | 4 ++-- release.json | 16 ++++++++-------- .../prelude-release-7.35.0-2a2e5520271803fa.yaml | 5 +++++ 6 files changed, 24 insertions(+), 19 deletions(-) create mode 100644 releasenotes/notes/prelude-release-7.35.0-2a2e5520271803fa.yaml diff --git a/go.mod b/go.mod index 88a72f38948603..d81ec321dd4971 100644 --- a/go.mod +++ b/go.mod @@ -54,13 +54,13 @@ require ( code.cloudfoundry.org/garden v0.0.0-20210208153517-580cadd489d2 code.cloudfoundry.org/lager v2.0.0+incompatible github.com/DataDog/agent-payload/v5 v5.0.16 - github.com/DataDog/datadog-agent/pkg/obfuscate v0.35.0-rc.9 - github.com/DataDog/datadog-agent/pkg/otlp/model v0.35.0-rc.9 - github.com/DataDog/datadog-agent/pkg/quantile v0.35.0-rc.9 - github.com/DataDog/datadog-agent/pkg/security/secl v0.35.0-rc.9 - github.com/DataDog/datadog-agent/pkg/util/log v0.35.0-rc.9 - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.35.0-rc.9 - github.com/DataDog/datadog-agent/pkg/util/winutil v0.35.0-rc.9 + github.com/DataDog/datadog-agent/pkg/obfuscate v0.35.0 + github.com/DataDog/datadog-agent/pkg/otlp/model v0.35.0 + github.com/DataDog/datadog-agent/pkg/quantile v0.35.0 + github.com/DataDog/datadog-agent/pkg/security/secl v0.35.0 + github.com/DataDog/datadog-agent/pkg/util/log v0.35.0 + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.35.0 + github.com/DataDog/datadog-agent/pkg/util/winutil v0.35.0 github.com/DataDog/datadog-go v4.8.3+incompatible github.com/DataDog/datadog-operator v0.5.0-rc.2.0.20210402083916-25ba9a22e67a github.com/DataDog/ebpf v0.0.0-20220301203322-3fc9ab3b8daf diff --git a/pkg/otlp/model/go.mod b/pkg/otlp/model/go.mod index f5f08340e8fd0d..57042f75a924c2 100644 --- a/pkg/otlp/model/go.mod +++ b/pkg/otlp/model/go.mod @@ -5,7 +5,7 @@ go 1.17 replace github.com/DataDog/datadog-agent/pkg/quantile => ../../quantile require ( - github.com/DataDog/datadog-agent/pkg/quantile v0.35.0-rc.9 + github.com/DataDog/datadog-agent/pkg/quantile v0.35.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/stretchr/testify v1.7.0 go.opentelemetry.io/collector/model v0.44.0 diff --git a/pkg/util/log/go.mod b/pkg/util/log/go.mod index 83795cd2e42cde..ed6939fc6faaff 100644 --- a/pkg/util/log/go.mod +++ b/pkg/util/log/go.mod @@ -5,7 +5,7 @@ go 1.17 replace github.com/DataDog/datadog-agent/pkg/util/scrubber => ../scrubber require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.35.0-rc.9 + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.35.0 github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 github.com/stretchr/testify v1.7.0 go.uber.org/zap v1.20.0 diff --git a/pkg/util/winutil/go.mod b/pkg/util/winutil/go.mod index 9cf2dc9dae3c3e..2c41bd6eb345d6 100644 --- a/pkg/util/winutil/go.mod +++ b/pkg/util/winutil/go.mod @@ -7,13 +7,13 @@ replace github.com/DataDog/datadog-agent/pkg/util/log => ../log replace github.com/DataDog/datadog-agent/pkg/util/scrubber => ../scrubber require ( - github.com/DataDog/datadog-agent/pkg/util/log v0.35.0-rc.9 + github.com/DataDog/datadog-agent/pkg/util/log v0.35.0 github.com/stretchr/testify v1.7.0 golang.org/x/sys v0.0.0-20210510120138-977fb7262007 ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.35.0-rc.9 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.35.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect diff --git a/release.json b/release.json index b5ab3b2a8cc43c..0080114a84fe15 100644 --- a/release.json +++ b/release.json @@ -29,25 +29,25 @@ "SECURITY_AGENT_POLICIES_VERSION": "master" }, "release-a6": { - "INTEGRATIONS_CORE_VERSION": "7.35.0-rc.6", - "OMNIBUS_SOFTWARE_VERSION": "7.35.0-rc.6", - "OMNIBUS_RUBY_VERSION": "7.35.0-rc.2", + "INTEGRATIONS_CORE_VERSION": "7.35.0", + "OMNIBUS_SOFTWARE_VERSION": "7.35.0", + "OMNIBUS_RUBY_VERSION": "7.35.0", "JMXFETCH_VERSION": "0.46.0", "JMXFETCH_HASH": "3c41c0660e9c53451dfb51e8dad33bc87b03be1abc1fcd3c856ea81e6b0894ee", "SECURITY_AGENT_POLICIES_VERSION": "v0.23.0", - "MACOS_BUILD_VERSION": "6.35.0-rc.1", + "MACOS_BUILD_VERSION": "6.35.0", "WINDOWS_DDNPM_DRIVER": "release-signed", "WINDOWS_DDNPM_VERSION": "1.3.2", "WINDOWS_DDNPM_SHASUM": "1f65d40519bc307d652c64183b2cac2a36da9839c21d64f9823aa158ff6336bb" }, "release-a7": { - "INTEGRATIONS_CORE_VERSION": "7.35.0-rc.6", - "OMNIBUS_SOFTWARE_VERSION": "7.35.0-rc.6", - "OMNIBUS_RUBY_VERSION": "7.35.0-rc.2", + "INTEGRATIONS_CORE_VERSION": "7.35.0", + "OMNIBUS_SOFTWARE_VERSION": "7.35.0", + "OMNIBUS_RUBY_VERSION": "7.35.0", "JMXFETCH_VERSION": "0.46.0", "JMXFETCH_HASH": "3c41c0660e9c53451dfb51e8dad33bc87b03be1abc1fcd3c856ea81e6b0894ee", "SECURITY_AGENT_POLICIES_VERSION": "v0.23.0", - "MACOS_BUILD_VERSION": "7.35.0-rc.1", + "MACOS_BUILD_VERSION": "7.35.0", "WINDOWS_DDNPM_DRIVER": "release-signed", "WINDOWS_DDNPM_VERSION": "1.3.2", "WINDOWS_DDNPM_SHASUM": "1f65d40519bc307d652c64183b2cac2a36da9839c21d64f9823aa158ff6336bb" diff --git a/releasenotes/notes/prelude-release-7.35.0-2a2e5520271803fa.yaml b/releasenotes/notes/prelude-release-7.35.0-2a2e5520271803fa.yaml new file mode 100644 index 00000000000000..60bad51b279995 --- /dev/null +++ b/releasenotes/notes/prelude-release-7.35.0-2a2e5520271803fa.yaml @@ -0,0 +1,5 @@ +prelude: + | + Release on: 2022-04-06 + + - Please refer to the `7.35.0 tag on integrations-core `_ for the list of changes on the Core Checks