fixes

test/new-e2e/go.mod

@@ -286,55 +286,28 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.71.0
 	github.com/aws/session-manager-plugin v0.0.0-20241119210807-82dc72922492
 	github.com/digitalocean/go-libvirt v0.0.0-20240812180835-9c6c0a310c6c
-	github.com/gruntwork-io/terratest v0.48.1
 	github.com/hairyhenderson/go-codeowners v0.7.0
 )
 
 require (
-	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/DataDog/datadog-agent/comp/core/tagger/utils v0.59.0 // indirect
 	github.com/DataDog/extendeddaemonset v0.10.0-rc.4 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.41 // indirect
-	github.com/aws/aws-sdk-go-v2/service/acm v1.30.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.44.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.37.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/iam v1.38.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/kms v1.37.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/lambda v1.69.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/rds v1.91.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/route53 v1.46.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sns v1.33.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sqs v1.37.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
-	github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cheggaaa/pb v1.0.29 // indirect
 	github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
 	github.com/creack/pty v1.1.20 // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
-	github.com/go-sql-driver/mysql v1.8.1 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
-	github.com/gruntwork-io/go-commons v0.8.0 // indirect
 	github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b // indirect
-	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
-	github.com/jackc/pgx/v5 v5.7.1 // indirect
-	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/klauspost/compress v1.17.11 // indirect
-	github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 // indirect
-	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/onsi/ginkgo/v2 v2.20.2 // indirect
 	github.com/onsi/gomega v1.34.1 // indirect
 	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
-	github.com/pquerna/otp v1.4.0 // indirect
 	github.com/prometheus/client_golang v1.20.5 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.60.1 // indirect
@@ -348,7 +321,6 @@ require (
 	github.com/pulumi/pulumi-eks/sdk/v3 v3.4.0 // indirect
 	github.com/pulumi/pulumi-gcp/sdk/v7 v7.38.0 // indirect
 	github.com/twinj/uuid v0.0.0-20151029044442-89173bcdda19 // indirect
-	github.com/urfave/cli v1.22.16 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	go.opentelemetry.io/collector/component v0.115.0 // indirect
 	go.opentelemetry.io/collector/config/configtelemetry v0.115.0 // indirect
@@ -360,6 +332,7 @@ require (
 	google.golang.org/genproto v0.0.0-20241113202542-65e8d215514f // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
+	gotest.tools/v3 v3.5.1 // indirect
 	k8s.io/apiextensions-apiserver v0.31.1 // indirect
 	sigs.k8s.io/controller-runtime v0.19.0 // indirect
 )

test/new-e2e/tests/agent-onboarding/common/common.go

@@ -23,7 +23,7 @@ var (
 	OperatorImageName = GetEnv("IMG", "")
 
 	DdaMinimalPath = filepath.Join(ManifestsPath, "datadog-agent-minimum.yaml")
-	ManifestsPath  = filepath.Join(ProjectRootPath, "test/e2e/manifests")
+	ManifestsPath  = filepath.Join(ProjectRootPath, "manifests")
 
 	timeout         int64 = 60
 	ProjectRootPath       = projectRoot()
@@ -82,7 +82,7 @@ func ParseCollectorJson(collectorOutput string) map[string]interface{} {
 func projectRoot() string {
 	_, b, _, ok := runtime.Caller(0)
 	if ok {
-		return filepath.Join(filepath.Dir(b), "../../..")
+		return filepath.Join(filepath.Dir(b), "..")
 	}
 	return ""
 }

test/new-e2e/tests/agent-onboarding/config/crd/kustomization.yaml

@@ -4,13 +4,13 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- bases/v1/datadoghq.com_datadogagents.yaml
-- bases/v1/datadoghq.com_datadogmetrics.yaml
-- bases/v1/datadoghq.com_datadogmonitors.yaml
-- bases/v1/datadoghq.com_datadogslos.yaml
-- bases/v1/datadoghq.com_datadogagentprofiles.yaml
-- bases/v1/datadoghq.com_datadogpodautoscalers.yaml
-- bases/v1/datadoghq.com_datadogdashboards.yaml
+- bases/v1/datadogagents.yaml
+- bases/v1/datadogmetrics.yaml
+- bases/v1/datadogmonitors.yaml
+- bases/v1/datadogslos.yaml
+- bases/v1/datadogagentprofiles.yaml
+- bases/v1/datadogpodautoscalers.yaml
+- bases/v1/datadogdashboards.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
 #patches:
@@ -19,18 +19,18 @@ resources:
 #- path: patches/webhook_in_datadogagents.yaml
 #- path: patches/webhook_in_datadogmetrics.yaml
 #- path: patches/webhook_in_datadogmonitors.yaml
-#- path: patches/webhook_in_datadoghq_datadogagentprofiles.yaml
-#- path: patches/webhook_in_datadoghq_datadogpodautoscalers.yaml
-#- path: patches/webhook_in_datadoghq_datadogdashboards.yaml
+#- path: patches/webhook_in_agentprofiles.yaml
+#- path: patches/webhook_in_podautoscalers.yaml
+#- path: patches/webhook_in_dashboards.yaml
 # +kubebuilder:scaffold:crdkustomizewebhookpatch
 # [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix.
 # patches here are for enabling the CA injection for each CRD
 #- path: patches/cainjection_in_datadogagents.yaml
 #- path: patches/cainjection_in_datadogmetrics.yaml
-#- path: patches/cainjection_in_datadogmonitors.yaml
-#- path: patches/cainjection_in_datadoghq_datadogagentprofiles.yaml
-#- path: patches/cainjection_in_datadoghq_datadogpodautoscalers.yaml
-#- path: patches/cainjection_in_datadoghq_datadogdashboards.yaml
+#- path: patches/cainjection_in_datadogmonitor.yaml
+#- path: patches/cainjection_in_datadogprofiles.yaml
+#- path: patches/cainjection_in_podautoscalers.yaml
+#- path: patches/cainjection_in_dashboards.yaml
 # +kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.

test/new-e2e/tests/agent-onboarding/provisioners/common.go

@@ -21,7 +21,7 @@ import (
 
 var (
 	MgrKustomizeDirPath    = filepath.Join(e2ecommon.ProjectRootPath, "config/e2e")
-	NewMgrKustomizeDirPath = filepath.Join(e2ecommon.ProjectRootPath, "config", "new-e2e")
+	NewMgrKustomizeDirPath = filepath.Join(e2ecommon.ProjectRootPath, "config")
 )
 
 const (

test/new-e2e/tests/agent-onboarding/utils/utils.go

@@ -11,7 +11,7 @@ package utils
 import (
 	"context"
 	"fmt"
-	"github.com/DataDog/datadog-operator/test/e2e/common"
+	"github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-onboarding/common"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"