From 792830acb404e5f3acc7fbe1cc66e142e4477611 Mon Sep 17 00:00:00 2001 From: Mikalai Radchuk <509198+m1kola@users.noreply.github.com> Date: Wed, 23 Apr 2025 11:35:09 +0200 Subject: [PATCH] Rename database image Drop the `-ubi` suffix --- config/manager/manager.yaml | 4 ++-- helm_chart/values.yaml | 2 +- inventories/database.yaml | 6 +++--- pipeline.py | 2 +- .../setup-operator/output/0210_helm_install_operator.out | 4 ++-- public/mongodb-enterprise-multi-cluster.yaml | 2 +- public/mongodb-enterprise-openshift.yaml | 4 ++-- public/mongodb-enterprise.yaml | 2 +- scripts/dev/contexts/local-defaults-context | 2 +- scripts/dev/launch_e2e.sh | 2 +- scripts/evergreen/periodic-cleanup-aws.py | 2 +- scripts/funcs/operator_deployment | 4 ++-- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index d9c451bfc..0c2ef6a9a 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -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 @@ -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 diff --git a/helm_chart/values.yaml b/helm_chart/values.yaml index 6e297b50d..ec4eb0c96 100644 --- a/helm_chart/values.yaml +++ b/helm_chart/values.yaml @@ -113,7 +113,7 @@ operator: ## Database database: - name: mongodb-kubernetes-database-ubi + name: mongodb-kubernetes-database version: 0.1.0 initDatabase: diff --git a/inventories/database.yaml b/inventories/database.yaml index 8a3441d32..389ed5b50 100644 --- a/inventories/database.yaml +++ b/inventories/database.yaml @@ -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 diff --git a/pipeline.py b/pipeline.py index 8b58e77be..95283cecf 100755 --- a/pipeline.py +++ b/pipeline.py @@ -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=""), diff --git a/public/architectures/setup-multi-cluster/setup-operator/output/0210_helm_install_operator.out b/public/architectures/setup-multi-cluster/setup-operator/output/0210_helm_install_operator.out index 809f01430..5e755838e 100644 --- a/public/architectures/setup-multi-cluster/setup-operator/output/0210_helm_install_operator.out +++ b/public/architectures/setup-multi-cluster/setup-operator/output/0210_helm_install_operator.out @@ -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: @@ -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 diff --git a/public/mongodb-enterprise-multi-cluster.yaml b/public/mongodb-enterprise-multi-cluster.yaml index ad5366a99..0056ca5e0 100644 --- a/public/mongodb-enterprise-multi-cluster.yaml +++ b/public/mongodb-enterprise-multi-cluster.yaml @@ -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 diff --git a/public/mongodb-enterprise-openshift.yaml b/public/mongodb-enterprise-openshift.yaml index 1cbcd2ca3..4e6b5411f 100644 --- a/public/mongodb-enterprise-openshift.yaml +++ b/public/mongodb-enterprise-openshift.yaml @@ -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 @@ -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 diff --git a/public/mongodb-enterprise.yaml b/public/mongodb-enterprise.yaml index 4c023c826..028cf11c0 100644 --- a/public/mongodb-enterprise.yaml +++ b/public/mongodb-enterprise.yaml @@ -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 diff --git a/scripts/dev/contexts/local-defaults-context b/scripts/dev/contexts/local-defaults-context index 0690ffa14..a79a92482 100644 --- a/scripts/dev/contexts/local-defaults-context +++ b/scripts/dev/contexts/local-defaults-context @@ -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} diff --git a/scripts/dev/launch_e2e.sh b/scripts/dev/launch_e2e.sh index 740a2c167..9aac44795 100755 --- a/scripts/dev/launch_e2e.sh +++ b/scripts/dev/launch_e2e.sh @@ -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'" diff --git a/scripts/evergreen/periodic-cleanup-aws.py b/scripts/evergreen/periodic-cleanup-aws.py index e82d11ff4..d9af5be7a 100755 --- a/scripts/evergreen/periodic-cleanup-aws.py +++ b/scripts/evergreen/periodic-cleanup-aws.py @@ -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", diff --git a/scripts/funcs/operator_deployment b/scripts/funcs/operator_deployment index 6cf6b070a..8c9984b7d 100644 --- a/scripts/funcs/operator_deployment +++ b/scripts/funcs/operator_deployment @@ -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}" @@ -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}}"