Levan m/refactor kind e2e

.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.0
 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.0
 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.0
 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/golang:1.23.0
 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: 6459608ed9fa
   PUSH_IMAGES_TO_STAGING:
     description: "Set PUSH_IMAGE_TO_STAGING to 'true' if you want to push the operator to internal staging registry."
 

Dockerfile

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

LICENSE-3rdparty.csv

@@ -65,6 +65,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
@@ -79,6 +82,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

Makefile

@@ -210,11 +210,12 @@ integration-tests-v2: $(ENVTEST) ## Run tests with reconciler V2
 
 .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
+	KUBEBUILDER_ASSETS="$(ROOT)/bin/$(PLATFORM)/" go test -C test/e2e ./... --tags=e2e -run TestLocalKindSuite -v -timeout 0s -coverprofile cover_e2e.out
+
 
 .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`.
-	KUBEBUILDER_ASSETS="$(ROOT)/bin/$(PLATFORM)/" go test -C test/e2e --tags=e2e github.com/DataDog/datadog-operator/e2e -v -timeout 1h -coverprofile cover_e2e_keep_stacks.out -args -keep-stacks=true
+	KUBEBUILDER_ASSETS="$(ROOT)/bin/$(PLATFORM)/" go test -C test/e2e ./... --tags=e2e -run TestLocalKindSuite -v -timeout 0s -coverprofile cover_e2e_keep_stacks.out -args -keep-stacks=true
 
 .PHONY: bundle
 bundle: bin/$(PLATFORM)/operator-sdk bin/$(PLATFORM)/yq $(KUSTOMIZE) manifests ## Generate bundle manifests and metadata, then validate generated files.

check-operator.Dockerfile

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

config/e2e/e2e-manager.yaml

@@ -3,13 +3,13 @@ kind: Namespace
 metadata:
   labels:
     app.kubernetes.io/name: datadog-operator
-  name: system
+  name: e2e-operator
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: manager
-  namespace: system
+  namespace: e2e-operator
   labels:
     app.kubernetes.io/name: datadog-operator
     control-plane: controller-manager
@@ -24,40 +24,40 @@ spec:
         app.kubernetes.io/name: datadog-operator
     spec:
       containers:
-      - command:
-        - /manager
-        args:
-        - --enable-leader-election
-        - --pprof
-        image: controller:latest
-        imagePullPolicy: IfNotPresent
-        name: manager
-        env:
-        - name: POD_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.name
-        - name: WATCH_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        resources:
-          limits:
-            cpu: 100m
-            memory: 250Mi
-          requests:
-            cpu: 100m
-            memory: 250Mi
-        ports:
-          - name: metrics
-            containerPort: 8080
-            protocol: TCP
-        livenessProbe:
-          httpGet:
-            path: /healthz/
-            port: 8081
-          periodSeconds: 10
+        - command:
+            - /manager
+          args:
+            - --enable-leader-election
+            - --pprof
+          image: controller:latest
+          imagePullPolicy: IfNotPresent
+          name: manager
+          env:
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: WATCH_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          resources:
+            limits:
+              cpu: 100m
+              memory: 250Mi
+            requests:
+              cpu: 100m
+              memory: 250Mi
+          ports:
+            - name: metrics
+              containerPort: 8080
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /healthz/
+              port: 8081
+            periodSeconds: 10
       imagePullSecrets:
         - name: registry-credentials
       terminationGracePeriodSeconds: 10
-      serviceAccountName: controller-manager
+      serviceAccountName: controller-manager

config/e2e/kustomization.yaml

@@ -5,7 +5,7 @@ images:
   newTag: latest
 kind: Kustomization
 namePrefix: datadog-operator-e2e-
-namespace: system
+namespace: e2e-operator
 patches:
 - path: rc-e2e-manager.yaml
   target:

config/e2e/rc-e2e-manager.yaml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: manager
-  namespace: system
+  namespace: e2e-operator
   labels:
     app.kubernetes.io/name: datadog-operator
     control-plane: controller-manager

config/new-e2e/kustomization.yaml

@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namePrefix: datadog-operator-e2e-
+namespace: e2e-operator
+resources:
+- ../crd
+- ../rbac