Skip to content

Commit 3178929

Browse files
mms-build-accountEvergreenMaciejKaras
authored
CLOUDP-317695: Bump Ops Manager Container Image version to 8.0.7 (#86)
_Opened by Private Cloud Tools (PCT)_. # Ticket [CLOUDP-317695](https://jira.mongodb.org/browse/CLOUDP-317695) # Description Bump Ops Manager container image version to 8.0.7. Additional fixes: - added `release_agents_on_ecr` to `github_pr_aliases` - it was not started in the PR - `ops-manager` image was pushing to `quay.io/mongodb/mongodb-kubernetes-ops-manager`. It should be pushed to `quay.io/mongodb/mongodb-enterprise-ops-manager`. This was fixed by overriding registry https://github.com/mongodb/mongodb-kubernetes/blob/6c3f79023a9ac72c8357de9ac8cf1db8b443e4a1/pipeline.py#L976-L982 # Reviewer Checklist Before merging this PR, verify the following: - [x] the following tasks are passing in Evergreen: - `publish_ops_manager` task (variant: `publish_om80_images`) - [x] the `agent_version` was updated correctly - [x] the `tools_version` was updated correctly --------- Co-authored-by: Evergreen <kubernetes-hosted-team@mongodb.com> Co-authored-by: Maciej Karaś <maciej.karas@mongodb.com>
1 parent 4b1ace8 commit 3178929

File tree

6 files changed

+36
-16
lines changed

6 files changed

+36
-16
lines changed

‎.evergreen.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ variables:
1111

1212
- &ops_manager_70_latest 7.0.15 # The order/index is important, since these are anchors. Please do not change
1313

14-
- &ops_manager_80_latest 8.0.6 # The order/index is important, since these are anchors. Please do not change
14+
- &ops_manager_80_latest 8.0.7 # The order/index is important, since these are anchors. Please do not change
1515

1616
# The dependency unification between static and non-static is intentional here.
1717
# Even though some images are exclusive, in EVG they all are built once and in parallel.
@@ -218,6 +218,8 @@ github_pr_aliases:
218218
task: ".*"
219219
- variant_tags: [ "auto_bump" ]
220220
task_tags: [ "patch-run" ]
221+
- variant_tags: [ "release_agents_on_ecr" ]
222+
task: ".*"
221223

222224
# Allows to see evergreen checks in GitHub commits
223225
# https://github.com/mongodb/mongodb-kubernetes/commits/master/
@@ -356,8 +358,6 @@ tasks:
356358
# We rely on the init_database from ecr for the agent x operator images.
357359
# This runs on agent releases that are not concurrent with operator releases.
358360
- name: release_agents_on_ecr_conditional
359-
# this enables us to run this variant either manually (patch) which pct does or during an OM bump (github_pr)
360-
allowed_requesters: [ "patch", "github_pr" ]
361361
commands:
362362
- func: clone
363363
- func: run_task_conditionally
@@ -1613,6 +1613,9 @@ buildvariants:
16131613

16141614
- name: init_release_agents_on_ecr
16151615
display_name: init_release_agents_on_ecr
1616+
# this enables us to run this variant either manually (patch) which pct does or during an OM bump (github_pr)
1617+
allowed_requesters: [ "patch", "github_pr" ]
1618+
tags: [ "release_agents_on_ecr" ]
16161619
# We want that to run first and finish asap. Digest pinning depends on this to succeed.
16171620
priority: 70
16181621
run_on:

‎config/manager/manager.yaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,10 @@ spec:
146146
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1"
147147
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1_1_0_0
148148
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1_1.0.0"
149+
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1
150+
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1"
151+
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1_1_0_0
152+
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1_1.0.0"
149153
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1
150154
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.33.7866-1"
151155
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1_1_0_0
@@ -176,12 +180,12 @@ spec:
176180
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.14"
177181
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_15
178182
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.15"
179-
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_4
180-
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.4"
181183
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_5
182184
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.5"
183185
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_6
184186
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.6"
187+
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_7
188+
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.7"
185189
# since the official server images end with a different suffix we can re-use the same $mongodbImageEnv
186190
- name: RELATED_IMAGE_MONGODB_IMAGE_4_4_0_ubi8
187191
value: "quay.io/mongodb/mongodb-enterprise-server:4.4.0-ubi8"

‎helm_chart/values-openshift.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ relatedImages:
3737
- 7.0.13
3838
- 7.0.14
3939
- 7.0.15
40-
- 8.0.4
4140
- 8.0.5
4241
- 8.0.6
42+
- 8.0.7
4343
mongodb:
4444
- 4.4.0-ubi8
4545
- 4.4.1-ubi8
@@ -100,6 +100,8 @@ relatedImages:
100100
- 108.0.4.8770-1_1.0.0
101101
- 108.0.6.8796-1
102102
- 108.0.6.8796-1_1.0.0
103+
- 108.0.7.8810-1
104+
- 108.0.7.8810-1_1.0.0
103105
- 12.0.33.7866-1
104106
- 12.0.33.7866-1_1.0.0
105107
- 12.0.34.7888-1

‎pipeline.py‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -972,7 +972,14 @@ def build_om_image(build_configuration: BuildConfiguration):
972972
"version": om_version,
973973
"om_download_url": om_download_url,
974974
}
975-
build_image_generic(build_configuration, "ops-manager", "inventories/om.yaml", args)
975+
976+
build_image_generic(
977+
config=build_configuration,
978+
image_name="ops-manager",
979+
inventory_file="inventories/om.yaml",
980+
extra_args=args,
981+
registry_address=f"{QUAY_REGISTRY_URL}/mongodb-enterprise-ops-manager",
982+
)
976983

977984

978985
def build_image_generic(

‎public/mongodb-kubernetes-openshift.yaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,10 @@ spec:
398398
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1"
399399
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1_1_0_0
400400
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1_1.0.0"
401+
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1
402+
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1"
403+
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1_1_0_0
404+
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1_1.0.0"
401405
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1
402406
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.33.7866-1"
403407
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1_1_0_0
@@ -428,12 +432,12 @@ spec:
428432
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.14"
429433
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_15
430434
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.15"
431-
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_4
432-
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.4"
433435
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_5
434436
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.5"
435437
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_6
436438
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.6"
439+
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_7
440+
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.7"
437441
# since the official server images end with a different suffix we can re-use the same $mongodbImageEnv
438442
- name: RELATED_IMAGE_MONGODB_IMAGE_4_4_0_ubi8
439443
value: "quay.io/mongodb/mongodb-enterprise-server:4.4.0-ubi8"

‎release.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"mongodbToolsBundle": {
3-
"ubi": "mongodb-database-tools-rhel88-x86_64-100.11.0.tgz"
3+
"ubi": "mongodb-database-tools-rhel88-x86_64-100.12.0.tgz"
44
},
55
"mongodbOperator": "1.0.0",
66
"initDatabaseVersion": "1.0.0",
@@ -40,9 +40,9 @@
4040
"7.0.13",
4141
"7.0.14",
4242
"7.0.15",
43-
"8.0.4",
4443
"8.0.5",
45-
"8.0.6"
44+
"8.0.6",
45+
"8.0.7"
4646
],
4747
"variants": [
4848
"ubi"
@@ -118,17 +118,17 @@
118118
"agent_version": "107.0.15.8741-1",
119119
"tools_version": "100.11.0"
120120
},
121-
"8.0.4": {
122-
"agent_version": "108.0.4.8770-1",
123-
"tools_version": "100.10.0"
124-
},
125121
"8.0.5": {
126122
"agent_version": "108.0.4.8770-1",
127123
"tools_version": "100.11.0"
128124
},
129125
"8.0.6": {
130126
"agent_version": "108.0.6.8796-1",
131127
"tools_version": "100.11.0"
128+
},
129+
"8.0.7": {
130+
"agent_version": "108.0.7.8810-1",
131+
"tools_version": "100.12.0"
132132
}
133133
}
134134
},

0 commit comments

Comments
 (0)