Skip to content

Commit fbbb8e7

Browse files
nammnnammn
committed
remove static agents leftovers
1 parent 652ee82 commit fbbb8e7

File tree

9 files changed

+47
-315
lines changed

9 files changed

+47
-315
lines changed

‎config/manager/manager.yaml

Lines changed: 14 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -130,142 +130,44 @@ spec:
130130
value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.2.0"
131131
- name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_2_0
132132
value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.2.0"
133+
- name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1
134+
value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1"
135+
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1
136+
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1"
137+
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1
138+
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1"
133139
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1
134140
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"
141141
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1
142142
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"
149143
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1
150144
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"
145+
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1
146+
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1"
157147
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1
158148
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"
165149
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_17_8771_1
166150
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"
173151
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_0_8694_1
174152
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"
181153
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1
182154
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"
189-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1
190-
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"
197-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1
198-
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"
205155
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1
206156
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"
213157
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1
214158
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"
221159
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1
222160
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"
161+
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1
162+
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1"
229163
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1
230164
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"
237165
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1
238166
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"
245-
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1
246-
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"
253-
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1
254-
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"
261-
- name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1
262-
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"
167+
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1
168+
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1"
169+
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1
170+
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1"
269171
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_26
270172
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.26"
271173
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_27

‎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: 7 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -99,74 +99,25 @@ relatedImages:
9999
- 8.0.0-ubi8
100100
- 8.0.0-ubi9
101101
agent:
102+
- 13.37.0.9590-1
103+
- 12.0.34.7888-1
104+
- 12.0.35.7911-1
102105
- 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
106106
- 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
110107
- 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
108+
- 107.0.13.8702-1
114109
- 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
118110
- 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
122111
- 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
126112
- 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
130-
- 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
134-
- 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
138113
- 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
142114
- 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
146115
- 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
116+
- 108.0.4.8770-1
150117
- 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
154118
- 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
158-
- 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
162-
- 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
166-
- 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
119+
- 108.0.11.8830-1
120+
- 108.0.12.8846-1
170121
mongodbLegacyAppDb:
171122
- 4.2.11-ent
172123
- 4.2.2-ent

‎pipeline.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
from lib.sonar.sonar import process_image
4545
from scripts.evergreen.release.agent_matrix import (
4646
get_supported_operator_versions,
47-
get_supported_version_for_image_matrix_handling,
47+
get_supported_version_for_image,
4848
)
4949
from scripts.evergreen.release.sbom import generate_sbom, generate_sbom_for_cli
5050
from scripts.release.build.image_signing import (
@@ -839,7 +839,7 @@ def sign_image_concurrently(executor, args, futures, arch=None):
839839

840840
@TRACER.start_as_current_span("inner")
841841
def inner(build_configuration: BuildConfiguration):
842-
supported_versions = get_supported_version_for_image_matrix_handling(image_name)
842+
supported_versions = get_supported_version_for_image(image_name)
843843
variants = get_supported_variants_for_image(image_name)
844844

845845
args = args_for_daily_image(image_name)

0 commit comments

Comments
 (0)