Skip to content

remove static agents leftovers #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 12, 2025
Merged

remove static agents leftovers #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbbb8e7
remove static agents leftovers
nammn Aug 12, 2025
03981d9
remove redundant env vars
nammn Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 0 additions & 102 deletions config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,140 +132,38 @@ spec:
value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.2.0"
- 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_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_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_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
Expand Down
2 changes: 1 addition & 1 deletion config/manifests/bases/mongodb-kubernetes.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions generate_ssdlc_report.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"],
Expand Down
51 changes: 0 additions & 51 deletions helm_chart/values-openshift.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,73 +100,22 @@ relatedImages:
- 8.0.0-ubi9
agent:
- 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.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.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
mongodbLegacyAppDb:
- 4.2.11-ent
- 4.2.2-ent
Expand Down
18 changes: 2 additions & 16 deletions pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@
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_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 (
Expand Down Expand Up @@ -839,7 +838,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)
Expand Down Expand Up @@ -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


Expand Down
Loading