Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .evergreen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ include:
variables:
- &ops_manager_60_latest 6.0.27 # The order/index is important, since these are anchors. Please do not change

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

- &ops_manager_80_latest 8.0.18 # The order/index is important, since these are anchors. Please do not change

Expand Down
4 changes: 4 additions & 0 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ spec:
value: "quay.io/mongodb/mongodb-agent:107.0.19.8805-1"
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_20_8807_1
value: "quay.io/mongodb/mongodb-agent:107.0.20.8807-1"
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_21_8817_1
value: "quay.io/mongodb/mongodb-agent:107.0.21.8817-1"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1
value: "quay.io/mongodb/mongodb-agent:108.0.1.8718-1"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1
Expand Down Expand Up @@ -192,6 +194,8 @@ spec:
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.19"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_20
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.20"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_21
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.21"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_0
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.0"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_1
Expand Down
2 changes: 2 additions & 0 deletions helm_chart/values-openshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ relatedImages:
- 7.0.18
- 7.0.19
- 7.0.20
- 7.0.21
- 8.0.0
- 8.0.1
- 8.0.2
Expand Down Expand Up @@ -115,6 +116,7 @@ relatedImages:
- 107.0.18.8784-1
- 107.0.19.8805-1
- 107.0.20.8807-1
- 107.0.21.8817-1
- 108.0.1.8718-1
- 108.0.11.8830-1
- 108.0.12.8846-1
Expand Down
4 changes: 4 additions & 0 deletions public/mongodb-kubernetes-openshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,8 @@ spec:
value: "quay.io/mongodb/mongodb-agent:107.0.19.8805-1"
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_20_8807_1
value: "quay.io/mongodb/mongodb-agent:107.0.20.8807-1"
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_21_8817_1
value: "quay.io/mongodb/mongodb-agent:107.0.21.8817-1"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1
value: "quay.io/mongodb/mongodb-agent:108.0.1.8718-1"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1
Expand Down Expand Up @@ -496,6 +498,8 @@ spec:
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.19"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_20
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.20"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_21
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.21"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_0
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.0"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_1
Expand Down
5 changes: 5 additions & 0 deletions release.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"7.0.18",
"7.0.19",
"7.0.20",
"7.0.21",
"8.0.0",
"8.0.1",
"8.0.2",
Expand Down Expand Up @@ -217,6 +218,10 @@
"agent_version": "108.0.16.8895-1",
"tools_version": "100.13.0"
},
"7.0.21": {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one thing that I noticed is, this mapping of OM version and agent/tools version should be sorted as we can see the the older version is already sorted.
So ideally 7.0.21 should be before 8.0.1 and after 7.0.20 above in the list.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keys in objects are are unordered in JS. I think we've been manually ordering these before (I certainly did move 7.0.20 up when I was rebasing 7.0.20 bump PR).

But I think it is just for human convenience. Order should not affect anything else.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ha, interesting. I see you also created #668

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But I think it is just for human convenience. Order should not affect anything else.

Actually we do rely on the order of the elements at some places in our code, not for this exact field (mongodb-agent.opsManagerMapping.ops_manager) but for example supportedImages.ops-manager.versions. This is one example.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@viveksinghggits supportedImages.ops-manager.versions is different - it is a list and it is ok to rely on order there (assuming that we update the order correctly.

But in our scripts we should not rely on the ordering of keys in objects even if they are ordered in json. And, as far as I understand, it is what you fixed in #668 with sorting.

"agent_version": "107.0.21.8817-1",
"tools_version": "100.13.0"
},
"8.0.18": {
"agent_version": "108.0.18.8921-1",
"tools_version": "100.13.0"
Expand Down
Loading