Skip to content

Commit fb096ff

Browse files
nammnnammn
authored
remove static agents leftovers (#340)
# Summary - removal of static agents leftovers ## Proof of Work - ci passes (unit test and linter), ci is based on pre-commit. ## Checklist - [x] Have you linked a jira ticket and/or is the ticket in the title? - [x] Have you checked whether your jira ticket required DOCSP changes? - [x] Have you added changelog file? - use `skip-changelog` label if not needed - refer to [Changelog files and Release Notes](https://github.com/mongodb/mongodb-kubernetes/blob/master/CONTRIBUTING.md#changelog-files-and-release-notes) section in CONTRIBUTING.md for more details
1 parent 7845472 commit fb096ff

11 files changed

+23
-380
lines changed

‎config/manager/manager.yaml

Lines changed: 0 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -132,140 +132,38 @@ spec:
132132
value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.2.0"
133133
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1
134134
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1"
135-
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1_1_0_1
136-
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1_1.0.1"
137-
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1_1_1_0
138-
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1_1.1.0"
139-
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1_1_2_0
140-
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1_1.2.0"
141135
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1
142136
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1"
143-
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1_1_0_1
144-
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1_1.0.1"
145-
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1_1_1_0
146-
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1_1.1.0"
147-
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1_1_2_0
148-
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1_1.2.0"
149137
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1
150138
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1"
151-
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1_1_0_1
152-
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1_1.0.1"
153-
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1_1_1_0
154-
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1_1.1.0"
155-
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1_1_2_0
156-
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1_1.2.0"
157139
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1
158140
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1"
159-
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1_1_0_1
160-
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.0.1"
161-
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1_1_1_0
162-
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.1.0"
163-
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1_1_2_0
164-
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.2.0"
165141
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_17_8771_1
166142
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.17.8771-1"
167-
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_17_8771_1_1_0_1
168-
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.17.8771-1_1.0.1"
169-
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_17_8771_1_1_1_0
170-
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.17.8771-1_1.1.0"
171-
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_17_8771_1_1_2_0
172-
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.17.8771-1_1.2.0"
173143
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_0_8694_1
174144
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.0.8694-1"
175-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_0_8694_1_1_0_1
176-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.0.8694-1_1.0.1"
177-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_0_8694_1_1_1_0
178-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.0.8694-1_1.1.0"
179-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_0_8694_1_1_2_0
180-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.0.8694-1_1.2.0"
181145
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1
182146
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1"
183-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1_1_0_1
184-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1_1.0.1"
185-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1_1_1_0
186-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1_1.1.0"
187-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1_1_2_0
188-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1_1.2.0"
189147
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1
190148
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1"
191-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1_1_0_1
192-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1_1.0.1"
193-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1_1_1_0
194-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1_1.1.0"
195-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1_1_2_0
196-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1_1.2.0"
197149
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1
198150
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1"
199-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1_1_0_1
200-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1_1.0.1"
201-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1_1_1_0
202-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1_1.1.0"
203-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1_1_2_0
204-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1_1.2.0"
205151
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1
206152
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
207-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1_1_0_1
208-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1_1.0.1"
209-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1_1_1_0
210-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1_1.1.0"
211-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1_1_2_0
212-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1_1.2.0"
213153
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1
214154
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1"
215-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1_1_0_1
216-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1_1.0.1"
217-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1_1_1_0
218-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1_1.1.0"
219-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1_1_2_0
220-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1_1.2.0"
221155
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1
222156
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1"
223-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1_1_0_1
224-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1_1.0.1"
225-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1_1_1_0
226-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1_1.1.0"
227-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1_1_2_0
228-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1_1.2.0"
229157
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1
230158
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1"
231-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1_1_0_1
232-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1_1.0.1"
233-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1_1_1_0
234-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1_1.1.0"
235-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1_1_2_0
236-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1_1.2.0"
237159
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1
238160
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1"
239-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1_1_0_1
240-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1_1.0.1"
241-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1_1_1_0
242-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1_1.1.0"
243-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1_1_2_0
244-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1_1.2.0"
245161
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1
246162
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1"
247-
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1_1_0_1
248-
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1_1.0.1"
249-
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1_1_1_0
250-
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1_1.1.0"
251-
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1_1_2_0
252-
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1_1.2.0"
253163
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1
254164
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1"
255-
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1_1_0_1
256-
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1_1.0.1"
257-
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1_1_1_0
258-
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1_1.1.0"
259-
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1_1_2_0
260-
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1_1.2.0"
261165
- name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1
262166
value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1"
263-
- name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1_1_0_1
264-
value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1_1.0.1"
265-
- name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1_1_1_0
266-
value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1_1.1.0"
267-
- name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1_1_2_0
268-
value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1_1.2.0"
269167
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_26
270168
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.26"
271169
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_27

‎config/manifests/bases/mongodb-kubernetes.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,5 +456,5 @@ spec:
456456
maturity: stable
457457
provider:
458458
name: MongoDB, Inc
459-
version: 0.0.0
460459
replaces: mongodb-kubernetes.v1.1.0
460+
version: 0.0.0

‎generate_ssdlc_report.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
from lib.base_logger import logger
2929
from scripts.evergreen.release.agent_matrix import (
3030
LATEST_OPERATOR_VERSION,
31-
get_supported_version_for_image_matrix_handling,
31+
get_supported_version_for_image,
3232
)
3333

3434
NUMBER_OF_THREADS = 15
@@ -96,7 +96,7 @@ def get_supported_images(release: Dict) -> dict[str, SupportedImage]:
9696
supported_images = filter_out_unsupported_images(supported_images)
9797
supported_images = convert_to_image_names(supported_images)
9898
supported_images["mongodb-agent-ubi"] = SupportedImage(
99-
get_supported_version_for_image_matrix_handling("mongodb-agent", LATEST_OPERATOR_VERSION),
99+
get_supported_version_for_image("mongodb-agent"),
100100
"mongodb-agent-ubi",
101101
"quay.io/mongodb/mongodb-agent-ubi",
102102
release["supportedImages"]["mongodb-agent"]["ssdlc_name"],

‎helm_chart/values-openshift.yaml

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -100,73 +100,22 @@ relatedImages:
100100
- 8.0.0-ubi9
101101
agent:
102102
- 107.0.11.8645-1
103-
- 107.0.11.8645-1_1.0.1
104-
- 107.0.11.8645-1_1.1.0
105-
- 107.0.11.8645-1_1.2.0
106103
- 107.0.12.8669-1
107-
- 107.0.12.8669-1_1.0.1
108-
- 107.0.12.8669-1_1.1.0
109-
- 107.0.12.8669-1_1.2.0
110104
- 107.0.13.8702-1
111-
- 107.0.13.8702-1_1.0.1
112-
- 107.0.13.8702-1_1.1.0
113-
- 107.0.13.8702-1_1.2.0
114105
- 107.0.15.8741-1
115-
- 107.0.15.8741-1_1.0.1
116-
- 107.0.15.8741-1_1.1.0
117-
- 107.0.15.8741-1_1.2.0
118106
- 107.0.17.8771-1
119-
- 107.0.17.8771-1_1.0.1
120-
- 107.0.17.8771-1_1.1.0
121-
- 107.0.17.8771-1_1.2.0
122107
- 108.0.0.8694-1
123-
- 108.0.0.8694-1_1.0.1
124-
- 108.0.0.8694-1_1.1.0
125-
- 108.0.0.8694-1_1.2.0
126108
- 108.0.1.8718-1
127-
- 108.0.1.8718-1_1.0.1
128-
- 108.0.1.8718-1_1.1.0
129-
- 108.0.1.8718-1_1.2.0
130109
- 108.0.11.8830-1
131-
- 108.0.11.8830-1_1.0.1
132-
- 108.0.11.8830-1_1.1.0
133-
- 108.0.11.8830-1_1.2.0
134110
- 108.0.12.8846-1
135-
- 108.0.12.8846-1_1.0.1
136-
- 108.0.12.8846-1_1.1.0
137-
- 108.0.12.8846-1_1.2.0
138111
- 108.0.2.8729-1
139-
- 108.0.2.8729-1_1.0.1
140-
- 108.0.2.8729-1_1.1.0
141-
- 108.0.2.8729-1_1.2.0
142112
- 108.0.3.8758-1
143-
- 108.0.3.8758-1_1.0.1
144-
- 108.0.3.8758-1_1.1.0
145-
- 108.0.3.8758-1_1.2.0
146113
- 108.0.4.8770-1
147-
- 108.0.4.8770-1_1.0.1
148-
- 108.0.4.8770-1_1.1.0
149-
- 108.0.4.8770-1_1.2.0
150114
- 108.0.6.8796-1
151-
- 108.0.6.8796-1_1.0.1
152-
- 108.0.6.8796-1_1.1.0
153-
- 108.0.6.8796-1_1.2.0
154115
- 108.0.7.8810-1
155-
- 108.0.7.8810-1_1.0.1
156-
- 108.0.7.8810-1_1.1.0
157-
- 108.0.7.8810-1_1.2.0
158116
- 12.0.34.7888-1
159-
- 12.0.34.7888-1_1.0.1
160-
- 12.0.34.7888-1_1.1.0
161-
- 12.0.34.7888-1_1.2.0
162117
- 12.0.35.7911-1
163-
- 12.0.35.7911-1_1.0.1
164-
- 12.0.35.7911-1_1.1.0
165-
- 12.0.35.7911-1_1.2.0
166118
- 13.37.0.9590-1
167-
- 13.37.0.9590-1_1.0.1
168-
- 13.37.0.9590-1_1.1.0
169-
- 13.37.0.9590-1_1.2.0
170119
mongodbLegacyAppDb:
171120
- 4.2.11-ent
172121
- 4.2.2-ent

‎pipeline.py

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@
4343
from lib.base_logger import logger
4444
from lib.sonar.sonar import process_image
4545
from scripts.evergreen.release.agent_matrix import (
46-
get_supported_operator_versions,
47-
get_supported_version_for_image_matrix_handling,
46+
get_supported_version_for_image,
4847
)
4948
from scripts.evergreen.release.sbom import generate_sbom, generate_sbom_for_cli
5049
from scripts.release.build.image_signing import (
@@ -839,7 +838,7 @@ def sign_image_concurrently(executor, args, futures, arch=None):
839838

840839
@TRACER.start_as_current_span("inner")
841840
def inner(build_configuration: BuildConfiguration):
842-
supported_versions = get_supported_version_for_image_matrix_handling(image_name)
841+
supported_versions = get_supported_version_for_image(image_name)
843842
variants = get_supported_variants_for_image(image_name)
844843

845844
args = args_for_daily_image(image_name)
@@ -1512,19 +1511,6 @@ def get_builder_function_for_image_name() -> Dict[str, Callable]:
15121511
"mongodb-kubernetes-operator-daily": build_image_daily("mongodb-kubernetes-operator"),
15131512
}
15141513

1515-
# since we only support the last 3 operator versions, we can build the following names which each matches to an
1516-
# operator version we support and rebuild:
1517-
# - mongodb-agent-daily-1
1518-
# - mongodb-agent-daily-2
1519-
# - mongodb-agent-daily-3
1520-
# get_supported_operator_versions returns the last three supported operator versions in a sorted manner
1521-
i = 1
1522-
for operator_version in get_supported_operator_versions():
1523-
image_builders[f"mongodb-agent-{i}-daily"] = build_image_daily(
1524-
"mongodb-agent", operator_version=operator_version
1525-
)
1526-
i += 1
1527-
15281514
return image_builders
15291515

15301516

0 commit comments

Comments
 (0)