Skip to content

Commit 3e6cd36

Browse files
authored
Merge branch 'master' into custom-roles
2 parents 4b2cd52 + 943128f commit 3e6cd36

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
lines changed

.evergreen-functions.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,8 @@ functions:
417417
- src/github.com/mongodb/mongodb-kubernetes/logs/*
418418
remote_file: logs/${task_id}/${execution}/
419419
bucket: operator-e2e-artifacts
420-
permissions: public-read
420+
permissions: private
421+
visibility: signed
421422
content_type: text/plain
422423
- command: attach.xunit_results
423424
params:
@@ -432,7 +433,8 @@ functions:
432433
- src/github.com/mongodb/mongodb-kubernetes/logs/*
433434
remote_file: logs/${task_id}/${execution}/
434435
bucket: operator-e2e-artifacts
435-
permissions: public-read
436+
permissions: private
437+
visibility: signed
436438
content_type: text/plain
437439
- command: gotest.parse_files
438440
params:
@@ -448,7 +450,8 @@ functions:
448450
- src/github.com/mongodb/mongodb-kubernetes/public/architectures/**/*.out
449451
remote_file: logs/${task_id}/${execution}/
450452
bucket: operator-e2e-artifacts
451-
permissions: public-read
453+
permissions: private
454+
visibility: signed
452455
content_type: text/plain
453456

454457
preflight_image:

controllers/operator/construct/appdb_construction.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333

3434
const (
3535
appDBServiceAccount = "mongodb-kubernetes-appdb"
36-
InitAppDbContainerName = "mongodb-enterprise-init-appdb"
36+
InitAppDbContainerName = "mongodb-kubernetes-init-appdb"
3737
// AppDB environment variable names
3838
InitAppdbVersionEnv = "INIT_APPDB_VERSION"
3939
podNamespaceEnv = "POD_NAMESPACE"

controllers/operator/construct/database_construction.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const (
4848
databaseLivenessProbeCommand = "/opt/scripts/probe.sh"
4949
databaseReadinessProbeCommand = "/opt/scripts/readinessprobe"
5050

51-
InitDatabaseContainerName = "mongodb-enterprise-init-database"
51+
InitDatabaseContainerName = "mongodb-kubernetes-init-database"
5252

5353
// Database environment variable names
5454
InitDatabaseVersionEnv = "INIT_DATABASE_VERSION"

requirements.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@ requests==2.32.3
22
click==8.0.4
33
docker==7.1.0
44
Jinja2==3.1.6
5-
ruamel.yaml==0.18.6
5+
ruamel.yaml==0.18.10
66
dnspython>=2.6.1
77
MarkupSafe==2.0.1
88
semver==2.13.0
99
chardet==3.0.4
1010
jsonpatch==1.33
1111
kubernetes==17.17.0
1212
pymongo==4.6.3
13-
pytest==7.4.3
14-
pytest-asyncio==0.14.0
13+
pytest==8.3.5
14+
pytest-asyncio==0.26.0
1515
PyYAML==6.0.2
1616
urllib3==1.26.19
1717
cryptography==44.0.1
1818
python-dateutil==2.9.0
1919
python-ldap==3.4.4
20-
GitPython==3.1.43
20+
GitPython==3.1.44
2121
setuptools>=71.0.3 # not directly required, pinned by Snyk to avoid a vulnerability
2222
opentelemetry-api
2323
opentelemetry-sdk
@@ -44,5 +44,5 @@ types-PyYAML==6.0.12.20250402
4444
types-pytz==2021.1.0
4545
types-python-dateutil==0.1.4
4646
pipupgrade==1.12.0
47-
pytest-cov==6.0.0
47+
pytest-cov==6.1.1
4848
pytest-socket==0.7.0

scripts/dev/configure_docker_auth.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ remove_element() {
4444
check_docker_daemon_is_running
4545

4646
if [[ -f ~/.docker/config.json ]]; then
47-
if [[ "${RUNNING_IN_EVG:-""}" == "true" ]]; then
47+
if [[ "${RUNNING_IN_EVG:-"false"}" != "true" ]]; then
4848
# when running locally we don't need to docker login all the time - we can do it once in 11 hours (ECR tokens expire each 12 hours)
4949
if [[ -n "$(find ~/.docker/config.json -mmin -360 -type f)" ]] &&
5050
grep "quay.io" -q ~/.docker/config.json && # TODO to be removed at public preview stage of community-search

0 commit comments

Comments
 (0)