Skip to content

Commit ccde9d2

Browse files
committed
Merge branch 'migrate-repo' of github.com:mongodb/mongodb-kubernetes into migrate-repo
2 parents 1539447 + 703b56e commit ccde9d2

File tree

7 files changed

+8
-6
lines changed

7 files changed

+8
-6
lines changed

build_info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
},
251251
"staging": {
252252
"sign": true,
253-
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-agent-ubi"],
253+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-agent"],
254254
"platforms": [
255255
"linux/arm64",
256256
"linux/amd64",

generate_ssdlc_report.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def get_supported_images(release: Dict) -> dict[str, SupportedImage]:
9797
supported_images = convert_to_image_names(supported_images)
9898
supported_images["mongodb-agent-ubi"] = SupportedImage(
9999
get_supported_version_for_image("mongodb-agent"),
100-
"mongodb-agent-ubi",
100+
"mongodb-agent",
101101
"quay.io/mongodb/mongodb-agent",
102102
release["supportedImages"]["mongodb-agent"]["ssdlc_name"],
103103
list(),

scripts/dev/contexts/evg-private-context

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export OPS_MANAGER_REGISTRY=${QUAY_REGISTRY}
4747
export APPDB_REGISTRY=${QUAY_REGISTRY}
4848
export MONGODB_ENTERPRISE_DATABASE_IMAGE="${INIT_IMAGES_REGISTRY}/mongodb-kubernetes-database"
4949
export INIT_DATABASE_IMAGE_REPOSITORY="${INIT_IMAGES_REGISTRY}/mongodb-kubernetes-init-database"
50-
export MDB_AGENT_IMAGE_REPOSITORY="${INIT_IMAGES_REGISTRY}/mongodb-agent-ubi"
50+
export MDB_AGENT_IMAGE_REPOSITORY="${INIT_IMAGES_REGISTRY}/mongodb-agent"
5151

5252
# these are needed to deploy OM
5353
export INIT_APPDB_IMAGE_REPOSITORY="${INIT_IMAGES_REGISTRY}/mongodb-kubernetes-init-appdb"

scripts/dev/contexts/local-defaults-context

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ export MONGODB_REPO_URL="${QUAY_REGISTRY}"
3939
export APPDB_REGISTRY="${QUAY_REGISTRY}"
4040
export MONGODB_ENTERPRISE_DATABASE_IMAGE="${INIT_IMAGES_REGISTRY}/mongodb-kubernetes-database"
4141
export MDB_AGENT_IMAGE_OPERATOR_VERSION=latest
42-
export MDB_AGENT_IMAGE_REPOSITORY="${BASE_REPO_URL_SHARED}/mongodb-agent-ubi"
42+
export MDB_AGENT_IMAGE_REPOSITORY="${BASE_REPO_URL_SHARED}/mongodb-agent"
4343
export AGENT_BASE_REGISTRY=${BASE_REPO_URL_SHARED}
44-
export AGENT_IMAGE="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent:12.0.30.7791-1"
44+
export AGENT_IMAGE="${MDB_AGENT_IMAGE_REPOSITORY}:12.0.35.7911-1"
4545

4646
# these are needed to deploy OM
4747
export INIT_APPDB_IMAGE_REPOSITORY="${INIT_IMAGES_REGISTRY}/mongodb-kubernetes-init-appdb"

scripts/evergreen/periodic-cleanup-aws.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
REPOSITORIES_NAMES = [
99
"dev/mongodb-agent-ubi",
10+
"dev/mongodb-agent",
1011
"dev/mongodb-kubernetes-init-appdb",
1112
"dev/mongodb-kubernetes-database",
1213
"dev/mongodb-kubernetes-init-database",

scripts/funcs/operator_deployment

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ get_operator_helm_values() {
3434
"operator.telemetry.send.enabled=${MDB_OPERATOR_TELEMETRY_SEND_ENABLED:-false}"
3535
# lets collect and save in the configmap as frequently as we can
3636
"operator.telemetry.collection.frequency=${MDB_OPERATOR_TELEMETRY_COLLECTION_FREQUENCY:-1m}"
37+
"community.registry.agent=${AGENT_BASE_REGISTRY:-${REGISTRY}}"
3738
)
3839

3940
if [[ "${MDB_OPERATOR_TELEMETRY_INSTALL_CLUSTER_ROLE_INSTALLATION:-}" != "" ]]; then

scripts/release/tests/build_info_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ def test_load_build_info_staging(git_repo: Repo):
323323
sign=True,
324324
),
325325
"agent": ImageInfo(
326-
repositories=["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-agent-ubi"],
326+
repositories=["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-agent"],
327327
platforms=["linux/arm64", "linux/amd64", "linux/s390x", "linux/ppc64le"],
328328
version=expected_commit_sha,
329329
dockerfile_path="docker/mongodb-agent/Dockerfile.atomic",

0 commit comments

Comments
 (0)