Merge branch 'main' into swang392/e2e-ci

Author: swang392

.github/workflows/main.yml

@@ -34,5 +34,5 @@ jobs:
       - uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: cover.out,cover_integration_v1.out,cover_integration_v2.out
+          files: cover.out,cover_integration.out
           flags: unittests

.gitlab-ci.yml

@@ -29,6 +29,7 @@ stages:
   - image
   - e2e
   - release
+  - release-latest
   - post-release
   - deploy
 
@@ -333,7 +334,7 @@ publish_redhat_public_tag_fips:
     IMG_DESTINATIONS: $RH_PARTNER_PROJECT_ID:$CI_COMMIT_TAG-fips
 
 publish_public_latest:
-  stage: release
+  stage: release-latest
   rules:
     - if: $CI_COMMIT_TAG
       when: manual
@@ -355,7 +356,7 @@ publish_public_latest_fips:
     IMG_DESTINATIONS: operator:latest-fips
 
 publish_redhat_public_latest:
-  stage: release
+  stage: release-latest
   rules:
     - if: $CI_COMMIT_TAG
       when: manual
@@ -548,6 +549,7 @@ check_preflight_redhat_image:
 # Preflight now supports multiarch image checks
 submit_preflight_redhat_image:
   stage: post-release
+  allow_failure: true
   rules:
     - if: $CI_COMMIT_TAG
       when: manual
@@ -569,8 +571,10 @@ publish_community_operators:
       - if: $CI_COMMIT_TAG
         when: manual
       - when: never
-  needs:
-    - "submit_preflight_redhat_image"
+  # Allow the job to be run manually even if submit_preflight_redhat_image fails, so that
+  # preflight submission can be retried locally followed by this manual job trigger in the pipeline
+  # needs:
+  #   - "submit_preflight_redhat_image"
   tags: [ "runner:docker", "size:large" ]
   image: $JOB_DOCKER_IMAGE
   before_script:

Dockerfile

@@ -45,7 +45,7 @@ RUN if [ "$FIPS_ENABLED" = "true" ]; then \
 
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=${GOARCH} GO111MODULE=on go build -a -ldflags "${LDFLAGS}" -o helpers cmd/helpers/main.go
 
-FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
+FROM registry.access.redhat.com/ubi9/ubi-micro:latest
 
 LABEL name="datadog/operator"
 LABEL vendor="Datadog Inc."
@@ -62,9 +62,8 @@ COPY --from=builder /workspace/helpers .
 COPY scripts/readsecret.sh .
 RUN chmod 550 readsecret.sh && chmod 550 helpers
 
-RUN mkdir -p /licences
 COPY ./LICENSE ./LICENSE-3rdparty.csv /licenses/
-RUN chmod -R 755 /licences
+RUN chmod -R 755 /licenses
 
 USER 1001
 

Makefile

@@ -8,8 +8,8 @@ SHELL = /usr/bin/env bash -o pipefail
 # Datadog custom variables
 #
 BUILDINFOPKG=github.com/DataDog/datadog-operator/pkg/version
-GIT_TAG?=$(shell git tag -l --contains HEAD | tail -1)
-TAG_HASH=$(shell git tag | tail -1)_$(shell git rev-parse --short HEAD)
+GIT_TAG?=$(shell git tag | tr - \~ | sort -V | tr \~ - | tail -1)
+TAG_HASH=$(shell git tag | tr - \~ | sort -V | tr \~ - | tail -1)_$(shell git rev-parse --short HEAD)
 IMG_VERSION?=$(if $(VERSION),$(VERSION),latest)
 VERSION?=$(if $(GIT_TAG),$(GIT_TAG),$(TAG_HASH))
 GIT_COMMIT?=$(shell git rev-parse HEAD)
@@ -51,7 +51,7 @@ IMG ?= gcr.io/datadoghq/operator:$(IMG_VERSION)
 IMG_CHECK ?= gcr.io/datadoghq/operator-check:latest
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.24
+ENVTEST_K8S_VERSION = 1.30
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -191,19 +191,15 @@ docker-push-check-img:
 ##@ Test
 
 .PHONY: test
-test: build manifests generate fmt vet verify-licenses gotest integration-tests integration-tests-v2 ## Run unit tests and integration tests
+test: build manifests generate fmt vet verify-licenses gotest integration-tests ## Run unit tests and integration tests
 
 .PHONY: gotest
 gotest:
 	go test ./... -coverprofile cover.out
 
 .PHONY: integration-tests
-integration-tests: $(ENVTEST) ## Run tests.
-	KUBEBUILDER_ASSETS="$(ROOT)/bin/$(PLATFORM)/" go test --tags=integration github.com/DataDog/datadog-operator/internal/controller -coverprofile cover_integration_v1.out
-
-.PHONY: integration-tests-v2
-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
+integration-tests: $(ENVTEST) ## Run integration tests with reconciler
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(ROOT)/bin/$(PLATFORM) -p path)" go test --tags=integration github.com/DataDog/datadog-operator/internal/controller -coverprofile cover_integration.out
 
 .PHONY: e2e-tests
 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`.
@@ -358,7 +354,7 @@ bin/$(PLATFORM)/operator-manifest-tools: Makefile
 	hack/install-operator-manifest-tools.sh 0.6.0
 
 bin/$(PLATFORM)/preflight: Makefile
-	hack/install-openshift-preflight.sh 1.11.1
+	hack/install-openshift-preflight.sh latest
 
 bin/$(PLATFORM)/openapi-gen:
 	mkdir -p $(ROOT)/bin/$(PLATFORM)

api/datadoghq/v2alpha1/datadogagent_types.go

@@ -571,6 +571,20 @@ type ServiceDiscoveryFeatureConfig struct {
 	// Default: false
 	// +optional
 	Enabled *bool `json:"enabled,omitempty"`
+
+	// Enables the service discovery network stats collection.
+	// Default: true
+	// +optional
+	NetworkStats *ServiceDiscoveryNetworkStatsConfig `json:"networkStats,omitempty"`
+}
+
+// ServiceDiscoveryNetworkStatsConfig configures Service Discovery's network stats
+// collection feature.
+type ServiceDiscoveryNetworkStatsConfig struct {
+	// Enables the Service Discovery Network Stats feature.
+	// Default: true
+	// +optional
+	Enabled *bool `json:"enabled,omitempty"`
 }
 
 // GPUFeatureConfig contains the GPU monitoring configuration.
@@ -1209,25 +1223,26 @@ type OriginDetectionUnified struct {
 // +kubebuilder:object:generate=true
 type AgentImageConfig struct {
 	// Defines the Agent image name for the pod. You can provide this as:
-	// * <NAME> - use agent for the Datadog Agent, cluster-agent for the Datadog Cluster Agent, or dogstatsd for DogStatsD.
-	//   The full image string is derived from global.registry, [key].image.tag, and [key].image.jmxEnabled.
-	// * <NAME>:<TAG> - For example, agent:latest. The registry is derived from global.registry. [key].image.tag and [key].image.jmxEnabled are ignored.
-	// * <REGISTRY>/<NAME>:<TAG> - For example, gcr.io/datadoghq/agent:latest. If the full image string is specified
-	//   like this, then global.registry, [key].image.tag, and [key].image.jmxEnabled are ignored.
+	// * `<NAME>` - Use `agent` for the Datadog Agent, `cluster-agent` for the Datadog Cluster Agent, or `dogstatsd`
+	// for DogStatsD. The full image string is derived from `global.registry`, `[key].image.tag`, and `[key].image.jmxEnabled`.
+	// * `<NAME>:<TAG>` - For example, `agent:latest`. The registry is derived from `global.registry`. `[key].image.tag`
+	// and `[key].image.jmxEnabled` are ignored.
+	// * `<REGISTRY>/<NAME>:<TAG>` - For example, `gcr.io/datadoghq/agent:latest`. If the full image string is specified
+	//   like this, then `global.registry`, `[key].image.tag`, and `[key].image.jmxEnabled` are ignored.
 	Name string `json:"name,omitempty"`
 
 	// Define the image tag to use.
-	// To be used if the Name field does not correspond to a full image string.
+	// To be used if the `Name` field does not correspond to a full image string.
 	// +optional
 	Tag string `json:"tag,omitempty"`
 
 	// Define whether the Agent image should support JMX.
-	// To be used if the Name field does not correspond to a full image string.
+	// To be used if the `Name` field does not correspond to a full image string.
 	// +optional
 	JMXEnabled bool `json:"jmxEnabled,omitempty"`
 
 	// The Kubernetes pull policy:
-	// Use Always, Never, or IfNotPresent.
+	// Use `Always`, `Never`, or `IfNotPresent`.
 	PullPolicy *corev1.PullPolicy `json:"pullPolicy,omitempty"`
 
 	// It is possible to specify Docker registry credentials.

api/datadoghq/v2alpha1/zz_generated.deepcopy.go

@@ -194,12 +194,12 @@ metadata:
       ]
     capabilities: Full Lifecycle
     categories: Monitoring, Logging & Tracing
-    createdAt: "2025-02-11 18:13:00"
+    createdAt: "2025-03-17 18:00:52"
     description: Datadog provides a modern monitoring and analytics platform. Gather metrics, logs and traces for full observability of your Kubernetes cluster with Datadog Operator.
     operators.operatorframework.io/builder: operator-sdk-v1.34.1
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
     repository: https://github.com/DataDog/datadog-operator
-    containerImage: gcr.io/datadoghq/operator:1.12.1
+    containerImage: gcr.io/datadoghq/operator:1.13.0
     support: Datadog, Inc.
     features.operators.openshift.io/disconnected: "true"
     features.operators.openshift.io/fips-compliant: "false"
@@ -208,12 +208,12 @@ metadata:
     features.operators.openshift.io/token-auth-aws: "false"
     features.operators.openshift.io/token-auth-azure: "false"
     features.operators.openshift.io/token-auth-gcp: "false"
-    olm.skipRange: '>=1.7.0 <1.12.1'
+    olm.skipRange: '>=1.7.0 <1.13.0'
   labels:
     operatorframework.io/arch.amd64: supported
     operatorframework.io/arch.arm64: supported
     operatorframework.io/os.linux: supported
-  name: datadog-operator.v1.12.1
+  name: datadog-operator.v1.13.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -252,6 +252,11 @@ spec:
         kind: DatadogPodAutoscaler
         name: datadogpodautoscalers.datadoghq.com
         version: v1alpha1
+      - description: DatadogPodAutoscaler is the Schema for the datadogpodautoscalers API
+        displayName: Datadog Pod Autoscaler
+        kind: DatadogPodAutoscaler
+        name: datadogpodautoscalers.datadoghq.com
+        version: v1alpha2
       - description: DatadogSLO allows a user to define and manage datadog SLOs from Kubernetes cluster.
         displayName: Datadog SLO
         kind: DatadogSLO
@@ -276,7 +281,12 @@ spec:
               resources:
                 - componentstatuses
                 - deployments
+                - limitranges
                 - namespaces
+                - persistentvolumeclaims
+                - persistentvolumes
+                - replicationcontrollers
+                - resourcequotas
               verbs:
                 - get
                 - list
@@ -299,17 +309,6 @@ spec:
                 - patch
                 - update
                 - watch
-            - apiGroups:
-                - ""
-              resources:
-                - limitranges
-                - persistentvolumeclaims
-                - persistentvolumes
-                - replicationcontrollers
-                - resourcequotas
-              verbs:
-                - list
-                - watch
             - apiGroups:
                 - ""
               resources:
@@ -328,6 +327,12 @@ spec:
                 - nodes/stats
               verbs:
                 - get
+            - apiGroups:
+                - ""
+              resources:
+                - pods/exec
+              verbs:
+                - create
             - apiGroups:
                 - '*'
               resources:
@@ -404,12 +409,8 @@ spec:
               verbs:
                 - create
                 - get
-            - apiGroups:
-                - authorization.k8s.io
-              resources:
-                - pods/exec
-              verbs:
-                - create
+                - list
+                - watch
             - apiGroups:
                 - authorization.k8s.io
               resources:
@@ -462,6 +463,7 @@ spec:
               resources:
                 - certificatesigningrequests
               verbs:
+                - get
                 - list
                 - watch
             - apiGroups:
@@ -538,6 +540,7 @@ spec:
               verbs:
                 - create
                 - delete
+                - get
                 - list
                 - watch
             - apiGroups:
@@ -551,11 +554,6 @@ spec:
                 - datadoghq.com
               resources:
                 - extendeddaemonsetreplicasets
-              verbs:
-                - get
-            - apiGroups:
-                - datadoghq.com
-              resources:
                 - watermarkpodautoscalers
               verbs:
                 - get
@@ -569,6 +567,13 @@ spec:
                 - get
                 - list
                 - watch
+            - apiGroups:
+                - metrics.eks.amazonaws.com
+              resources:
+                - kcm/metrics
+                - ksh/metrics
+              verbs:
+                - get
             - apiGroups:
                 - networking.k8s.io
               resources:
@@ -621,6 +626,7 @@ spec:
                 - storageclasses
                 - volumeattachments
               verbs:
+                - get
                 - list
                 - watch
           serviceAccountName: datadog-operator-controller-manager
@@ -678,7 +684,7 @@ spec:
                             fieldPath: metadata.annotations['olm.targetNamespaces']
                       - name: DD_TOOL_VERSION
                         value: redhat
-                    image: gcr.io/datadoghq/operator:1.12.1
+                    image: gcr.io/datadoghq/operator:1.13.0
                     imagePullPolicy: IfNotPresent
                     livenessProbe:
                       httpGet:
@@ -776,5 +782,5 @@ spec:
   minKubeVersion: 1.16.0
   provider:
     name: Datadog
-  version: 1.12.1
-  replaces: datadog-operator.v1.12.0
+  version: 1.13.0
+  replaces: datadog-operator.v1.12.1