incident-28477: update CentOS AMI (#27197)

.gitlab/common/test_infra_version.yml

@@ -4,4 +4,4 @@ variables:
  # and check the job creating the image to make sure you have the right SHA prefix
  TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: ""
  # Make sure to update test-infra-definitions version in go.mod as well
- TEST_INFRA_DEFINITIONS_BUILDIMAGES: 63d1aae5f639
+ TEST_INFRA_DEFINITIONS_BUILDIMAGES: 992f221157aa

flakes.yaml

@@ -11,3 +11,6 @@ test/new-e2e/tests/containers:
  - TestECSSuite/TestCPU/metric___container.cpu.usage{^ecs_container_name:stress-ng$}
  - TestEKSSuite/TestCPU/metric___container.cpu.usage{^kube_deployment:stress-ng$,^kube_namespace:workload-cpustress$}
  - TestKindSuite/TestCPU/metric___container.cpu.usage{^kube_deployment:stress-ng$,^kube_namespace:workload-cpustress$}
+
+test/new-e2e/tests/installer:
+ - TestPackages/upgrade_scenario_ubuntu_22_04_x86_64/TestUpgradeSuccessful

test/kitchen/platforms.json

@@ -11,7 +11,7 @@
  },
  "ec2": {
  "x86_64": {
- "centos-79": "ami-0db0376aef6830be3",
+ "centos-79": "ami-036de472bb001ae9c",
  "rhel-86": "ami-031eff1ae75bb87e4",
  "rocky-92": "ami-08f362c39d03a4eb5"
  },

test/new-e2e/go.mod

@@ -1,6 +1,6 @@
 module github.com/DataDog/datadog-agent/test/new-e2e
 
-go 1.21.0
+go 1.22.0
 
 // Do not upgrade Pulumi plugins to versions different from `test-infra-definitions`.
 // The plugin versions NEED to be aligned.
@@ -17,51 +17,51 @@ replace (
 )
 
 require (
- github.com/DataDog/agent-payload/v5 v5.0.106
- github.com/DataDog/datadog-agent/pkg/util/pointer v0.55.0-rc.9
- github.com/DataDog/datadog-agent/pkg/util/testutil v0.55.0-rc.9
- github.com/DataDog/datadog-agent/pkg/version v0.55.0-rc.9
- github.com/DataDog/datadog-agent/test/fakeintake v0.55.0-rc.9
+ github.com/DataDog/agent-payload/v5 v5.0.122
+ github.com/DataDog/datadog-agent/pkg/util/pointer v0.55.0-rc.3
+ github.com/DataDog/datadog-agent/pkg/util/testutil v0.55.0-rc.3
+ github.com/DataDog/datadog-agent/pkg/version v0.55.0-rc.3
+ github.com/DataDog/datadog-agent/test/fakeintake v0.55.0-rc.3
  github.com/DataDog/datadog-api-client-go v1.16.0
  github.com/DataDog/datadog-api-client-go/v2 v2.26.0
  // Are you bumping github.com/DataDog/test-infra-definitions ?
  // You should bump `TEST_INFRA_DEFINITIONS_BUILDIMAGES` in `.gitlab/common/test_infra_version.yml`
  // `TEST_INFRA_DEFINITIONS_BUILDIMAGES` matches the commit sha in the module version
  // Example: github.com/DataDog/test-infra-definitions v0.0.0-YYYYMMDDHHmmSS-0123456789AB
  // => TEST_INFRA_DEFINITIONS_BUILDIMAGES: 0123456789AB
- github.com/DataDog/test-infra-definitions v0.0.0-20240527153959-63d1aae5f639
- github.com/aws/aws-sdk-go-v2 v1.26.1
- github.com/aws/aws-sdk-go-v2/config v1.27.11
- github.com/aws/aws-sdk-go-v2/service/ec2 v1.138.1
- github.com/aws/aws-sdk-go-v2/service/eks v1.35.1
- github.com/aws/aws-sdk-go-v2/service/ssm v1.44.1
+ github.com/DataDog/test-infra-definitions v0.0.0-20240701145741-992f221157aa
+ github.com/aws/aws-sdk-go-v2 v1.30.0
+ github.com/aws/aws-sdk-go-v2/config v1.27.19
+ github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.2
+ github.com/aws/aws-sdk-go-v2/service/eks v1.44.1
+ github.com/aws/aws-sdk-go-v2/service/ssm v1.50.7
  github.com/cenkalti/backoff v2.2.1+incompatible
  github.com/docker/cli v24.0.7+incompatible
  github.com/docker/docker v24.0.7+incompatible
  github.com/fatih/color v1.16.0
  github.com/google/uuid v1.6.0
  github.com/kr/pretty v0.3.1
  github.com/pkg/sftp v1.13.6
- github.com/pulumi/pulumi/sdk/v3 v3.115.0
+ github.com/pulumi/pulumi/sdk/v3 v3.121.0
  github.com/samber/lo v1.39.0
  github.com/sethvargo/go-retry v0.2.4
  github.com/stretchr/testify v1.9.0
- golang.org/x/crypto v0.22.0
- golang.org/x/sys v0.19.0
- golang.org/x/term v0.19.0
+ golang.org/x/crypto v0.24.0
+ golang.org/x/sys v0.21.0
+ golang.org/x/term v0.21.0
  gopkg.in/yaml.v2 v2.4.0
  gopkg.in/zorkian/go-datadog-api.v2 v2.30.0
- k8s.io/api v0.28.4
- k8s.io/apimachinery v0.28.4
- k8s.io/cli-runtime v0.28.4
- k8s.io/client-go v0.28.4
- k8s.io/kubectl v0.28.4
+ k8s.io/api v0.30.2
+ k8s.io/apimachinery v0.30.2
+ k8s.io/cli-runtime v0.30.2
+ k8s.io/client-go v0.30.2
+ k8s.io/kubectl v0.30.2
 )
 
 require (
  dario.cat/mergo v1.0.0 // indirect
  github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
- github.com/DataDog/datadog-agent/pkg/proto v0.55.0-rc.9
+ github.com/DataDog/datadog-agent/pkg/proto v0.55.0-rc.3
  github.com/DataDog/mmh3 v0.0.0-20200805151601-30884ca2197a // indirect
  github.com/DataDog/zstd v1.5.2 // indirect
  github.com/DataDog/zstd_0 v0.0.0-20210310093942-586c1286621f // indirect
@@ -73,22 +73,22 @@ require (
  github.com/agext/levenshtein v1.2.3 // indirect
  github.com/alessio/shellescape v1.4.2 // indirect
  github.com/atotto/clipboard v0.1.4 // indirect
- github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.1 // indirect
- github.com/aws/aws-sdk-go-v2/credentials v1.17.11 // indirect
- github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 // indirect
- github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 // indirect
- github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 // indirect
+ github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect
+ github.com/aws/aws-sdk-go-v2/credentials v1.17.19 // indirect
+ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.6 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12 // indirect
  github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
- github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.2 // indirect
- github.com/aws/aws-sdk-go-v2/service/ecs v1.41.7
+ github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.12 // indirect
+ github.com/aws/aws-sdk-go-v2/service/ecs v1.42.1
  github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
- github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.4 // indirect
- github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 // indirect
- github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.2 // indirect
- github.com/aws/aws-sdk-go-v2/service/s3 v1.51.3
- github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 // indirect
- github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 // indirect
- github.com/aws/aws-sdk-go-v2/service/sts v1.28.6 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.14 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.12 // indirect
+ github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1
+ github.com/aws/aws-sdk-go-v2/service/sso v1.20.12 // indirect
+ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.6 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sts v1.28.13 // indirect
  github.com/aws/smithy-go v1.20.2 // indirect
  github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
  github.com/blang/semver v3.5.1+incompatible // indirect
@@ -106,7 +106,7 @@ require (
  github.com/docker/distribution v2.8.2+incompatible // indirect
  github.com/docker/go-connections v0.4.0 // indirect
  github.com/docker/go-units v0.5.0 // indirect
- github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+ github.com/emicklei/go-restful/v3 v3.11.0 // indirect
  github.com/emirpasic/gods v1.18.1 // indirect
  github.com/evanphx/json-patch v4.12.0+incompatible // indirect
  github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
@@ -177,15 +177,15 @@ require (
  github.com/pkg/term v1.1.0 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
  github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect
- github.com/pulumi/esc v0.8.2 // indirect
+ github.com/pulumi/esc v0.9.1 // indirect
  github.com/pulumi/pulumi-command/sdk v0.9.2 // indirect
  github.com/pulumi/pulumi-libvirt/sdk v0.4.5 // indirect
  // pulumi-random v4.14.0 uses GO 1.21:
  // https:/pulumi/pulumi-random/blob/v4.14.0/sdk/go.mod#L3
  // So, do not upgrade pulumi-random to v4.14.0 or above before migration to GO 1.21.
  github.com/pulumi/pulumi-random/sdk/v4 v4.16.0 // indirect
  github.com/pulumi/pulumi-tls/sdk/v4 v4.11.1 // indirect
- github.com/pulumiverse/pulumi-time/sdk v0.0.16 // indirect
+ github.com/pulumiverse/pulumi-time/sdk v0.0.17 // indirect
  github.com/rivo/uniseg v0.4.7 // indirect
  github.com/rogpeppe/go-internal v1.12.0 // indirect
  github.com/russross/blackfriday/v2 v2.1.0 // indirect
@@ -209,49 +209,52 @@ require (
  github.com/zorkian/go-datadog-api v2.30.0+incompatible
  go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
  go.uber.org/atomic v1.11.0 // indirect
- golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
- golang.org/x/mod v0.17.0 // indirect
- golang.org/x/net v0.24.0 // indirect
+ golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect
+ golang.org/x/mod v0.18.0 // indirect
+ golang.org/x/net v0.26.0 // indirect
  golang.org/x/oauth2 v0.17.0 // indirect
  golang.org/x/sync v0.7.0 // indirect
- golang.org/x/text v0.14.0
+ golang.org/x/text v0.16.0
  golang.org/x/time v0.5.0 // indirect
- golang.org/x/tools v0.19.0 // indirect
+ golang.org/x/tools v0.22.0 // indirect
  google.golang.org/appengine v1.6.8 // indirect
  google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
  google.golang.org/grpc v1.63.2 // indirect
- google.golang.org/protobuf v1.33.0 // indirect
+ google.golang.org/protobuf v1.34.0 // indirect
  gopkg.in/inf.v0 v0.9.1 // indirect
  gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
  gopkg.in/warnings.v0 v0.1.2 // indirect
  gopkg.in/yaml.v3 v3.0.1
  gotest.tools/v3 v3.5.0 // indirect
- k8s.io/component-base v0.28.4 // indirect
- k8s.io/klog/v2 v2.100.1 // indirect
- k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
- k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
+ k8s.io/component-base v0.30.2 // indirect
+ k8s.io/klog/v2 v2.120.1 // indirect
+ k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
+ k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
  lukechampine.com/frand v1.4.2 // indirect
  sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
  sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
  sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
- sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+ sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
  sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
 require (
- github.com/DataDog/datadog-agent/pkg/util/optional v0.55.0-rc.9
+ github.com/DataDog/datadog-agent/pkg/util/optional v0.55.0-rc.3
  github.com/mitchellh/mapstructure v1.5.0
  github.com/pulumi/pulumi-aws/sdk/v6 v6.25.0
  github.com/pulumi/pulumi-awsx/sdk/v2 v2.5.0
  github.com/pulumi/pulumi-eks/sdk/v2 v2.2.1
- github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.9.0
+ github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.13.1
  github.com/xeipuuv/gojsonschema v1.2.0
 )
 
 require (
- github.com/DataDog/datadog-agent/comp/netflow/payload v0.55.0-rc.9 // indirect
+ github.com/BurntSushi/toml v1.2.1 // indirect
+ github.com/DataDog/datadog-agent/comp/netflow/payload v0.55.0-rc.3 // indirect
  github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
  github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 // indirect
+ github.com/gorilla/websocket v1.5.0 // indirect
+ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
  github.com/pulumi/pulumi-docker/sdk/v4 v4.5.1 // indirect
  github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
  github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect