[release] Update release.json and Go modules for 6/7.43.2-rc.1 (#16616)

* Update release.json and Go modules for 6/7.43.2-rc.1 * add fallback instance types for security agent functional tests (#16303) * fallback on `t2.xlarge` for security agent functional tests * even more fallbacks --------- Co-authored-by: Paul Cacheux <[email protected]>
DataDog · Apr 15, 2023 · 3069e62 · 3069e62
1 parent 528a800
commit 3069e62
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 25 deletions.
diff --git a/.gitlab/functional_test/security_agent.yml b/.gitlab/functional_test/security_agent.yml
@@ -91,7 +91,7 @@ kitchen_test_security_agent_amazonlinux_x64:
   needs: [ "tests_ebpf_x64" ]
   variables:
     KITCHEN_ARCH: x86_64
-    KITCHEN_EC2_INSTANCE_TYPE: "t3.medium"
+    KITCHEN_EC2_INSTANCE_TYPE: "[t3.medium, t2.xlarge, t3.xlarge]"
   before_script:
     - cd $DD_AGENT_TESTING_DIR
     - bash -l tasks/kitchen_setup.sh

diff --git a/go.mod b/go.mod
@@ -43,16 +43,16 @@ require (
 	code.cloudfoundry.org/lager v2.0.0+incompatible
 	github.com/CycloneDX/cyclonedx-go v0.7.0
 	github.com/DataDog/agent-payload/v5 v5.0.67
-	github.com/DataDog/datadog-agent/pkg/obfuscate v0.43.1
-	github.com/DataDog/datadog-agent/pkg/otlp/model v0.43.1
-	github.com/DataDog/datadog-agent/pkg/quantile v0.43.1
-	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.43.1
-	github.com/DataDog/datadog-agent/pkg/security/secl v0.43.1
-	github.com/DataDog/datadog-agent/pkg/trace v0.43.1
-	github.com/DataDog/datadog-agent/pkg/util/cgroups v0.43.1
-	github.com/DataDog/datadog-agent/pkg/util/log v0.43.1
-	github.com/DataDog/datadog-agent/pkg/util/pointer v0.43.1
-	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.43.1
+	github.com/DataDog/datadog-agent/pkg/obfuscate v0.43.2-rc.1
+	github.com/DataDog/datadog-agent/pkg/otlp/model v0.43.2-rc.1
+	github.com/DataDog/datadog-agent/pkg/quantile v0.43.2-rc.1
+	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.43.2-rc.1
+	github.com/DataDog/datadog-agent/pkg/security/secl v0.43.2-rc.1
+	github.com/DataDog/datadog-agent/pkg/trace v0.43.2-rc.1
+	github.com/DataDog/datadog-agent/pkg/util/cgroups v0.43.2-rc.1
+	github.com/DataDog/datadog-agent/pkg/util/log v0.43.2-rc.1
+	github.com/DataDog/datadog-agent/pkg/util/pointer v0.43.2-rc.1
+	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.43.2-rc.1
 	github.com/DataDog/datadog-go/v5 v5.1.1
 	github.com/DataDog/datadog-operator v0.7.1-0.20220602134901-4f6af09bf54f
 	github.com/DataDog/ebpf-manager v0.2.2

diff --git a/pkg/otlp/model/go.mod b/pkg/otlp/model/go.mod
@@ -8,8 +8,8 @@ replace (
 )
 
 require (
-	github.com/DataDog/datadog-agent/pkg/quantile v0.43.1
-	github.com/DataDog/datadog-agent/pkg/trace v0.43.1
+	github.com/DataDog/datadog-agent/pkg/quantile v0.43.2-rc.1
+	github.com/DataDog/datadog-agent/pkg/trace v0.43.2-rc.1
 	github.com/DataDog/sketches-go v1.4.1
 	github.com/golang/protobuf v1.5.2
 	github.com/patrickmn/go-cache v2.1.0+incompatible

diff --git a/pkg/trace/go.mod b/pkg/trace/go.mod
@@ -10,12 +10,12 @@ go 1.18
 replace github.com/docker/distribution => github.com/docker/distribution v2.8.1+incompatible
 
 require (
-	github.com/DataDog/datadog-agent/pkg/obfuscate v0.43.1
-	github.com/DataDog/datadog-agent/pkg/otlp/model v0.43.1
-	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.43.1
-	github.com/DataDog/datadog-agent/pkg/util/cgroups v0.43.1
-	github.com/DataDog/datadog-agent/pkg/util/log v0.43.1
-	github.com/DataDog/datadog-agent/pkg/util/pointer v0.43.1
+	github.com/DataDog/datadog-agent/pkg/obfuscate v0.43.2-rc.1
+	github.com/DataDog/datadog-agent/pkg/otlp/model v0.43.2-rc.1
+	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.43.2-rc.1
+	github.com/DataDog/datadog-agent/pkg/util/cgroups v0.43.2-rc.1
+	github.com/DataDog/datadog-agent/pkg/util/log v0.43.2-rc.1
+	github.com/DataDog/datadog-agent/pkg/util/pointer v0.43.2-rc.1
 	github.com/DataDog/datadog-go/v5 v5.1.1
 	github.com/DataDog/sketches-go v1.4.1
 	github.com/Microsoft/go-winio v0.5.2
@@ -39,7 +39,7 @@ require (
 )
 
 require (
-	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.43.1 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.43.2-rc.1 // indirect
 	github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect

diff --git a/pkg/util/cgroups/go.mod b/pkg/util/cgroups/go.mod
@@ -9,16 +9,16 @@ replace (
 )
 
 require (
-	github.com/DataDog/datadog-agent/pkg/util/log v0.43.1
-	github.com/DataDog/datadog-agent/pkg/util/pointer v0.43.1
+	github.com/DataDog/datadog-agent/pkg/util/log v0.43.2-rc.1
+	github.com/DataDog/datadog-agent/pkg/util/pointer v0.43.2-rc.1
 	github.com/containerd/cgroups v1.0.4
 	github.com/google/go-cmp v0.5.8
 	github.com/karrick/godirwalk v1.17.0
 	github.com/stretchr/testify v1.8.1
 )
 
 require (
-	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.43.1 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.43.2-rc.1 // indirect
 	github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
 	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect

diff --git a/pkg/util/log/go.mod b/pkg/util/log/go.mod
@@ -5,7 +5,7 @@ go 1.18
 replace github.com/DataDog/datadog-agent/pkg/util/scrubber => ../scrubber
 
 require (
-	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.43.1
+	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.43.2-rc.1
 	github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575
 	github.com/stretchr/testify v1.8.1
 	go.uber.org/zap v1.22.0

diff --git a/release.json b/release.json
@@ -82,4 +82,4 @@
     "dca-1.9.0": {
         "SECURITY_AGENT_POLICIES_VERSION": "v0.3"
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -82,4 +82,4 @@ @@
         "dca-1.9.0": {
             "SECURITY_AGENT_POLICIES_VERSION": "v0.3"
         }
-    }
+    }