From fbbb8e72e041e5fe504538027a530a48232e0d93 Mon Sep 17 00:00:00 2001 From: Nam Nguyen Date: Tue, 12 Aug 2025 13:16:21 +0200 Subject: [PATCH 1/2] remove static agents leftovers --- config/manager/manager.yaml | 126 ++---------------- generate_ssdlc_report.py | 4 +- helm_chart/values-openshift.yaml | 63 +-------- pipeline.py | 4 +- public/mongodb-kubernetes-openshift.yaml | 126 ++---------------- scripts/evergreen/release/agent_matrix.py | 27 +--- .../release/update_helm_values_files.py | 4 +- scripts/preflight_images.py | 4 +- scripts/update_supported_dockerfiles.py | 4 +- 9 files changed, 47 insertions(+), 315 deletions(-) diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index ad0ebf3fb..6708ecd18 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -130,142 +130,44 @@ spec: value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.2.0" - name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_2_0 value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.2.0" + - name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1 + value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1" + - name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1 + value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1" + - name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1 + value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1_1.2.0" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1_1.2.0" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1_1.2.0" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.2.0" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_17_8771_1 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.17.8771-1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_17_8771_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.17.8771-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_17_8771_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.17.8771-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_17_8771_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.17.8771-1_1.2.0" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_0_8694_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.0.8694-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_0_8694_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.0.8694-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_0_8694_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.0.8694-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_0_8694_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.0.8694-1_1.2.0" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1_1.2.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1_1.2.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1_1.2.0" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1_1.2.0" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1_1.2.0" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1_1.2.0" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1_1.2.0" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1_1.2.0" - - name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1 - value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1" - - name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1_1.2.0" - - name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1 - value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1" - - name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1_1_0_1 - 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_12_0_35_7911_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1_1.2.0" - - name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1 - value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1" - - name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1_1.2.0" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_26 value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.26" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_27 diff --git a/generate_ssdlc_report.py b/generate_ssdlc_report.py index 25858cbc4..89183d033 100755 --- a/generate_ssdlc_report.py +++ b/generate_ssdlc_report.py @@ -28,7 +28,7 @@ from lib.base_logger import logger from scripts.evergreen.release.agent_matrix import ( LATEST_OPERATOR_VERSION, - get_supported_version_for_image_matrix_handling, + get_supported_version_for_image, ) NUMBER_OF_THREADS = 15 @@ -96,7 +96,7 @@ def get_supported_images(release: Dict) -> dict[str, SupportedImage]: supported_images = filter_out_unsupported_images(supported_images) supported_images = convert_to_image_names(supported_images) supported_images["mongodb-agent-ubi"] = SupportedImage( - get_supported_version_for_image_matrix_handling("mongodb-agent", LATEST_OPERATOR_VERSION), + get_supported_version_for_image("mongodb-agent"), "mongodb-agent-ubi", "quay.io/mongodb/mongodb-agent-ubi", release["supportedImages"]["mongodb-agent"]["ssdlc_name"], diff --git a/helm_chart/values-openshift.yaml b/helm_chart/values-openshift.yaml index d92a8254c..80dc7a503 100644 --- a/helm_chart/values-openshift.yaml +++ b/helm_chart/values-openshift.yaml @@ -99,74 +99,25 @@ relatedImages: - 8.0.0-ubi8 - 8.0.0-ubi9 agent: + - 13.37.0.9590-1 + - 12.0.34.7888-1 + - 12.0.35.7911-1 - 107.0.11.8645-1 - - 107.0.11.8645-1_1.0.1 - - 107.0.11.8645-1_1.1.0 - - 107.0.11.8645-1_1.2.0 - 107.0.12.8669-1 - - 107.0.12.8669-1_1.0.1 - - 107.0.12.8669-1_1.1.0 - - 107.0.12.8669-1_1.2.0 - 107.0.13.8702-1 - - 107.0.13.8702-1_1.0.1 - - 107.0.13.8702-1_1.1.0 - - 107.0.13.8702-1_1.2.0 + - 107.0.13.8702-1 - 107.0.15.8741-1 - - 107.0.15.8741-1_1.0.1 - - 107.0.15.8741-1_1.1.0 - - 107.0.15.8741-1_1.2.0 - 107.0.17.8771-1 - - 107.0.17.8771-1_1.0.1 - - 107.0.17.8771-1_1.1.0 - - 107.0.17.8771-1_1.2.0 - 108.0.0.8694-1 - - 108.0.0.8694-1_1.0.1 - - 108.0.0.8694-1_1.1.0 - - 108.0.0.8694-1_1.2.0 - 108.0.1.8718-1 - - 108.0.1.8718-1_1.0.1 - - 108.0.1.8718-1_1.1.0 - - 108.0.1.8718-1_1.2.0 - - 108.0.11.8830-1 - - 108.0.11.8830-1_1.0.1 - - 108.0.11.8830-1_1.1.0 - - 108.0.11.8830-1_1.2.0 - - 108.0.12.8846-1 - - 108.0.12.8846-1_1.0.1 - - 108.0.12.8846-1_1.1.0 - - 108.0.12.8846-1_1.2.0 - 108.0.2.8729-1 - - 108.0.2.8729-1_1.0.1 - - 108.0.2.8729-1_1.1.0 - - 108.0.2.8729-1_1.2.0 - 108.0.3.8758-1 - - 108.0.3.8758-1_1.0.1 - - 108.0.3.8758-1_1.1.0 - - 108.0.3.8758-1_1.2.0 - 108.0.4.8770-1 - - 108.0.4.8770-1_1.0.1 - - 108.0.4.8770-1_1.1.0 - - 108.0.4.8770-1_1.2.0 + - 108.0.4.8770-1 - 108.0.6.8796-1 - - 108.0.6.8796-1_1.0.1 - - 108.0.6.8796-1_1.1.0 - - 108.0.6.8796-1_1.2.0 - 108.0.7.8810-1 - - 108.0.7.8810-1_1.0.1 - - 108.0.7.8810-1_1.1.0 - - 108.0.7.8810-1_1.2.0 - - 12.0.34.7888-1 - - 12.0.34.7888-1_1.0.1 - - 12.0.34.7888-1_1.1.0 - - 12.0.34.7888-1_1.2.0 - - 12.0.35.7911-1 - - 12.0.35.7911-1_1.0.1 - - 12.0.35.7911-1_1.1.0 - - 12.0.35.7911-1_1.2.0 - - 13.37.0.9590-1 - - 13.37.0.9590-1_1.0.1 - - 13.37.0.9590-1_1.1.0 - - 13.37.0.9590-1_1.2.0 + - 108.0.11.8830-1 + - 108.0.12.8846-1 mongodbLegacyAppDb: - 4.2.11-ent - 4.2.2-ent diff --git a/pipeline.py b/pipeline.py index 42eeadddf..03aa083b3 100755 --- a/pipeline.py +++ b/pipeline.py @@ -44,7 +44,7 @@ from lib.sonar.sonar import process_image from scripts.evergreen.release.agent_matrix import ( get_supported_operator_versions, - get_supported_version_for_image_matrix_handling, + get_supported_version_for_image, ) from scripts.evergreen.release.sbom import generate_sbom, generate_sbom_for_cli from scripts.release.build.image_signing import ( @@ -839,7 +839,7 @@ def sign_image_concurrently(executor, args, futures, arch=None): @TRACER.start_as_current_span("inner") def inner(build_configuration: BuildConfiguration): - supported_versions = get_supported_version_for_image_matrix_handling(image_name) + supported_versions = get_supported_version_for_image(image_name) variants = get_supported_variants_for_image(image_name) args = args_for_daily_image(image_name) diff --git a/public/mongodb-kubernetes-openshift.yaml b/public/mongodb-kubernetes-openshift.yaml index 53235f0a9..60e4346f4 100644 --- a/public/mongodb-kubernetes-openshift.yaml +++ b/public/mongodb-kubernetes-openshift.yaml @@ -434,142 +434,44 @@ spec: value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.2.0" - name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_2_0 value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.2.0" + - name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1 + value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1" + - name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1 + value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1" + - name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1 + value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1_1.2.0" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1_1.2.0" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1_1.2.0" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.2.0" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_17_8771_1 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.17.8771-1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_17_8771_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.17.8771-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_17_8771_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.17.8771-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_17_8771_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.17.8771-1_1.2.0" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_0_8694_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.0.8694-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_0_8694_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.0.8694-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_0_8694_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.0.8694-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_0_8694_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.0.8694-1_1.2.0" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1_1.2.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1_1.2.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1_1.2.0" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1_1.2.0" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1_1.2.0" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1_1.2.0" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1_1.2.0" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1_1.2.0" - - name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1 - value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1" - - name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1_1.2.0" - - name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1 - value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1" - - name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1_1_0_1 - 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_12_0_35_7911_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1_1.2.0" - - name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1 - value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1" - - name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1_1_0_1 - value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1_1.0.1" - - name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1_1_1_0 - value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1_1.1.0" - - name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1_1_2_0 - value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1_1.2.0" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_26 value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.26" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_27 diff --git a/scripts/evergreen/release/agent_matrix.py b/scripts/evergreen/release/agent_matrix.py index 798284647..5895e4c39 100644 --- a/scripts/evergreen/release/agent_matrix.py +++ b/scripts/evergreen/release/agent_matrix.py @@ -20,32 +20,9 @@ def build_agent_gather_versions(release: Dict[str, str]): return agent_versions_to_be_build -def get_supported_version_for_image_matrix_handling( - image: str, supported_versions: int = DEFAULT_SUPPORTED_OPERATOR_VERSIONS -) -> List[str]: - # if we are a certifying mongodb-agent, we will need to also certify the - # static container images which are a matrix of _ +def get_supported_version_for_image(image: str) -> List[str]: if image == "mongodb-agent": - # officially, we start the support with 1.25.0, but we only support the last three versions - last_supported_operator_versions = get_supported_operator_versions(supported_versions) - - agent_version_with_static_support_without_operator_suffix = build_agent_gather_versions(get_release()) - agent_version_with_static_support_with_operator_suffix = list() - for agent in agent_version_with_static_support_without_operator_suffix: - for version in last_supported_operator_versions: - agent_version_with_static_support_with_operator_suffix.append(agent + "_" + version) - agent_versions_no_static_support = get_release()["supportedImages"][image]["versions"] - agents = sorted( - list( - set( - agent_version_with_static_support_with_operator_suffix - + agent_version_with_static_support_without_operator_suffix - + list(agent_versions_no_static_support) - ) - ) - ) - return agents - + return build_agent_gather_versions(get_release()) return sorted(get_release()["supportedImages"][image]["versions"]) diff --git a/scripts/evergreen/release/update_helm_values_files.py b/scripts/evergreen/release/update_helm_values_files.py index 34bd77cad..5510acb14 100755 --- a/scripts/evergreen/release/update_helm_values_files.py +++ b/scripts/evergreen/release/update_helm_values_files.py @@ -11,7 +11,7 @@ import sys from typing import List -from agent_matrix import get_supported_version_for_image_matrix_handling +from agent_matrix import get_supported_version_for_image from helm_files_handler import ( get_value_in_yaml_file, set_value_in_yaml_file, @@ -80,7 +80,7 @@ def update_helm_charts(operator_version, release): set_value_in_yaml_file( "helm_chart/values-openshift.yaml", "relatedImages.agent", - filterNonReleaseOut(get_supported_version_for_image_matrix_handling("mongodb-agent")), + filterNonReleaseOut(get_supported_version_for_image("mongodb-agent")), ) set_value_in_yaml_file("helm_chart/values-openshift.yaml", "operator.version", operator_version) set_value_in_yaml_file("helm_chart/values.yaml", "operator.version", operator_version) diff --git a/scripts/preflight_images.py b/scripts/preflight_images.py index 1c10a9c5f..e08a2fdc9 100755 --- a/scripts/preflight_images.py +++ b/scripts/preflight_images.py @@ -16,7 +16,7 @@ import requests from evergreen.release.agent_matrix import ( - get_supported_version_for_image_matrix_handling, + get_supported_version_for_image, ) LOGLEVEL = os.environ.get("LOGLEVEL", "INFO").upper() @@ -236,7 +236,7 @@ def main() -> int: ) else: # these are the images we own, we preflight all of them as long as we officially support them in release.json - versions = get_supported_version_for_image_matrix_handling(args.image) + versions = get_supported_version_for_image(args.image) # only preflight the current agent version and the subset of agent images suffixed with the current operator version if args.image == "mongodb-agent": diff --git a/scripts/update_supported_dockerfiles.py b/scripts/update_supported_dockerfiles.py index 3fcab44c4..7b97db130 100755 --- a/scripts/update_supported_dockerfiles.py +++ b/scripts/update_supported_dockerfiles.py @@ -9,7 +9,7 @@ import requests from evergreen.release.agent_matrix import ( - get_supported_version_for_image_matrix_handling, + get_supported_version_for_image, ) from git import Repo from requests import Response @@ -50,7 +50,7 @@ def get_supported_variants_for_image(image: str) -> List[str]: def get_supported_version_for_image(image: str) -> List[str]: image = get_image_name(image) - return get_supported_version_for_image_matrix_handling(image) + return get_supported_version_for_image(image) def get_image_name(image): From 03981d992076854b54cb24b0df2936aec18738f3 Mon Sep 17 00:00:00 2001 From: Nam Nguyen Date: Tue, 12 Aug 2025 17:30:13 +0200 Subject: [PATCH 2/2] remove redundant env vars --- config/manager/manager.yaml | 24 ++++---- ...godb-kubernetes.clusterserviceversion.yaml | 2 +- helm_chart/values-openshift.yaml | 12 ++-- pipeline.py | 14 ----- public/mongodb-kubernetes-openshift.yaml | 24 ++++---- scripts/evergreen/release/agent_matrix.py | 27 ++++----- .../evergreen/release/agent_matrix_test.py | 58 ------------------- 7 files changed, 36 insertions(+), 125 deletions(-) delete mode 100644 scripts/evergreen/release/agent_matrix_test.py diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 6708ecd18..77997de55 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -130,20 +130,12 @@ spec: value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.2.0" - name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_2_0 value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.2.0" - - name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1 - value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1" - - name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1 - value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1" - - name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1 - value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_17_8771_1 @@ -152,22 +144,26 @@ spec: value: "quay.io/mongodb/mongodb-agent-ubi:108.0.0.8694-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1" + - name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1 + value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1" + - name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1 + value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1" + - name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1 + value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_26 value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.26" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_27 diff --git a/config/manifests/bases/mongodb-kubernetes.clusterserviceversion.yaml b/config/manifests/bases/mongodb-kubernetes.clusterserviceversion.yaml index 84c3455fc..ff25f458d 100644 --- a/config/manifests/bases/mongodb-kubernetes.clusterserviceversion.yaml +++ b/config/manifests/bases/mongodb-kubernetes.clusterserviceversion.yaml @@ -456,5 +456,5 @@ spec: maturity: stable provider: name: MongoDB, Inc - version: 0.0.0 replaces: mongodb-kubernetes.v1.1.0 + version: 0.0.0 diff --git a/helm_chart/values-openshift.yaml b/helm_chart/values-openshift.yaml index 80dc7a503..3b6bb789d 100644 --- a/helm_chart/values-openshift.yaml +++ b/helm_chart/values-openshift.yaml @@ -99,25 +99,23 @@ relatedImages: - 8.0.0-ubi8 - 8.0.0-ubi9 agent: - - 13.37.0.9590-1 - - 12.0.34.7888-1 - - 12.0.35.7911-1 - 107.0.11.8645-1 - 107.0.12.8669-1 - 107.0.13.8702-1 - - 107.0.13.8702-1 - 107.0.15.8741-1 - 107.0.17.8771-1 - 108.0.0.8694-1 - 108.0.1.8718-1 + - 108.0.11.8830-1 + - 108.0.12.8846-1 - 108.0.2.8729-1 - 108.0.3.8758-1 - 108.0.4.8770-1 - - 108.0.4.8770-1 - 108.0.6.8796-1 - 108.0.7.8810-1 - - 108.0.11.8830-1 - - 108.0.12.8846-1 + - 12.0.34.7888-1 + - 12.0.35.7911-1 + - 13.37.0.9590-1 mongodbLegacyAppDb: - 4.2.11-ent - 4.2.2-ent diff --git a/pipeline.py b/pipeline.py index 03aa083b3..9f9b97c2e 100755 --- a/pipeline.py +++ b/pipeline.py @@ -43,7 +43,6 @@ from lib.base_logger import logger from lib.sonar.sonar import process_image from scripts.evergreen.release.agent_matrix import ( - get_supported_operator_versions, get_supported_version_for_image, ) from scripts.evergreen.release.sbom import generate_sbom, generate_sbom_for_cli @@ -1516,19 +1515,6 @@ def get_builder_function_for_image_name() -> Dict[str, Callable]: "mongodb-kubernetes-operator-daily": build_image_daily("mongodb-kubernetes-operator"), } - # since we only support the last 3 operator versions, we can build the following names which each matches to an - # operator version we support and rebuild: - # - mongodb-agent-daily-1 - # - mongodb-agent-daily-2 - # - mongodb-agent-daily-3 - # get_supported_operator_versions returns the last three supported operator versions in a sorted manner - i = 1 - for operator_version in get_supported_operator_versions(): - image_builders[f"mongodb-agent-{i}-daily"] = build_image_daily( - "mongodb-agent", operator_version=operator_version - ) - i += 1 - return image_builders diff --git a/public/mongodb-kubernetes-openshift.yaml b/public/mongodb-kubernetes-openshift.yaml index 60e4346f4..1d25900e2 100644 --- a/public/mongodb-kubernetes-openshift.yaml +++ b/public/mongodb-kubernetes-openshift.yaml @@ -434,20 +434,12 @@ spec: value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.2.0" - name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_2_0 value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.2.0" - - name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1 - value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1" - - name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1 - value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1" - - name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1 - value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1" - - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1 - value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_17_8771_1 @@ -456,22 +448,26 @@ spec: value: "quay.io/mongodb/mongodb-agent-ubi:108.0.0.8694-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1" - - name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1 - value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1" + - name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1 + value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1" + - name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1 + value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1" + - name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1 + value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_26 value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.26" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_27 diff --git a/scripts/evergreen/release/agent_matrix.py b/scripts/evergreen/release/agent_matrix.py index 5895e4c39..5887e2966 100644 --- a/scripts/evergreen/release/agent_matrix.py +++ b/scripts/evergreen/release/agent_matrix.py @@ -10,27 +10,20 @@ def get_release() -> Dict[str, str]: def build_agent_gather_versions(release: Dict[str, str]): - # This is a list of a tuples - agent version and corresponding tools version - agent_versions_to_be_build = list() - agent_versions_to_be_build.append( - release["supportedImages"]["mongodb-agent"]["opsManagerMapping"]["cloud_manager"], - ) + agent_versions = set() + + # Add cloud manager version + cloud_manager = release["supportedImages"]["mongodb-agent"]["opsManagerMapping"]["cloud_manager"] + agent_versions.add(cloud_manager) + + # Add ops manager versions for _, om in release["supportedImages"]["mongodb-agent"]["opsManagerMapping"]["ops_manager"].items(): - agent_versions_to_be_build.append(om["agent_version"]) - return agent_versions_to_be_build + agent_versions.add(om["agent_version"]) + + return sorted(list(agent_versions)) def get_supported_version_for_image(image: str) -> List[str]: if image == "mongodb-agent": return build_agent_gather_versions(get_release()) return sorted(get_release()["supportedImages"][image]["versions"]) - - -def get_supported_operator_versions(supported_versions: int = DEFAULT_SUPPORTED_OPERATOR_VERSIONS): - operator_versions = list(get_release()["supportedImages"]["mongodb-kubernetes"]["versions"]) - operator_versions.sort(key=lambda s: list(map(int, s.split(".")))) - - if len(operator_versions) <= supported_versions: - return operator_versions - - return operator_versions[-supported_versions:] diff --git a/scripts/evergreen/release/agent_matrix_test.py b/scripts/evergreen/release/agent_matrix_test.py deleted file mode 100644 index 1add4f591..000000000 --- a/scripts/evergreen/release/agent_matrix_test.py +++ /dev/null @@ -1,58 +0,0 @@ -from unittest import mock - -from scripts.evergreen.release.agent_matrix import get_supported_operator_versions - -empty_release = {"supportedImages": {"mongodb-kubernetes": {"versions": []}}} - - -@mock.patch("scripts.evergreen.release.agent_matrix.get_release", return_value=empty_release) -def test_get_supported_operator_versions_empty(_): - supported_versions = get_supported_operator_versions() - assert len(supported_versions) == 0 - - -single_release = {"supportedImages": {"mongodb-kubernetes": {"versions": ["1.30.0"]}}} - - -@mock.patch("scripts.evergreen.release.agent_matrix.get_release", return_value=single_release) -def test_get_supported_operator_versions_single_release(_): - supported_versions = get_supported_operator_versions() - assert len(supported_versions) == 1 - assert supported_versions[0] == "1.30.0" - - -three_releases_not_ordered = {"supportedImages": {"mongodb-kubernetes": {"versions": ["1.30.0", "1.28.0", "2.0.2"]}}} - - -@mock.patch("scripts.evergreen.release.agent_matrix.get_release", return_value=three_releases_not_ordered) -def test_get_supported_operator_versions_three_releases_not_ordered(_): - supported_versions = get_supported_operator_versions() - assert len(supported_versions) == 3 - assert supported_versions == ["1.28.0", "1.30.0", "2.0.2"] - - -many_releases_not_ordered = { - "supportedImages": { - "mongodb-kubernetes": { - "versions": [ - "1.32.0", - "1.25.0", - "1.26.0", - "1.27.1", - "1.27.0", - "1.30.0", - "1.300.0", - "1.28.123", - "0.0.1", - "2.0.2", - ] - } - } -} - - -@mock.patch("scripts.evergreen.release.agent_matrix.get_release", return_value=many_releases_not_ordered) -def test_get_supported_operator_versions_many_releases_not_ordered(_): - supported_versions = get_supported_operator_versions() - assert len(supported_versions) == 3 - assert supported_versions == ["1.32.0", "1.300.0", "2.0.2"]