Skip to content

Commit 6091c73

Browse files
nammnmms-build-accountEvergreenviveksinghggits
authored
CLOUDP-337356 - static support (#333)
# Summary - i've manually released the agents (only cm worked) to [ecr](https://spruce.mongodb.com/task/mongodb_kubernetes_manual_ecr_release_agent_currently_used_release_all_currently_used_agents_on_ecr_patch_da6c026f84e33f76e0cd10b4317dc4798572cb99_68a3643d660ad1000740fc4e_25_08_18_17_34_54/logs?execution=0) - static e2e tests: [link](https://spruce.mongodb.com/version/68a32ff8c96f530007b70dc4/tasks?sorts=STATUS%3AASC%3BBASE_STATUS%3ADESC) ## Proof of Work <!-- Enter your proof that it works here.--> ## Checklist - [ ] Have you linked a jira ticket and/or is the ticket in the title? - [ ] Have you checked whether your jira ticket required DOCSP changes? - [ ] 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 --------- Co-authored-by: mms-build-account <[email protected]> Co-authored-by: Evergreen <[email protected]> Co-authored-by: Vivek Singh <[email protected]>
1 parent d1fd1e1 commit 6091c73

26 files changed

+735
-372
lines changed

‎.evergreen.yml

Lines changed: 56 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ variables:
3333
variant: init_test_run
3434
- name: build_init_om_images_ubi
3535
variant: init_test_run
36-
- name: build_agent_images_ubi
37-
variant: init_test_run
3836

3937
- &base_no_om_image_dependency
4038
depends_on:
@@ -52,8 +50,6 @@ variables:
5250
variant: init_test_run
5351
- name: build_init_appdb_images_ubi
5452
variant: init_test_run
55-
- name: build_agent_images_ubi
56-
variant: init_test_run
5753

5854
- &community_dependency
5955
depends_on:
@@ -67,8 +63,6 @@ variables:
6763
variant: init_test_run
6864
- name: build_mco_test_image
6965
variant: init_test_run
70-
- name: build_agent_images_ubi
71-
variant: init_test_run
7266

7367
- &setup_group
7468
setup_group_can_fail_task: true
@@ -160,8 +154,6 @@ variables:
160154
variant: init_test_run
161155
- name: build_init_om_images_ubi
162156
variant: init_test_run
163-
- name: build_agent_images_ubi
164-
variant: init_test_run
165157

166158
- &base_om7_dependency_with_race
167159
depends_on:
@@ -179,8 +171,6 @@ variables:
179171
variant: init_test_run
180172
- name: build_init_om_images_ubi
181173
variant: init_test_run
182-
- name: build_agent_images_ubi
183-
variant: init_test_run
184174

185175
- &base_om8_dependency
186176
depends_on:
@@ -198,8 +188,6 @@ variables:
198188
variant: init_test_run
199189
- name: build_init_om_images_ubi
200190
variant: init_test_run
201-
- name: build_agent_images_ubi
202-
variant: init_test_run
203191

204192
parameters:
205193
- key: evergreen_retry
@@ -1489,8 +1477,6 @@ buildvariants:
14891477
variant: init_test_run
14901478
- name: build_init_om_images_ubi
14911479
variant: init_test_run
1492-
- name: build_agent_images_ubi
1493-
variant: init_test_run
14941480
- name: build_test_image_ibm
14951481
variant: init_test_run_ibm_power
14961482
tasks:
@@ -1514,8 +1500,6 @@ buildvariants:
15141500
variant: init_test_run
15151501
- name: build_init_om_images_ubi
15161502
variant: init_test_run
1517-
- name: build_agent_images_ubi
1518-
variant: init_test_run
15191503
- name: build_test_image_ibm
15201504
variant: init_test_run_ibm_z
15211505
tasks:
@@ -1531,6 +1515,62 @@ buildvariants:
15311515
tasks:
15321516
- name: e2e_smoke_arm_task_group
15331517

1518+
- name: e2e_static_smoke_arm
1519+
display_name: e2e_smoke_arm
1520+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
1521+
run_on:
1522+
- ubuntu2204-arm64-large
1523+
allowed_requesters: [ "patch", "github_tag" ]
1524+
<<: *base_no_om_image_dependency
1525+
tasks:
1526+
- name: e2e_smoke_arm_task_group
1527+
1528+
- name: e2e_static_smoke_ibm_z
1529+
display_name: e2e_static_smoke_ibm_z
1530+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
1531+
run_on:
1532+
- rhel9-zseries-small
1533+
- rhel9-zseries-large
1534+
allowed_requesters: [ "patch", "github_tag" ]
1535+
depends_on:
1536+
- name: build_operator_ubi
1537+
variant: init_test_run
1538+
- name: build_init_database_image_ubi
1539+
variant: init_test_run
1540+
- name: build_database_image_ubi
1541+
variant: init_test_run
1542+
- name: build_init_appdb_images_ubi
1543+
variant: init_test_run
1544+
- name: build_init_om_images_ubi
1545+
variant: init_test_run
1546+
- name: build_test_image_ibm
1547+
variant: init_test_run_ibm_z
1548+
tasks:
1549+
- name: e2e_smoke_ibm_task_group
1550+
1551+
- name: e2e_static_smoke_ibm_power
1552+
display_name: e2e_static_smoke_ibm_power
1553+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
1554+
run_on:
1555+
- rhel9-power-small
1556+
- rhel9-power-large
1557+
allowed_requesters: [ "patch", "github_tag" ]
1558+
depends_on:
1559+
- name: build_operator_ubi
1560+
variant: init_test_run
1561+
- name: build_init_database_image_ubi
1562+
variant: init_test_run
1563+
- name: build_database_image_ubi
1564+
variant: init_test_run
1565+
- name: build_init_appdb_images_ubi
1566+
variant: init_test_run
1567+
- name: build_init_om_images_ubi
1568+
variant: init_test_run
1569+
- name: build_test_image_ibm
1570+
variant: init_test_run_ibm_power
1571+
tasks:
1572+
- name: e2e_smoke_ibm_task_group
1573+
15341574
- name: e2e_static_smoke
15351575
display_name: e2e_static_smoke
15361576
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
@@ -1657,8 +1697,6 @@ buildvariants:
16571697
variant: init_test_run
16581698
- name: prepare_and_upload_openshift_bundles_for_e2e
16591699
variant: init_tests_with_olm
1660-
- name: build_agent_images_ubi
1661-
variant: init_test_run
16621700
tasks:
16631701
- name: e2e_kind_olm_group
16641702

@@ -1682,9 +1720,6 @@ buildvariants:
16821720
variant: init_tests_with_olm
16831721
- name: build_init_database_image_ubi
16841722
variant: init_test_run
1685-
- name: build_agent_images_ubi
1686-
variant: init_test_run
1687-
16881723
tasks:
16891724
- name: e2e_kind_olm_group
16901725

‎.githooks/pre-commit

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ function update_release_json() {
117117
}
118118

119119
function regenerate_public_rbac_multi_cluster() {
120-
if echo "$git_last_changed" | grep -q 'public/tools/multicluster'; then
120+
if echo "$git_last_changed" | grep -q -e 'cmd/kubectl-mongodb' -e 'pkg/kubectl-mongodb'; then
121121
echo 'regenerating multicluster RBAC public example'
122-
pushd public/tools/multicluster
122+
pushd pkg/kubectl-mongodb/common/
123123
EXPORT_RBAC_SAMPLES="true" go test ./... -run TestPrintingOutRolesServiceAccountsAndRoleBindings
124124
popd
125125
git add public/samples/multi-cluster-cli-gitops

‎build_info.json

Lines changed: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
"dockerfile-path": "docker/mongodb-kubernetes-operator/Dockerfile.atomic",
55
"patch": {
66
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes",
7-
"platforms": [
8-
"linux/amd64"
7+
"platforms": [
8+
"linux/arm64",
9+
"linux/amd64",
10+
"linux/s390x",
11+
"linux/ppc64le"
912
]
1013
},
1114
"staging": {
@@ -50,8 +53,11 @@
5053
"dockerfile-path": "docker/mongodb-kubernetes-init-database/Dockerfile.atomic",
5154
"patch": {
5255
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-database",
53-
"platforms": [
54-
"linux/amd64"
56+
"platforms": [
57+
"linux/arm64",
58+
"linux/amd64",
59+
"linux/s390x",
60+
"linux/ppc64le"
5561
]
5662
},
5763
"staging": {
@@ -79,8 +85,11 @@
7985
"dockerfile-path": "docker/mongodb-kubernetes-init-appdb/Dockerfile.atomic",
8086
"patch": {
8187
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-appdb",
82-
"platforms": [
83-
"linux/amd64"
88+
"platforms": [
89+
"linux/arm64",
90+
"linux/amd64",
91+
"linux/s390x",
92+
"linux/ppc64le"
8493
]
8594
},
8695
"staging": {
@@ -108,8 +117,11 @@
108117
"dockerfile-path": "docker/mongodb-kubernetes-init-ops-manager/Dockerfile.atomic",
109118
"patch": {
110119
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-ops-manager",
111-
"platforms": [
112-
"linux/amd64"
120+
"platforms": [
121+
"linux/arm64",
122+
"linux/amd64",
123+
"linux/s390x",
124+
"linux/ppc64le"
113125
]
114126
},
115127
"staging": {
@@ -137,8 +149,11 @@
137149
"dockerfile-path": "docker/mongodb-kubernetes-database/Dockerfile.atomic",
138150
"patch": {
139151
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-database",
140-
"platforms": [
141-
"linux/amd64"
152+
"platforms": [
153+
"linux/arm64",
154+
"linux/amd64",
155+
"linux/s390x",
156+
"linux/ppc64le"
142157
]
143158
},
144159
"staging": {
@@ -198,8 +213,11 @@
198213
"dockerfile-path": "docker/mongodb-kubernetes-readinessprobe/Dockerfile.atomic",
199214
"patch": {
200215
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-readinessprobe",
201-
"platforms": [
202-
"linux/amd64"
216+
"platforms": [
217+
"linux/arm64",
218+
"linux/amd64",
219+
"linux/s390x",
220+
"linux/ppc64le"
203221
]
204222
},
205223
"staging": {
@@ -228,8 +246,11 @@
228246
"dockerfile-path": "docker/mongodb-kubernetes-upgrade-hook/Dockerfile.atomic",
229247
"patch": {
230248
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-operator-version-upgrade-post-start-hook",
231-
"platforms": [
232-
"linux/amd64"
249+
"platforms": [
250+
"linux/arm64",
251+
"linux/amd64",
252+
"linux/s390x",
253+
"linux/ppc64le"
233254
]
234255
},
235256
"staging": {
@@ -258,8 +279,11 @@
258279
"dockerfile-path": "docker/mongodb-agent/Dockerfile.atomic",
259280
"patch": {
260281
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent-ubi",
261-
"platforms": [
262-
"linux/amd64"
282+
"platforms": [
283+
"linux/arm64",
284+
"linux/amd64",
285+
"linux/s390x",
286+
"linux/ppc64le"
263287
]
264288
},
265289
"staging": {

‎build_info_agent.json

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
{
22
"platform_mappings": {
33
"linux/amd64": {
4-
"agent_suffix": "linux_x86_64.tar.gz",
5-
"tools_suffix": "rhel93-x86_64-{TOOLS_VERSION}.tgz"
4+
"agent_suffixes": ["linux_x86_64.tar.gz"],
5+
"tools_suffix": "rhel93-x86_64-{TOOLS_VERSION}.tgz",
6+
"tools_suffix_old": "rhel90-x86_64-{TOOLS_VERSION}.tgz"
67
},
78
"linux/arm64": {
8-
"agent_suffix": "amzn2_aarch64.tar.gz",
9-
"tools_suffix": "rhel93-aarch64-{TOOLS_VERSION}.tgz"
9+
"agent_suffixes": ["amzn2_aarch64.tar.gz"],
10+
"tools_suffix": "rhel93-aarch64-{TOOLS_VERSION}.tgz",
11+
"tools_suffix_old": "rhel90-aarch64-{TOOLS_VERSION}.tgz"
1012
},
1113
"linux/s390x": {
12-
"agent_suffix": "rhel7_s390x.tar.gz",
13-
"tools_suffix": "rhel9-s390x-{TOOLS_VERSION}.tgz"
14+
"agent_suffixes": ["rhel7_s390x.tar.gz", "rhel8_s390x.tar.gz", "rhel9_s390x.tar.gz"],
15+
"tools_suffix": "rhel9-s390x-{TOOLS_VERSION}.tgz",
16+
"tools_suffix_old": "rhel83-s390x-{TOOLS_VERSION}.tgz"
1417
},
1518
"linux/ppc64le": {
16-
"agent_suffix": "rhel8_ppc64le.tar.gz",
17-
"tools_suffix": "rhel9-ppc64le-{TOOLS_VERSION}.tgz"
19+
"agent_suffixes": ["rhel8_ppc64le.tar.gz", "rhel7_ppc64le.tar.gz", "rhel9_ppc64le.tar.gz"],
20+
"tools_suffix": "rhel9-ppc64le-{TOOLS_VERSION}.tgz",
21+
"tools_suffix_old": "rhel81-ppc64le-{TOOLS_VERSION}.tgz"
1822
}
1923
},
2024
"base_names": {

‎config/manager/manager.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ spec:
162162
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1"
163163
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1
164164
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1"
165-
- name: RELATED_IMAGE_AGENT_IMAGE_13_37_0_9590_1
166-
value: "quay.io/mongodb/mongodb-agent-ubi:13.37.0.9590-1"
165+
- name: RELATED_IMAGE_AGENT_IMAGE_13_38_0_9654_1
166+
value: "quay.io/mongodb/mongodb-agent-ubi:13.38.0.9654-1"
167167
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_26
168168
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.26"
169169
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_27

‎docker/mongodb-agent-non-matrix/README.md

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)