Merge branch 'main' into dependabot/github_actions/gh-actions-package…

…s-0110d87715
DataDog · Feb 13, 2025 · 09dc0d7 · 09dc0d7
2 parents f9f9084 + de7790d
commit 09dc0d7
Show file tree

Hide file tree

Showing 253 changed files with 5,315 additions and 4,127 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -3,14 +3,14 @@
 # and another the rest of the directory.
 
 # All your base
-*                   @DataDog/container-ecosystems
+*                       @DataDog/container-ecosystems
 
 # Dev Container
 /.devcontainer          @DataDog/container-ecosystems @DataDog/container-platform
 
 # Documentation
-README.md             @DataDog/documentation @DataDog/container-ecosystems
-/docs/                @DataDog/documentation @DataDog/container-ecosystems
+README.md               @DataDog/documentation @DataDog/container-ecosystems
+/docs/                  @DataDog/documentation @DataDog/container-ecosystems
 
 
 # Features owners
@@ -21,5 +21,4 @@ README.md             @DataDog/documentation @DataDog/container-ecosystems
 /internal/controller/datadogagent/feature/helmcheck/*              @DataDog/container-integrations
 
 
-/api/datadoghq/v1alpha2/datadogpodautoscaler_types.go              @DataDog/container-autoscaling
-/api/datadoghq/v1alpha1/datadogpodautoscaler_types.go              @DataDog/container-autoscaling
+/api/**/datadogpodautoscaler*.go              @DataDog/container-autoscaling
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -303,7 +303,25 @@ trigger_internal_operator_image:
     branch: master
     strategy: depend
   variables:
-    IMAGE_VERSION: tmpl-v1
+    IMAGE_VERSION: tmpl-v2
+    IMAGE_NAME: $PROJECTNAME
+    TMPL_SRC_IMAGE: v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}
+    RELEASE_TAG: ${CI_COMMIT_REF_SLUG}
+    BUILD_TAG: ${CI_COMMIT_REF_SLUG}
+    RELEASE_STAGING: "true"
+    RELEASE_PROD: "true"
+
+trigger_internal_operator_image_fips:
+  stage: release
+  rules:
+    - if: $CI_COMMIT_TAG
+    - when: never
+  trigger:
+    project: DataDog/images
+    branch: master
+    strategy: depend
+  variables:
+    IMAGE_VERSION: tmpl-v2-fips
     IMAGE_NAME: $PROJECTNAME
     TMPL_SRC_IMAGE: v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}
     RELEASE_TAG: ${CI_COMMIT_REF_SLUG}
@@ -340,7 +358,7 @@ trigger_internal_operator_nightly_image:
     branch: master
     strategy: depend
   variables:
-    IMAGE_VERSION: tmpl-v1
+    IMAGE_VERSION: tmpl-v2
     IMAGE_NAME: $PROJECTNAME
     TMPL_SRC_IMAGE: v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}
     # Trigger a nightly images build that sets the RELEASE_TAG and BUILD_TAG
@@ -378,7 +396,26 @@ trigger_custom_operator_image_staging:
     branch: master
     strategy: depend
   variables:
-    IMAGE_VERSION: tmpl-v1
+    IMAGE_VERSION: tmpl-v2
+    IMAGE_NAME: $PROJECTNAME
+    TMPL_SRC_IMAGE: v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}
+    RELEASE_TAG: ${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
+    BUILD_TAG: ${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
+    RELEASE_STAGING: "true"
+    RELEASE_PROD: "false"
+
+trigger_custom_operator_image_fips_staging:
+  stage: release
+  rules:
+    - if: $PUSH_IMAGES_TO_STAGING == 'true'
+      when: manual
+    - when: never
+  trigger:
+    project: DataDog/images
+    branch: master
+    strategy: depend
+  variables:
+    IMAGE_VERSION: tmpl-v2-fips
     IMAGE_NAME: $PROJECTNAME
     TMPL_SRC_IMAGE: v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}
     RELEASE_TAG: ${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
@@ -547,7 +584,7 @@ publish_release_candidate_workflow:
   variables:
     OPERATOR_RC: "true"
     SKIP_PLAN_CHECK: "true"
-    ENVIRONMENTS: "experimental"
+    ENVIRONMENTS: "experimental,alpha,staging"
     CHART: "datadog-operator"
     OPTION_AUTOMATIC_ROLLOUT: "true"
     EXPLICIT_WORKFLOWS: "//workflows:deploy_operator_rc.operator_rc"

diff --git a/.golangci.toml b/.golangci.toml
@@ -21,7 +21,11 @@
 
   [linters-settings.gci]
     sections = [
-      "prefix(github.com/DataDog/datadog-operator)"
+      "standard",
+      "default",
+      "prefix(github.com/DataDog/datadog-operator)",
+      "blank",
+      "dot",
     ]
 
   [linters-settings.godot]
@@ -55,7 +59,6 @@
     "paralleltest",
     "nestif",
     "exhaustive",
-    "gci",
     "wsl",
     "godox",
     "godot",
@@ -105,4 +108,4 @@
     ".cache",
     "go/pkg/mod",
     "pkg/mod",
-  ]
+  ]
diff --git a/Dockerfile b/Dockerfile
@@ -43,6 +43,7 @@ LABEL summary="The Datadog Operator aims at providing a new way to deploy the Da
 LABEL description="Datadog provides a modern monitoring and analytics platform. Gather \
       metrics, logs and traces for full observability of your Kubernetes cluster with \
       Datadog Operator."
+LABEL maintainer="Datadog Inc."
 
 WORKDIR /
 COPY --from=builder /workspace/manager .

diff --git a/Makefile b/Makefile
@@ -287,8 +287,10 @@ install-tools: bin/$(PLATFORM)/golangci-lint bin/$(PLATFORM)/operator-sdk bin/$(
 
 .PHONY: generate-openapi
 generate-openapi: bin/$(PLATFORM)/openapi-gen
-	bin/$(PLATFORM)/openapi-gen --logtostderr --output-dir api/datadoghq/v1alpha1 --output-file zz_generated.openapi.go --output-pkg api/datadoghq/v1alpha1 --go-header-file ./hack/boilerplate.go.txt ./api/datadoghq/v1alpha1
-	bin/$(PLATFORM)/openapi-gen --logtostderr --output-dir api/datadoghq/v2alpha1 --output-file zz_generated.openapi.go --output-pkg api/datadoghq/v2alpha1 --go-header-file ./hack/boilerplate.go.txt ./api/datadoghq/v2alpha1
+	@set -o pipefail; \
+	bin/$(PLATFORM)/openapi-gen --logtostderr --output-dir api/datadoghq/v1alpha1 --output-file zz_generated.openapi.go --output-pkg api/datadoghq/v1alpha1 --go-header-file ./hack/boilerplate.go.txt ./api/datadoghq/v1alpha1 2>&1 | tee /dev/stderr | grep -q "violation" && { echo "Error: Warnings detected"; exit 1; } || true
+	@set -o pipefail; \
+	bin/$(PLATFORM)/openapi-gen --logtostderr --output-dir api/datadoghq/v2alpha1 --output-file zz_generated.openapi.go --output-pkg api/datadoghq/v2alpha1 --go-header-file ./hack/boilerplate.go.txt ./api/datadoghq/v2alpha1 2>&1 | tee /dev/stderr | grep -q "violation" && { echo "Error: Warnings detected"; exit 1; } || true
 
 .PHONY: preflight-redhat-container
 preflight-redhat-container: bin/$(PLATFORM)/preflight
@@ -355,7 +357,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.10.1
+	hack/install-openshift-preflight.sh 1.11.1
 
 bin/$(PLATFORM)/openapi-gen:
 	mkdir -p $(ROOT)/bin/$(PLATFORM)