Skip to content

Rename database image #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 23, 2025
Merged

Rename database image #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ spec:
value: Always
# Database
- name: MONGODB_ENTERPRISE_DATABASE_IMAGE
value: quay.io/mongodb/mongodb-kubernetes-database-ubi
value: quay.io/mongodb/mongodb-kubernetes-database
- name: INIT_DATABASE_IMAGE_REPOSITORY
value: quay.io/mongodb/mongodb-kubernetes-init-database
- name: INIT_DATABASE_VERSION
Expand Down Expand Up @@ -120,7 +120,7 @@ spec:
value: "ubi8"
# Community Env Vars End
- name: RELATED_IMAGE_MONGODB_ENTERPRISE_DATABASE_IMAGE_0_1_0
value: "quay.io/mongodb/mongodb-kubernetes-database-ubi:0.1.0"
value: "quay.io/mongodb/mongodb-kubernetes-database:0.1.0"
- name: RELATED_IMAGE_INIT_DATABASE_IMAGE_REPOSITORY_0_1_0
value: "quay.io/mongodb/mongodb-kubernetes-init-database:0.1.0"
- name: RELATED_IMAGE_INIT_OPS_MANAGER_IMAGE_REPOSITORY_0_1_0
Expand Down
2 changes: 1 addition & 1 deletion helm_chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ operator:

## Database
database:
name: mongodb-kubernetes-database-ubi
name: mongodb-kubernetes-database
version: 0.1.0

initDatabase:
Expand Down
6 changes: 3 additions & 3 deletions inventories/database.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ images:
buildargs:
imagebase: $(inputs.params.registry)/mongodb-enterprise-database-context:$(inputs.params.version_id)
output:
- registry: $(inputs.params.registry)/mongodb-enterprise-database-ubi
- registry: $(inputs.params.registry)/mongodb-kubernetes-database
tag: $(inputs.params.version_id)

- name: master-latest
task_type: tag_image
tags: ["master"]
source:
registry: $(inputs.params.registry)/mongodb-enterprise-database-ubi
registry: $(inputs.params.registry)/mongodb-kubernetes-database
tag: $(inputs.params.version_id)
destination:
- registry: $(inputs.params.registry)/mongodb-enterprise-database-ubi
- registry: $(inputs.params.registry)/mongodb-kubernetes-database
tag: latest

- name: database-release-context
Expand Down
2 changes: 1 addition & 1 deletion pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ def args_for_daily_image(image_name: str) -> Dict[str, str]:
This includes the quay_registry and ospid corresponding to RedHat's project id.
"""
image_configs = [
image_config("database"),
image_config("database", ubi_suffix=""),
image_config("init-appdb", ubi_suffix=""),
image_config("agent", name_prefix="mongodb-enterprise-"),
image_config("init-database", ubi_suffix=""),
Expand Down
4 changes: 2 additions & 2 deletions ...ic/architectures/setup-multi-cluster/setup-operator/output/0210_helm_install_operator.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ agent:
name: mongodb-agent-ubi
version: 108.0.2.8729-1
database:
name: mongodb-enterprise-database-ubi
name: mongodb-kubernetes-database
version: 1.33.0
dummy: value
initAppDb:
Expand Down Expand Up @@ -264,7 +264,7 @@ spec:
value: Always
# Database
- name: MONGODB_ENTERPRISE_DATABASE_IMAGE
value: quay.io/mongodb/mongodb-kubernetes-database-ubi
value: quay.io/mongodb/mongodb-kubernetes-database
- name: INIT_DATABASE_IMAGE_REPOSITORY
value: quay.io/mongodb/mongodb-kubernetes-init-database
- name: INIT_DATABASE_VERSION
Expand Down
2 changes: 1 addition & 1 deletion public/mongodb-enterprise-multi-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ spec:
value: Always
# Database
- name: MONGODB_ENTERPRISE_DATABASE_IMAGE
value: quay.io/mongodb/mongodb-kubernetes-database-ubi
value: quay.io/mongodb/mongodb-kubernetes-database
- name: INIT_DATABASE_IMAGE_REPOSITORY
value: quay.io/mongodb/mongodb-kubernetes-init-database
- name: INIT_DATABASE_VERSION
Expand Down
4 changes: 2 additions & 2 deletions public/mongodb-enterprise-openshift.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ spec:
value: Always
# Database
- name: MONGODB_ENTERPRISE_DATABASE_IMAGE
value: quay.io/mongodb/mongodb-kubernetes-database-ubi
value: quay.io/mongodb/mongodb-kubernetes-database
- name: INIT_DATABASE_IMAGE_REPOSITORY
value: quay.io/mongodb/mongodb-kubernetes-init-database
- name: INIT_DATABASE_VERSION
Expand Down Expand Up @@ -372,7 +372,7 @@ spec:
value: "ubi8"
# Community Env Vars End
- name: RELATED_IMAGE_MONGODB_ENTERPRISE_DATABASE_IMAGE_0_1_0
value: "quay.io/mongodb/mongodb-kubernetes-database-ubi:0.1.0"
value: "quay.io/mongodb/mongodb-kubernetes-database:0.1.0"
- name: RELATED_IMAGE_INIT_DATABASE_IMAGE_REPOSITORY_0_1_0
value: "quay.io/mongodb/mongodb-kubernetes-init-database:0.1.0"
- name: RELATED_IMAGE_INIT_OPS_MANAGER_IMAGE_REPOSITORY_0_1_0
Expand Down
2 changes: 1 addition & 1 deletion public/mongodb-enterprise.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ spec:
value: Always
# Database
- name: MONGODB_ENTERPRISE_DATABASE_IMAGE
value: quay.io/mongodb/mongodb-kubernetes-database-ubi
value: quay.io/mongodb/mongodb-kubernetes-database
- name: INIT_DATABASE_IMAGE_REPOSITORY
value: quay.io/mongodb/mongodb-kubernetes-init-database
- name: INIT_DATABASE_VERSION
Expand Down
2 changes: 1 addition & 1 deletion scripts/dev/contexts/local-defaults-context
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export DATABASE_REGISTRY=${BASE_REPO_URL_SHARED:-"${QUAY_REGISTRY}"}
export OPS_MANAGER_REGISTRY="${QUAY_REGISTRY}"
export MONGODB_REPO_URL="${QUAY_REGISTRY}"
export APPDB_REGISTRY="${QUAY_REGISTRY}"
export MONGODB_ENTERPRISE_DATABASE_IMAGE="${INIT_IMAGES_REGISTRY}/mongodb-enterprise-database-ubi"
export MONGODB_ENTERPRISE_DATABASE_IMAGE="${INIT_IMAGES_REGISTRY}/mongodb-kubernetes-database"
export MDB_AGENT_IMAGE_OPERATOR_VERSION=latest
export MDB_AGENT_IMAGE_REPOSITORY="${BASE_REPO_URL_SHARED}/mongodb-agent-ubi"
export AGENT_BASE_REGISTRY=${BASE_REPO_URL_SHARED}
Expand Down
2 changes: 1 addition & 1 deletion scripts/dev/launch_e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if [[ "${OPS_MANAGER_REGISTRY}" == quay.io* ]]; then
export OPS_MANAGER_NAME=mongodb-enterprise-ops-manager-ubi
fi
if [[ "${DATABASE_REGISTRY}" == quay.io* ]]; then
export DATABASE_NAME=mongodb-enterprise-database-ubi
export DATABASE_NAME=mongodb-kubernetes-database
fi

[[ ${skip:-} = "true" ]] && export SKIP_EXECUTION="'true'"
Expand Down
2 changes: 1 addition & 1 deletion scripts/evergreen/periodic-cleanup-aws.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
REPOSITORIES_NAMES = [
"dev/mongodb-agent-ubi",
"dev/mongodb-kubernetes-init-appdb",
"dev/mongodb-enterprise-database-ubi",
"dev/mongodb-kubernetes-database",
"dev/mongodb-kubernetes-init-database",
"dev/mongodb-kubernetes-init-ops-manager",
"dev/mongodb-enterprise-ops-manager-ubi",
Expand Down
4 changes: 2 additions & 2 deletions scripts/funcs/operator_deployment
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -Eeou pipefail
get_operator_helm_values() {
# shellcheck disable=SC2153
local database_registry=${DATABASE_REGISTRY}
local database_name=${DATABASE_NAME:=mongodb-enterprise-database-ubi}
local database_name=${DATABASE_NAME:=mongodb-kubernetes-database}

declare -a config=(
"managedSecurityContext=${MANAGED_SECURITY_CONTEXT:-false}"
Expand All @@ -19,7 +19,7 @@ get_operator_helm_values() {
"registry.appDb=${APPDB_REGISTRY}"
"registry.database=${database_registry}"
"opsManager.name=${OPS_MANAGER_NAME:=mongodb-enterprise-ops-manager-ubi}"
"database.name=${database_name:=mongodb-enterprise-database-ubi}"
"database.name=${database_name:=mongodb-kubernetes-database}"
"operator.version=${OPERATOR_VERSION-${VERSION_ID}}"
"initOpsManager.version=${INIT_OPS_MANAGER_VERSION:-${VERSION_ID}}"
"initAppDb.version=${INIT_APPDB_VERSION:-${VERSION_ID}}"
Expand Down