Skip to content

Commit 060b7be

Browse files
committed
Merge branch 'fealebenpae/search-grpc' into anandsyncs/add-certmanager-community-search-snippets
2 parents 4c38389 + aa0dc82 commit 060b7be

File tree

58 files changed

+1129
-1138
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1129
-1138
lines changed

.evergreen-functions.yml

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,9 @@ functions:
227227
type: setup
228228
params:
229229
working_dir: src/github.com/mongodb/mongodb-kubernetes
230+
include_expansions_in_env:
231+
- quay_prod_username
232+
- quay_prod_robot_token
230233
add_to_path:
231234
- ${workdir}/bin
232235
- ${PROJECT_DIR}/bin
@@ -512,16 +515,13 @@ functions:
512515
- command: subprocess.exec
513516
params:
514517
working_dir: src/github.com/mongodb/mongodb-kubernetes
515-
binary: scripts/dev/run_python.sh scripts/release/kubectl_mongodb/python/build_kubectl_plugin.py
516-
517-
build_and_push_appdb_database:
518+
binary: scripts/release/kubectl_mongodb/build_kubectl_plugin.sh
519+
520+
download_multi_cluster_binary:
518521
- command: subprocess.exec
519522
params:
520-
working_dir: src/github.com/mongodb/mongodb-kubernetes/docker/mongodb-kubernetes-appdb-database
521-
binary: ./build_and_push_appdb_database_images.sh
522-
add_to_path:
523-
- ${workdir}/bin
524-
- ${workdir}
523+
working_dir: src/github.com/mongodb/mongodb-kubernetes
524+
binary: scripts/release/kubectl_mongodb/download_kubectl_plugin.sh
525525

526526
build_test_image_ibm:
527527
- command: subprocess.exec
@@ -798,22 +798,6 @@ functions:
798798
script: |
799799
./scripts/code_snippets/tests/${task_name}
800800
801-
#
802-
# kubectl mongodb plugin release functions
803-
#
804-
install_goreleaser:
805-
- command: shell.exec
806-
type: setup
807-
include_expansions_in_env:
808-
- goreleaser_pro_tar_gz
809-
params:
810-
script: |
811-
set -Eeu pipefail
812-
curl -fL "${goreleaser_pro_tar_gz}" --output goreleaser_Linux_x86_64.tar.gz
813-
tar -xf goreleaser_Linux_x86_64.tar.gz
814-
chmod 755 ./goreleaser
815-
sudo cp goreleaser /usr/local/bin/
816-
817801
install_macos_notarization_service:
818802
- command: shell.exec
819803
type: setup
@@ -848,7 +832,7 @@ functions:
848832
- command: github.generate_token
849833
params:
850834
expansion_name: GH_TOKEN
851-
- command: shell.exec
835+
- command: subprocess.exec
852836
type: setup
853837
params:
854838
working_dir: src/github.com/mongodb/mongodb-kubernetes
@@ -865,10 +849,7 @@ functions:
865849
- triggered_by_git_tag
866850
- OPERATOR_VERSION
867851
env:
868-
XDG_CONFIG_HOME: ${go_base_path}${workdir}
869-
GO111MODULE: "on"
870-
GOROOT: "/opt/golang/go1.24"
871852
MACOS_NOTARY_KEY: ${macos_notary_keyid}
872853
MACOS_NOTARY_SECRET: ${macos_notary_secret}
873854
GH_TOKEN: ${GH_TOKEN}
874-
script: scripts/dev/run_python.sh scripts/release/kubectl_mongodb/python/promote_kubectl_plugin.py
855+
binary: scripts/dev/run_python.sh scripts/release/kubectl_mongodb/promote_kubectl_plugin.py

.evergreen-release.yml

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ tasks:
99
commands:
1010
- func: clone
1111
- func: setup_building_host
12-
- func: build_multi_cluster_binary
12+
- func: download_multi_cluster_binary
1313
- func: pipeline
1414
vars:
1515
image_name: meko-tests
@@ -123,9 +123,8 @@ tasks:
123123
tags: [ "binary_release" ]
124124
commands:
125125
- func: clone
126-
- func: install_goreleaser
127-
- func: install_macos_notarization_service
128126
- func: python_venv
127+
- func: install_macos_notarization_service
129128
- func: release_kubectl_mongodb_plugin
130129

131130
- name: create_chart_release_pr
@@ -135,6 +134,16 @@ tasks:
135134
- func: python_venv
136135
- func: create_chart_release_pr
137136

137+
- name: release_chart_to_oci_registry
138+
tags: [ "release_chart_to_oci_registry" ]
139+
commands:
140+
- func: clone
141+
- func: python_venv
142+
- func: setup_kubectl
143+
- func: setup_aws
144+
- func: helm_registry_login
145+
- func: publish_helm_chart
146+
138147
### Release build variants
139148
buildvariants:
140149

@@ -214,6 +223,9 @@ buildvariants:
214223
allowed_requesters: [ "patch", "github_tag" ]
215224
run_on:
216225
- release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
226+
depends_on:
227+
- name: release_kubectl_mongodb_plugin
228+
variant: release_kubectl_mongodb_plugin
217229
tasks:
218230
- name: build_test_image_for_smoke_tests
219231

@@ -240,6 +252,8 @@ buildvariants:
240252
depends_on:
241253
- name: "*"
242254
variant: release_images
255+
- name: "*"
256+
variant: init_smoke_tests
243257
tasks:
244258
- name: e2e_smoke_task_group
245259

@@ -260,3 +274,12 @@ buildvariants:
260274
allowed_requesters: [ "patch", "github_tag" ]
261275
tasks:
262276
- name: create_chart_release_pr
277+
278+
- name: release_chart_to_oci_registry
279+
display_name: release_chart_to_oci_registry
280+
tags: [ "release" ]
281+
run_on:
282+
- release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
283+
allowed_requesters: [ "patch", "github_tag" ]
284+
tasks:
285+
- name: release_chart_to_oci_registry

.evergreen-snippets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ variables:
77
- func: setup_mongosh
88
- func: download_kube_tools
99
- func: switch_context
10-
- func: build_multi_cluster_binary
10+
- func: download_multi_cluster_binary
1111
teardown_task:
1212
- func: upload_e2e_logs
1313
- func: upload_code_snippets_logs

.evergreen-tasks.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ tasks:
502502
commands:
503503
- func: "e2e_test"
504504

505-
- name: e2e_disable_tls_scale_up
505+
- name: e2e_disable_tls_and_scale
506506
tags: [ "patch-run" ]
507507
commands:
508508
- func: "e2e_test"
@@ -1116,7 +1116,6 @@ tasks:
11161116

11171117
- name: e2e_multi_cluster_validation
11181118
tags: [ "patch-run" ]
1119-
exec_timeout_secs: 1000
11201119
commands:
11211120
- func: e2e_test
11221121

.evergreen.yml

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ variables:
8282
- func: clone
8383
- func: switch_context
8484
- func: setup_building_host_minikube
85-
- func: install_goreleaser
86-
- func: build_multi_cluster_binary
8785

8886
- &setup_group_multi_cluster
8987
setup_group_can_fail_task: true
@@ -92,8 +90,6 @@ variables:
9290
- func: download_kube_tools
9391
- func: switch_context
9492
- func: setup_building_host
95-
- func: install_goreleaser
96-
- func: build_multi_cluster_binary
9793

9894
- &setup_and_teardown_task_cloudqa
9995
setup_task_can_fail_task: true
@@ -348,12 +344,17 @@ tasks:
348344
image_name: agent
349345
flags: "--parallel --current-agents --skip-if-exists=false"
350346

351-
- name: build_test_image
347+
- name: build_kubectl_mongodb_plugin
352348
commands:
353349
- func: clone
354350
- func: setup_building_host
355-
- func: install_goreleaser
356351
- func: build_multi_cluster_binary
352+
353+
- name: build_test_image
354+
commands:
355+
- func: clone
356+
- func: setup_building_host
357+
- func: download_multi_cluster_binary
357358
- func: pipeline
358359
vars:
359360
image_name: meko-tests
@@ -362,8 +363,7 @@ tasks:
362363
commands:
363364
- func: clone
364365
- func: setup_building_host
365-
- func: install_goreleaser
366-
- func: build_multi_cluster_binary
366+
- func: download_multi_cluster_binary
367367
- func: pipeline
368368
vars:
369369
image_name: meko-tests-arm64
@@ -380,8 +380,7 @@ tasks:
380380
add_to_path:
381381
- ${workdir}/bin
382382
command: scripts/evergreen/setup_minikube_host.sh
383-
- func: install_goreleaser
384-
- func: build_multi_cluster_binary
383+
- func: download_multi_cluster_binary
385384
- func: build_test_image_ibm
386385

387386
- name: build_mco_test_image
@@ -679,7 +678,7 @@ task_groups:
679678
- e2e_tls_rs_external_access
680679
- e2e_replica_set_tls_require
681680
- e2e_replica_set_tls_certs_secret_prefix
682-
- e2e_disable_tls_scale_up
681+
- e2e_disable_tls_and_scale
683682
- e2e_replica_set_tls_require_and_disable
684683
# e2e_x509_task_group
685684
- e2e_configure_tls_and_x509_simultaneously_st
@@ -1506,9 +1505,6 @@ buildvariants:
15061505
variant: init_test_run
15071506
- name: build_test_image_arm
15081507
variant: init_test_run_arm
1509-
# TODO: Re-enable when staging is added to pipeline
1510-
# https://jira.mongodb.org/browse/CLOUDP-349096
1511-
disable: true
15121508
tasks:
15131509
- name: e2e_smoke_arm_task_group
15141510

@@ -1525,9 +1521,6 @@ buildvariants:
15251521
variant: init_test_run
15261522
- name: build_test_image_arm
15271523
variant: init_test_run_arm
1528-
# TODO: Re-enable when staging is added to pipeline
1529-
# https://jira.mongodb.org/browse/CLOUDP-349096
1530-
disable: true
15311524
tasks:
15321525
- name: e2e_smoke_arm_task_group
15331526

@@ -1723,6 +1716,8 @@ buildvariants:
17231716
- name: build_operator_ubi
17241717
- name: build_operator_race_ubi
17251718
- name: build_test_image
1719+
depends_on:
1720+
- name: build_kubectl_mongodb_plugin
17261721
- name: build_mco_test_image
17271722
- name: build_init_appdb_images_ubi
17281723
- name: build_init_om_images_ubi
@@ -1731,6 +1726,7 @@ buildvariants:
17311726
- name: build_agent_images_ubi
17321727
- name: build_readiness_probe_image
17331728
- name: build_version_upgrade_hook_image
1729+
- name: build_kubectl_mongodb_plugin
17341730
- name: prepare_aws
17351731
- name: publish_helm_chart
17361732

@@ -1744,6 +1740,9 @@ buildvariants:
17441740
run_on:
17451741
- rhel9-power-small
17461742
- rhel9-power-large
1743+
depends_on:
1744+
- name: build_kubectl_mongodb_plugin
1745+
variant: init_test_run
17471746
tasks:
17481747
- name: build_test_image_ibm
17491748

@@ -1757,6 +1756,9 @@ buildvariants:
17571756
run_on:
17581757
- rhel9-zseries-small
17591758
- rhel9-zseries-large
1759+
depends_on:
1760+
- name: build_kubectl_mongodb_plugin
1761+
variant: init_test_run
17601762
tasks:
17611763
- name: build_test_image_ibm
17621764

@@ -1766,6 +1768,9 @@ buildvariants:
17661768
tags: [ "staging" ]
17671769
run_on:
17681770
- ubuntu2204-arm64-small
1771+
depends_on:
1772+
- name: build_kubectl_mongodb_plugin
1773+
variant: init_test_run
17691774
tasks:
17701775
- name: build_test_image_arm
17711776

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ logs-debug/
8989
docs/**/log/*
9090
docs/**/test.sh.run.log
9191

92-
# goreleaser generated files
93-
dist
9492
logs
9593
*.run.log
9694

.goreleaser.yaml

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

Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ build-and-push-operator-image: aws_login
159159
build-and-push-database-image: aws_login
160160
@ scripts/dev/build_push_database_image
161161

162-
build-and-push-test-image: aws_login build-multi-cluster-binary
162+
build-and-push-test-image: aws_login
163163
@ if [[ -z "$(local)" ]]; then \
164164
scripts/dev/run_python.sh scripts/release/pipeline.py test; \
165165
fi
@@ -169,9 +169,6 @@ build-and-push-mco-test-image: aws_login
169169
scripts/dev/run_python.sh scripts/release/pipeline.py mco-test; \
170170
fi
171171

172-
build-multi-cluster-binary:
173-
scripts/evergreen/build_multi_cluster_kubeconfig_creator.sh
174-
175172
# builds all app images in parallel
176173
# note that we cannot build both appdb and database init images in parallel as they change the same docker file
177174
build-and-push-images: build-and-push-operator-image appdb-init-image om-init-image database operator-image database-init-image

0 commit comments

Comments
 (0)