Refactor E2E tests (#1577)

* add localkind provisioner

* refactor logs test

* add back old provisioner

* reorganize tests

* bump deps and cleanup

* sync go version

* update licenses, bump crypto version

* bump test-infra-defs, fixes for CI

* move vars

* sync go version

* Add AWS kind E2E provisioner (#1593)

* bump go deps and small fixes

* add new kind provisioners (aws and local) and update generic k8s e2e tests

* rename files, use new-e2e dev module

* sync go version

* update licenses

* allow golang version failure

* fix stack name

* fixes for CI

* Update bundle and manager config from v1.11 (#1599)

* fix flakes

* fix flakes

---------

Co-authored-by: Timothée Bavelier <[email protected]>

* fix var

* Add make command to run a specific e2e test (#1547)

* make command for a specific e2e test

* update command to use env var

* updated e2e specific test

* remove parentheses from test headers

* update e2e-tests

* nit

* [CECO-1153] APM e2e test (#1549)

* comment lots of stuff to simplify dev

* apm e2e test and un-comment for dev

* rebase on latest fanny

* apm e2e test refactor

* fix apm refactor

* remove pre-refactor apm test

* remove apm pre refactor util func

* remove nginx cleanup since it's for pre refactor test

* fix apm e2e refactor: avoid race + remove socket from volume def

* verify k8s version before checking local service traces

---------

Co-authored-by: Fanny Jiang <[email protected]>

* bump e2e deps

* update go.work.sum

* Bump datadog-agent dependencies (#1647)

* Bump datadog-agent dependencies

* update-golang

* licenses, go.mod

* update-golang

* run update-golang in build

* build fixes after update, bump golang to 1.23.5

* build fix

* update ddrestiry golang url

* fix e2e go.mod

* fix eds ambiguous version

* update-golang

* fix licenses

---------

Co-authored-by: Fanny Jiang <[email protected]>

---------

Co-authored-by: Timothée Bavelier <[email protected]>
Co-authored-by: Sarah Wang <[email protected]>
Co-authored-by: levan-m <[email protected]>

.devcontainer/devcontainer.json

@@ -1,5 +1,5 @@
 {
-	"image": "mcr.microsoft.com/devcontainers/go:dev-1.22",
+	"image": "mcr.microsoft.com/devcontainers/go:dev-1.23",
 	"features": {
 		"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
 	},

.github/workflows/build.yml

@@ -1,6 +1,6 @@
 name: Build
 env:
-  GO_VERSION: 1.22.7
+  GO_VERSION: 1.23.5
 on:
   push:
 # Permission forced by repo-level setting; only elevate on job-level

.github/workflows/main.yml

@@ -6,7 +6,7 @@ permissions:
   # packages: read
 env:
   PROJECTNAME: "datadog-operator"
-  GO_VERSION: 1.22.7
+  GO_VERSION: 1.23.5
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/release.yaml

@@ -11,7 +11,7 @@ permissions:
   contents: read
   # packages: read
 env:
-  GO_VERSION: 1.22.7
+  GO_VERSION: 1.23.5
 jobs:
   build-linux-binary:
     if: startsWith(github.ref, 'refs/tags/v')

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: registry.ddbuild.io/images/mirror/golang:1.22.7
+image: registry.ddbuild.io/images/mirror/library/golang:1.23.5
 variables:
   PROJECTNAME: "datadog-operator"
   PROJECTNAME_CHECK: "datadog-operator-check"
@@ -13,7 +13,7 @@ variables:
   RH_PARTNER_REGISTRY_USER: "redhat-isv-containers+5e7c8ebc1c86a3163d1a69be-robot"
   RH_PARTNER_REGISTRY_KEY_SSM_KEY: redhat_registry_key
   RH_PARTNER_API_KEY_SSM_KEY: redhat_api_key
-  TEST_INFRA_DEFINITIONS_BUILDIMAGES: 3c7d2dc2d3dd
+  TEST_INFRA_DEFINITIONS_BUILDIMAGES: f61405297d57
   PUSH_IMAGES_TO_STAGING:
     description: "Set PUSH_IMAGE_TO_STAGING to 'true' if you want to push the operator to internal staging registry."
 
@@ -42,13 +42,13 @@ stages:
     - aws ssm get-parameter --region us-east-1 --name ci.datadog-operator.agent-qa-profile --with-decryption --query "Parameter.Value" --out text >> ~/.aws/config
     - export AWS_PROFILE=agent-qa-ci
     # Now all `aws` commands target the agent-qa profile
-    - aws ssm get-parameter --region us-east-1 --name ci.datadog-operator.ssh_public_key --with-decryption --query "Parameter.Value" --out text > $E2E_PUBLIC_KEY_PATH
-    - aws ssm get-parameter --region us-east-1 --name ci.datadog-operator.ssh_private_key --with-decryption --query "Parameter.Value" --out text > $E2E_PRIVATE_KEY_PATH
+    - aws ssm get-parameter --region us-east-1 --name ci.datadog-operator.ssh_public_key --with-decryption --query "Parameter.Value" --out text > $E2E_AWS_PUBLIC_KEY_PATH
+    - aws ssm get-parameter --region us-east-1 --name ci.datadog-operator.ssh_private_key --with-decryption --query "Parameter.Value" --out text > $E2E_AWS_PRIVATE_KEY_PATH
     # Use S3 backend to store stack status
     - pulumi login "s3://dd-pulumi-state?region=us-east-1&awssdk=v2&profile=$AWS_PROFILE"
   variables:
-    E2E_PUBLIC_KEY_PATH: /tmp/agent-qa-ssh-key.pub
-    E2E_PRIVATE_KEY_PATH: /tmp/agent-qa-ssh-key
+    E2E_AWS_PUBLIC_KEY_PATH: /tmp/agent-qa-ssh-key.pub
+    E2E_AWS_PRIVATE_KEY_PATH: /tmp/agent-qa-ssh-key
     E2E_KEY_PAIR_NAME: ci.datadog-operator
     KUBERNETES_MEMORY_REQUEST: 12Gi
     KUBERNETES_MEMORY_LIMIT: 16Gi
@@ -109,7 +109,7 @@ unit_tests:
     - make test
 
 check-golang-version:
-  stage: test
+  stage: build
   tags: ["arch:amd64"]
   before_script:
     - make install-tools

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.22.7 AS builder
+FROM golang:1.23.5 AS builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

LICENSE-3rdparty.csv

@@ -12,6 +12,7 @@ core,github.com/DataDog/datadog-agent/pkg/util/http,Apache-2.0
 core,github.com/DataDog/datadog-agent/pkg/util/log,Apache-2.0
 core,github.com/DataDog/datadog-agent/pkg/util/scrubber,Apache-2.0
 core,github.com/DataDog/datadog-agent/pkg/util/uuid,Apache-2.0
+core,github.com/DataDog/datadog-agent/pkg/version,Apache-2.0
 core,github.com/DataDog/datadog-api-client-go/v2,Apache-2.0
 core,github.com/DataDog/datadog-go/v5/statsd,MIT
 core,github.com/DataDog/datadog-operator,Apache-2.0
@@ -69,6 +70,9 @@ core,github.com/hashicorp/hcl,MPL-2.0
 core,github.com/imdario/mergo,BSD-3-Clause
 core,github.com/josharian/intern,MIT
 core,github.com/json-iterator/go,MIT
+core,github.com/klauspost/compress,Apache-2.0
+core,github.com/klauspost/compress/internal/snapref,BSD-3-Clause
+core,github.com/klauspost/compress/zstd/internal/xxhash,MIT
 core,github.com/magiconair/properties,BSD-2-Clause
 core,github.com/mailru/easyjson,MIT
 core,github.com/mitchellh/mapstructure,MIT
@@ -83,6 +87,7 @@ core,github.com/pelletier/go-toml,Apache-2.0
 core,github.com/philhofer/fwd,MIT
 core,github.com/pkg/errors,BSD-2-Clause
 core,github.com/pmezard/go-difflib/difflib,BSD-3-Clause
+core,github.com/prometheus/client_golang/internal/github.com/golang/gddo/httputil,BSD-3-Clause
 core,github.com/prometheus/client_golang/prometheus,Apache-2.0
 core,github.com/prometheus/client_model/go,Apache-2.0
 core,github.com/prometheus/common,Apache-2.0
@@ -105,6 +110,7 @@ core,github.com/tinylib/msgp/msgp,MIT
 core,github.com/x448/float16,MIT
 core,github.com/zorkian/go-datadog-api,BSD-3-Clause
 core,go.etcd.io/bbolt,MIT
+core,go.opentelemetry.io/auto/sdk,Apache-2.0
 core,go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp,Apache-2.0
 core,go.opentelemetry.io/otel,Apache-2.0
 core,go.opentelemetry.io/otel/exporters/otlp/otlptrace,Apache-2.0

Makefile

@@ -205,8 +205,13 @@ integration-tests-v2: $(ENVTEST) ## Run tests with reconciler V2
 	KUBEBUILDER_ASSETS="$(ROOT)/bin/$(PLATFORM)/" go test --tags=integration_v2 github.com/DataDog/datadog-operator/internal/controller -coverprofile cover_integration_v2.out
 
 .PHONY: e2e-tests
-e2e-tests: manifests $(KUSTOMIZE) ## Run E2E tests and destroy environment stacks after tests complete. To run locally, complete pre-reqs (see docs/how-to-contribute.md) and prepend command with `aws-vault exec sso-agent-sandbox-account-admin --`. E.g. `aws-vault exec sso-agent-sandbox-account-admin -- make e2e-tests`.
-	KUBEBUILDER_ASSETS="$(ROOT)/bin/$(PLATFORM)/" go test -C test/e2e --tags=e2e github.com/DataDog/datadog-operator/e2e -v -timeout 1h -coverprofile cover_e2e.out
+e2e-tests: ## Run E2E tests and destroy environment stacks after tests complete. To run locally, complete pre-reqs (see docs/how-to-contribute.md) and prepend command with `aws-vault exec sso-agent-sandbox-account-admin --`. E.g. `aws-vault exec sso-agent-sandbox-account-admin -- make e2e-tests`.
+	@if [ -z "$(E2E_RUN_REGEX)" ]; then \
+		KUBEBUILDER_ASSETS="$(ROOT)/bin/$(PLATFORM)/" go test -C test/e2e/ ./... -count=1 --tags=e2e -v -run TestAWSKindSuite -timeout 0s -coverprofile cover_e2e.out; \
+	else \
+	    echo "Running e2e test: $(E2E_RUN_REGEX)"; \
+		KUBEBUILDER_ASSETS="$(ROOT)/bin/$(PLATFORM)/" go test -C test/e2e/ ./... -count=1 --tags=e2e -v -run $(E2E_RUN_REGEX) -timeout 0s -coverprofile cover_e2e.out; \
+	fi
 
 .PHONY: e2e-tests-keep-stacks
 e2e-tests-keep-stacks: manifests $(KUSTOMIZE) ## Run E2E tests and keep environment stacks running. To run locally, complete pre-reqs (see docs/how-to-contribute.md) and prepend command with `aws-vault exec sso-agent-sandbox-account-admin --`. E.g. `aws-vault exec sso-agent-sandbox-account-admin -- make e2e-tests-keep-stacks`.

api/go.mod

@@ -1,72 +1,77 @@
 module github.com/DataDog/datadog-operator/api
 
-go 1.22
+go 1.23
 
-toolchain go1.22.7
+toolchain go1.23.5
 
 require (
-	github.com/DataDog/datadog-api-client-go/v2 v2.27.0
+	github.com/DataDog/datadog-api-client-go/v2 v2.34.0
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/stretchr/testify v1.9.0
-	k8s.io/api v0.31.1
-	k8s.io/apimachinery v0.31.1
-	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
+	github.com/stretchr/testify v1.10.0
+	k8s.io/api v0.31.4
+	k8s.io/apimachinery v0.31.4
+	k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f
 	sigs.k8s.io/controller-runtime v0.19.0
 	sigs.k8s.io/yaml v1.4.0
 )
 
 require (
-	github.com/DataDog/zstd v1.5.2 // indirect
+	github.com/DataDog/zstd v1.5.6 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
-	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/goccy/go-json v0.10.4 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/onsi/ginkgo/v2 v2.20.2 // indirect
+	github.com/onsi/gomega v1.34.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_golang v1.19.1 // indirect
+	github.com/prometheus/client_golang v1.20.5 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.55.0 // indirect
+	github.com/prometheus/common v0.62.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/rogpeppe/go-internal v1.13.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/oauth2 v0.21.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/term v0.27.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
+	golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
+	golang.org/x/net v0.34.0 // indirect
+	golang.org/x/oauth2 v0.24.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
+	golang.org/x/term v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.6.0 // indirect
+	golang.org/x/time v0.9.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/protobuf v1.35.1 // indirect
+	google.golang.org/protobuf v1.36.3 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.31.1 // indirect
-	k8s.io/client-go v0.31.1 // indirect
+	k8s.io/client-go v0.31.3 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
+	k8s.io/utils v0.0.0-20240821151609-f90d01438635 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )