Merge branch 'master' of github.com:mongodb/mongodb-kubernetes into multi-arch-mco

Author: nammn

.githooks/pre-commit

@@ -142,24 +142,27 @@ function check_incorrect_makefile_variable_brackets() {
 }
 
 function pre_commit() {
+  if [[ "${MDB_UPDATE_LICENSES:-""}" == "true" ]]; then
+    ( (time update_licenses) 2>&1 | prepend "update_licenses" ) &
+  fi
+  ( (time scripts/evergreen/lint_code.sh) 2>&1 | prepend "lint_code.sh" ) &
+  ( (time start_shellcheck) 2>&1 | prepend "shellcheck" ) &
+
   # Update release.json first in case there is a newer version
   (time update_release_json) 2>&1 | prepend "update_release_json"
   # We need to generate the values files first
   (time update_values_yaml_files) 2>&1 | prepend "update_values_yaml_files"
   # The values files are used for generating the standalone yaml
   (time generate_standalone_yaml) 2>&1 | prepend "generate_standalone_yaml"
-  # Run black on python files that have changed
-  (time python_formatting) 2>&1 | prepend "python_formatting"
-
-  (time regenerate_public_rbac_multi_cluster) 2>&1 | prepend "regenerate_public_rbac_multi_cluster"
 
-  (time start_shellcheck) 2>&1 | prepend "shellcheck"
+  ( (time regenerate_public_rbac_multi_cluster) 2>&1 | prepend "regenerate_public_rbac_multi_cluster" ) &
 
-  (time check_erroneous_kubebuilder_annotations) 2>&1 | prepend "check_erroneous_kubebuilder_annotations"
+  # Run black and isort on python files that have changed
+  ( (time python_formatting) 2>&1 | prepend "python_formatting") &
 
-  (time scripts/evergreen/lint_code.sh) 2>&1 | prepend "lint_code.sh"
+  ( (time check_erroneous_kubebuilder_annotations) 2>&1 | prepend "check_erroneous_kubebuilder_annotations" ) &
 
-  (time update_licenses) 2>&1 | prepend "update_licenses"
+  wait
 }
 
 # Function to run shellcheck on a single file
@@ -196,7 +199,7 @@ if [[ "${cmd}" == "generate_standalone_yaml" ]]; then
   shift 1
   generate_standalone_yaml "$@"
 elif [[ "${cmd}" == "pre-commit" ]]; then
-  pre_commit
+ time pre_commit
 elif [[ "${cmd}" == "shellcheck" ]]; then
   start_shellcheck
 elif [[ "${cmd}" == "lint" ]]; then

Makefile

@@ -57,11 +57,17 @@ prerequisites:
 	@ scripts/dev/install.sh
 
 precommit:
-	@ EVERGREEN_MODE=true .githooks/pre-commit
+	@ .githooks/pre-commit
+
+precommit-with-licenses:
+	@ MDB_UPDATE_LICENSE=true .githooks/pre-commit
 
 switch:
 	@ scripts/dev/switch_context.sh $(context) $(additional_override)
 
+switcht:
+	@ scripts/dev/switch_context_by_test.sh $(test)
+
 # builds the Operator binary file and docker image and pushes it to the remote registry if using a remote registry. Deploys it to
 # k8s cluster
 operator: configure-operator build-and-push-operator-image
@@ -322,9 +328,9 @@ deploy: manifests kustomize
 undeploy:
 	$(KUSTOMIZE) build config/default | kubectl delete -f -
 
-# Generate manifests e.g. CRD, RBAC etc.
+# Generate manifests e.g. CRD etc.
 manifests: controller-gen
-	export PATH="$(PATH)"; export GOROOT=$(GOROOT); $(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role paths=./... output:crd:artifacts:config=config/crd/bases
+	export PATH="$(PATH)"; export GOROOT=$(GOROOT); $(CONTROLLER_GEN) $(CRD_OPTIONS) paths=./... output:crd:artifacts:config=config/crd/bases
 	# copy the CRDs to the public folder
 	cp config/crd/bases/* helm_chart/crds/
 	cat "helm_chart/crds/"* > public/crds.yaml

config/manager/manager.yaml

@@ -196,14 +196,14 @@ spec:
               value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1_1.0.1"
             - name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1_1_1_0
               value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1_1.1.0"
-            - name: RELATED_IMAGE_AGENT_IMAGE_13_35_0_9498_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:13.35.0.9498-1"
-            - name: RELATED_IMAGE_AGENT_IMAGE_13_35_0_9498_1_1_0_0
-              value: "quay.io/mongodb/mongodb-agent-ubi:13.35.0.9498-1_1.0.0"
-            - name: RELATED_IMAGE_AGENT_IMAGE_13_35_0_9498_1_1_0_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:13.35.0.9498-1_1.0.1"
-            - name: RELATED_IMAGE_AGENT_IMAGE_13_35_0_9498_1_1_1_0
-              value: "quay.io/mongodb/mongodb-agent-ubi:13.35.0.9498-1_1.1.0"
+            - name: RELATED_IMAGE_AGENT_IMAGE_13_36_0_9555_1
+              value: "quay.io/mongodb/mongodb-agent-ubi:13.36.0.9555-1"
+            - name: RELATED_IMAGE_AGENT_IMAGE_13_36_0_9555_1_1_0_0
+              value: "quay.io/mongodb/mongodb-agent-ubi:13.36.0.9555-1_1.0.0"
+            - name: RELATED_IMAGE_AGENT_IMAGE_13_36_0_9555_1_1_0_1
+              value: "quay.io/mongodb/mongodb-agent-ubi:13.36.0.9555-1_1.0.1"
+            - name: RELATED_IMAGE_AGENT_IMAGE_13_36_0_9555_1_1_1_0
+              value: "quay.io/mongodb/mongodb-agent-ubi:13.36.0.9555-1_1.1.0"
             - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_25
               value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.25"
             - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_26

config/rbac/role.yaml

@@ -124,10 +124,10 @@ relatedImages:
   - 12.0.35.7911-1_1.0.0
   - 12.0.35.7911-1_1.0.1
   - 12.0.35.7911-1_1.1.0
-  - 13.35.0.9498-1
-  - 13.35.0.9498-1_1.0.0
-  - 13.35.0.9498-1_1.0.1
-  - 13.35.0.9498-1_1.1.0
+  - 13.36.0.9555-1
+  - 13.36.0.9555-1_1.0.0
+  - 13.36.0.9555-1_1.0.1
+  - 13.36.0.9555-1_1.1.0
   mongodbLegacyAppDb:
   - 4.2.11-ent
   - 4.2.2-ent

config/rbac/role_binding.yaml

@@ -759,11 +759,15 @@ def submit(self, fn, *args, **kwargs):
             return super().submit(lambda: fn(*args, **kwargs))
 
 
-def should_skip_arm64():
+def should_skip_arm64(config: BuildConfiguration) -> bool:
     """
-    Determines if arm64 builds should be skipped based on environment.
-    Returns True if running in Evergreen pipeline as a patch.
+        Determines if arm64 builds should be skipped based on environment.
+    Determines if arm64 builds should be skipped based on BuildConfiguration or environment.```
+    And skipping the evergreen detail.
     """
+    if config.is_release_step_executed():
+        return False
+
     return is_running_in_evg_pipeline() and is_running_in_patch()
 
 
@@ -789,8 +793,8 @@ def get_architectures_set(build_configuration, args):
         if arch_set == {"arm64"}:
             raise ValueError("Building for ARM64 only is not supported yet")
 
-        if should_skip_arm64():
-            logger.info("Skipping ARM64 builds as this is running in EVG pipeline as a patch")
+        if should_skip_arm64(build_configuration):
+            logger.info("Skipping ARM64 builds as this is running in as a patch and not a release step.")
             return {"amd64"}
 
         # Automatic architecture detection is the default behavior if 'arch' argument isn't specified
@@ -848,6 +852,10 @@ def inner(build_configuration: BuildConfiguration):
                 args["release_version"] = version
 
                 arch_set = get_architectures_set(build_configuration, args)
+                span = trace.get_current_span()
+                span.set_attribute("mck.architectures", str(arch_set))
+                span.set_attribute("mck.architectures_numbers", len(arch_set))
+                span.set_attribute("mck.release", build_configuration.is_release_step_executed())
 
                 if version not in completed_versions:
                     if arch_set == {"amd64", "arm64"}:
@@ -997,6 +1005,7 @@ def build_om_image(build_configuration: BuildConfiguration):
     )
 
 
+@TRACER.start_as_current_span("build_image_generic")
 def build_image_generic(
     config: BuildConfiguration,
     image_name: str,
@@ -1036,6 +1045,12 @@ def build_image_generic(
     if config.sign and config.is_release_step_executed():
         sign_and_verify_context_image(registry, version)
 
+    span = trace.get_current_span()
+    span.set_attribute("mck.image.image_name", image_name)
+    span.set_attribute("mck.image.version", version)
+    span.set_attribute("mck.image.is_release", config.is_release_step_executed())
+    span.set_attribute("mck.image.is_multi_arch", is_multi_arch)
+
     # Release step. Release images via the daily image process.
     if config.is_release_step_executed() and version and QUAY_REGISTRY_URL in registry:
         logger.info(
@@ -1090,7 +1105,7 @@ def build_community_image(build_configuration: BuildConfiguration, image_type: s
     golang_version = os.getenv("GOLANG_VERSION", "1.24")
 
     # Use only amd64 if we should skip arm64 builds
-    if should_skip_arm64():
+    if should_skip_arm64(build_configuration):
         architectures = ["amd64"]
         logger.info("Skipping ARM64 builds for community image as this is running in EVG pipeline as a patch")
     else:
@@ -1205,7 +1220,7 @@ def build_multi_arch_agent_in_sonar(
     joined_args = [args | arch_amd]
 
     # Only include arm64 if we shouldn't skip it
-    if not should_skip_arm64():
+    if not should_skip_arm64(build_configuration):
         joined_args.append(args | arch_arm)
 
     build_image_generic(

helm_chart/values-openshift.yaml

@@ -478,14 +478,14 @@ spec:
               value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1_1.0.1"
             - name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1_1_1_0
               value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1_1.1.0"
-            - name: RELATED_IMAGE_AGENT_IMAGE_13_35_0_9498_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:13.35.0.9498-1"
-            - name: RELATED_IMAGE_AGENT_IMAGE_13_35_0_9498_1_1_0_0
-              value: "quay.io/mongodb/mongodb-agent-ubi:13.35.0.9498-1_1.0.0"
-            - name: RELATED_IMAGE_AGENT_IMAGE_13_35_0_9498_1_1_0_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:13.35.0.9498-1_1.0.1"
-            - name: RELATED_IMAGE_AGENT_IMAGE_13_35_0_9498_1_1_1_0
-              value: "quay.io/mongodb/mongodb-agent-ubi:13.35.0.9498-1_1.1.0"
+            - name: RELATED_IMAGE_AGENT_IMAGE_13_36_0_9555_1
+              value: "quay.io/mongodb/mongodb-agent-ubi:13.36.0.9555-1"
+            - name: RELATED_IMAGE_AGENT_IMAGE_13_36_0_9555_1_1_0_0
+              value: "quay.io/mongodb/mongodb-agent-ubi:13.36.0.9555-1_1.0.0"
+            - name: RELATED_IMAGE_AGENT_IMAGE_13_36_0_9555_1_1_0_1
+              value: "quay.io/mongodb/mongodb-agent-ubi:13.36.0.9555-1_1.0.1"
+            - name: RELATED_IMAGE_AGENT_IMAGE_13_36_0_9555_1_1_1_0
+              value: "quay.io/mongodb/mongodb-agent-ubi:13.36.0.9555-1_1.1.0"
             - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_25
               value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.25"
             - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_26