Skip to content

Commit 5312080

Browse files
viveksinghggitsviveksinghggits
authored
[CLOUDP-363995] Rename repositories to repository and add a secondary field in build_info.json (#633)
# Summary `build_info.json` has a field called `repositories` for images. If more than one repos (`agent` is an example) are mentioned for an image it becomes confusing as to which one should be used. Below is an example ``` "repositories": ["quay.io/mongodb/mongodb-agent-ubi", "quay.io/mongodb/mongodb-agent"], ``` For example if we have to add this information in `release_info_<mck-version>.json` which repo should be added for agent image. That's why this PR changes the format slightly and renames `repositories` to `repository` and adds a new field `secondary_repositories`. `repository` would be the main repo and other repos would be in the new field secondary_repositories. ## Proof of Work Unit test passes and successful CI. ## 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 dd67eca commit 5312080

File tree

6 files changed

+120
-143
lines changed

6 files changed

+120
-143
lines changed

‎build_info.json‎

Lines changed: 44 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"operator": {
44
"dockerfile-path": "docker/mongodb-kubernetes-operator/Dockerfile",
55
"patch": {
6-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes"],
6+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes",
77
"platforms": [
88
"linux/amd64"
99
]
1010
},
1111
"staging": {
1212
"sign": true,
1313
"latest-tag": true,
14-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes"],
14+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes",
1515
"platforms": [
1616
"linux/arm64",
1717
"linux/amd64",
@@ -23,7 +23,7 @@
2323
"sign": true,
2424
"olm-tag": true,
2525
"skip-if-exists": true,
26-
"repositories": ["quay.io/mongodb/mongodb-kubernetes"],
26+
"repository": "quay.io/mongodb/mongodb-kubernetes",
2727
"platforms": [
2828
"linux/arm64",
2929
"linux/amd64",
@@ -35,14 +35,14 @@
3535
"operator-race": {
3636
"dockerfile-path": "docker/mongodb-kubernetes-operator/Dockerfile",
3737
"patch": {
38-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes"],
38+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes",
3939
"platforms": [
4040
"linux/amd64"
4141
]
4242
},
4343
"staging": {
4444
"sign": true,
45-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes"],
45+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes",
4646
"platforms": [
4747
"linux/amd64"
4848
]
@@ -51,15 +51,15 @@
5151
"init-database": {
5252
"dockerfile-path": "docker/mongodb-kubernetes-init-database/Dockerfile",
5353
"patch": {
54-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-database"],
54+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-database",
5555
"platforms": [
5656
"linux/amd64"
5757
]
5858
},
5959
"staging": {
6060
"sign": true,
6161
"latest-tag": true,
62-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-init-database"],
62+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-init-database",
6363
"platforms": [
6464
"linux/arm64",
6565
"linux/amd64",
@@ -71,7 +71,7 @@
7171
"sign": true,
7272
"olm-tag": true,
7373
"skip-if-exists": true,
74-
"repositories": ["quay.io/mongodb/mongodb-kubernetes-init-database"],
74+
"repository": "quay.io/mongodb/mongodb-kubernetes-init-database",
7575
"platforms": [
7676
"linux/arm64",
7777
"linux/amd64",
@@ -83,15 +83,15 @@
8383
"init-appdb": {
8484
"dockerfile-path": "docker/mongodb-kubernetes-init-appdb/Dockerfile",
8585
"patch": {
86-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-appdb"],
86+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-appdb",
8787
"platforms": [
8888
"linux/amd64"
8989
]
9090
},
9191
"staging": {
9292
"sign": true,
9393
"latest-tag": true,
94-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-init-appdb"],
94+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-init-appdb",
9595
"platforms": [
9696
"linux/arm64",
9797
"linux/amd64",
@@ -103,7 +103,7 @@
103103
"sign": true,
104104
"olm-tag": true,
105105
"skip-if-exists": true,
106-
"repositories": ["quay.io/mongodb/mongodb-kubernetes-init-appdb"],
106+
"repository": "quay.io/mongodb/mongodb-kubernetes-init-appdb",
107107
"platforms": [
108108
"linux/arm64",
109109
"linux/amd64",
@@ -115,15 +115,15 @@
115115
"init-ops-manager": {
116116
"dockerfile-path": "docker/mongodb-kubernetes-init-ops-manager/Dockerfile",
117117
"patch": {
118-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-ops-manager"],
118+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-ops-manager",
119119
"platforms": [
120120
"linux/amd64"
121121
]
122122
},
123123
"staging": {
124124
"sign": true,
125125
"latest-tag": true,
126-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-init-ops-manager"],
126+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-init-ops-manager",
127127
"platforms": [
128128
"linux/amd64"
129129
]
@@ -132,7 +132,7 @@
132132
"sign": true,
133133
"olm-tag": true,
134134
"skip-if-exists": true,
135-
"repositories": ["quay.io/mongodb/mongodb-kubernetes-init-ops-manager"],
135+
"repository": "quay.io/mongodb/mongodb-kubernetes-init-ops-manager",
136136
"platforms": [
137137
"linux/amd64"
138138
]
@@ -141,15 +141,15 @@
141141
"database": {
142142
"dockerfile-path": "docker/mongodb-kubernetes-database/Dockerfile",
143143
"patch": {
144-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-database"],
144+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-database",
145145
"platforms": [
146146
"linux/amd64"
147147
]
148148
},
149149
"staging": {
150150
"sign": true,
151151
"latest-tag": true,
152-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-database"],
152+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-database",
153153
"platforms": [
154154
"linux/arm64",
155155
"linux/amd64",
@@ -161,7 +161,7 @@
161161
"sign": true,
162162
"olm-tag": true,
163163
"skip-if-exists": true,
164-
"repositories": ["quay.io/mongodb/mongodb-kubernetes-database"],
164+
"repository": "quay.io/mongodb/mongodb-kubernetes-database",
165165
"platforms": [
166166
"linux/arm64",
167167
"linux/amd64",
@@ -173,19 +173,19 @@
173173
"meko-tests": {
174174
"dockerfile-path": "docker/mongodb-kubernetes-tests/Dockerfile",
175175
"patch": {
176-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-tests"],
176+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-tests",
177177
"platforms": [
178178
"linux/amd64"
179179
]
180180
},
181181
"staging": {
182-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests"],
182+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests",
183183
"platforms": [
184184
"linux/amd64"
185185
]
186186
},
187187
"release": {
188-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests"],
188+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests",
189189
"platforms": [
190190
"linux/amd64"
191191
]
@@ -194,27 +194,21 @@
194194
"meko-tests-arm64": {
195195
"dockerfile-path": "docker/mongodb-kubernetes-tests/Dockerfile",
196196
"patch": {
197-
"repositories": [
198-
"268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-tests"
199-
],
197+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-tests",
200198
"platforms": [
201199
"linux/arm64"
202200
],
203201
"architecture_suffix": true
204202
},
205203
"staging": {
206-
"repositories": [
207-
"268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests"
208-
],
204+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests",
209205
"platforms": [
210206
"linux/arm64"
211207
],
212208
"architecture_suffix": true
213209
},
214210
"release": {
215-
"repositories": [
216-
"268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests"
217-
],
211+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests",
218212
"platforms": [
219213
"linux/arm64"
220214
],
@@ -225,27 +219,21 @@
225219
"dockerfile-path": "docker/mongodb-kubernetes-tests/Dockerfile",
226220
"builder": "podman",
227221
"patch": {
228-
"repositories": [
229-
"268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-tests"
230-
],
222+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-tests",
231223
"platforms": [
232224
"linux/s390x"
233225
],
234226
"architecture_suffix": true
235227
},
236228
"staging": {
237-
"repositories": [
238-
"268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests"
239-
],
229+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests",
240230
"platforms": [
241231
"linux/s390x"
242232
],
243233
"architecture_suffix": true
244234
},
245235
"release": {
246-
"repositories": [
247-
"268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests"
248-
],
236+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests",
249237
"platforms": [
250238
"linux/s390x"
251239
],
@@ -256,27 +244,21 @@
256244
"dockerfile-path": "docker/mongodb-kubernetes-tests/Dockerfile",
257245
"builder": "podman",
258246
"patch": {
259-
"repositories": [
260-
"268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-tests"
261-
],
247+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-tests",
262248
"platforms": [
263249
"linux/ppc64le"
264250
],
265251
"architecture_suffix": true
266252
},
267253
"staging": {
268-
"repositories": [
269-
"268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests"
270-
],
254+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests",
271255
"platforms": [
272256
"linux/ppc64le"
273257
],
274258
"architecture_suffix": true
275259
},
276260
"release": {
277-
"repositories": [
278-
"268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests"
279-
],
261+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests",
280262
"platforms": [
281263
"linux/ppc64le"
282264
],
@@ -286,13 +268,13 @@
286268
"mco-tests": {
287269
"dockerfile-path": "docker/mongodb-community-tests/Dockerfile",
288270
"patch": {
289-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-community-tests"],
271+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-community-tests",
290272
"platforms": [
291273
"linux/amd64"
292274
]
293275
},
294276
"staging": {
295-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-community-tests"],
277+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-community-tests",
296278
"platforms": [
297279
"linux/amd64"
298280
]
@@ -301,15 +283,15 @@
301283
"readiness-probe": {
302284
"dockerfile-path": "docker/mongodb-kubernetes-readinessprobe/Dockerfile",
303285
"patch": {
304-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-readinessprobe"],
286+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-readinessprobe",
305287
"platforms": [
306288
"linux/amd64"
307289
]
308290
},
309291
"staging": {
310292
"sign": true,
311293
"latest-tag": true,
312-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-readinessprobe"],
294+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-readinessprobe",
313295
"platforms": [
314296
"linux/arm64",
315297
"linux/amd64"
@@ -319,9 +301,7 @@
319301
"sign": true,
320302
"olm-tag": true,
321303
"skip-if-exists": true,
322-
"repositories": [
323-
"quay.io/mongodb/mongodb-kubernetes-readinessprobe"
324-
],
304+
"repository": "quay.io/mongodb/mongodb-kubernetes-readinessprobe",
325305
"platforms": [
326306
"linux/arm64",
327307
"linux/amd64"
@@ -331,15 +311,15 @@
331311
"upgrade-hook": {
332312
"dockerfile-path": "docker/mongodb-kubernetes-upgrade-hook/Dockerfile",
333313
"patch": {
334-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-operator-version-upgrade-post-start-hook"],
314+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-operator-version-upgrade-post-start-hook",
335315
"platforms": [
336316
"linux/amd64"
337317
]
338318
},
339319
"staging": {
340320
"sign": true,
341321
"latest-tag": true,
342-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-operator-version-upgrade-post-start-hook"],
322+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-operator-version-upgrade-post-start-hook",
343323
"platforms": [
344324
"linux/arm64",
345325
"linux/amd64"
@@ -349,7 +329,7 @@
349329
"sign": true,
350330
"olm-tag": true,
351331
"skip-if-exists": true,
352-
"repositories": ["quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook"],
332+
"repository": "quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook",
353333
"platforms": [
354334
"linux/arm64",
355335
"linux/amd64"
@@ -360,15 +340,15 @@
360340
"dockerfile-path": "docker/mongodb-agent/Dockerfile",
361341
"patch": {
362342
"skip-if-exists": true,
363-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent"],
343+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent",
364344
"platforms": [
365345
"linux/amd64"
366346
]
367347
},
368348
"staging": {
369349
"sign": true,
370350
"skip-if-exists": true,
371-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-agent"],
351+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-agent",
372352
"platforms": [
373353
"linux/arm64",
374354
"linux/amd64",
@@ -380,7 +360,8 @@
380360
"sign": true,
381361
"olm-tag": true,
382362
"skip-if-exists": true,
383-
"repositories": ["quay.io/mongodb/mongodb-agent-ubi", "quay.io/mongodb/mongodb-agent"],
363+
"repository": "quay.io/mongodb/mongodb-agent",
364+
"secondary-repositories": ["quay.io/mongodb/mongodb-agent-ubi"],
384365
"platforms": [
385366
"linux/arm64",
386367
"linux/amd64",
@@ -393,15 +374,15 @@
393374
"dockerfile-path": "docker/mongodb-enterprise-ops-manager/Dockerfile",
394375
"patch": {
395376
"skip-if-exists": true,
396-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-enterprise-ops-manager-ubi"],
377+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-enterprise-ops-manager-ubi",
397378
"platforms": [
398379
"linux/amd64"
399380
]
400381
},
401382
"staging": {
402383
"sign": true,
403384
"skip-if-exists": true,
404-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-enterprise-ops-manager-ubi"],
385+
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-enterprise-ops-manager-ubi",
405386
"platforms": [
406387
"linux/amd64"
407388
]
@@ -410,7 +391,7 @@
410391
"sign": true,
411392
"olm-tag": true,
412393
"skip-if-exists": true,
413-
"repositories": ["quay.io/mongodb/mongodb-enterprise-ops-manager-ubi"],
394+
"repository": "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi",
414395
"platforms": [
415396
"linux/amd64"
416397
]

0 commit comments

Comments
 (0)