diff --git a/helm_chart/values.yaml b/helm_chart/values.yaml index ee4a58154..6691f2054 100644 --- a/helm_chart/values.yaml +++ b/helm_chart/values.yaml @@ -173,7 +173,6 @@ registry: initOpsManager: quay.io/mongodb opsManager: quay.io/mongodb initAppDb: quay.io/mongodb - appDb: quay.io/mongodb agent: quay.io/mongodb # This is only used by the MongoDBCommunity resource reconciler - START @@ -200,7 +199,6 @@ community: version: 108.0.2.8729-1 registry: agent: quay.io/mongodb - name: mongodb-database resource: name: mongodb-replica-set version: 4.4.0 diff --git a/scripts/dev/contexts/e2e_smoke b/scripts/dev/contexts/e2e_smoke index 65d56dc80..d34badad6 100644 --- a/scripts/dev/contexts/e2e_smoke +++ b/scripts/dev/contexts/e2e_smoke @@ -9,7 +9,6 @@ source "${script_dir}/root-context" source "${script_dir}/variables/om70" export DATABASE_REGISTRY="${QUAY_REGISTRY}" -export APPDB_REGISTRY="${QUAY_REGISTRY}" export INIT_OPS_MANAGER_REGISTRY="${QUAY_REGISTRY}" export OPS_MANAGER_REGISTRY="${QUAY_REGISTRY}" export OPERATOR_REGISTRY="${QUAY_REGISTRY}" diff --git a/scripts/dev/contexts/e2e_static_smoke b/scripts/dev/contexts/e2e_static_smoke index 2c8ed45d3..baae4ce10 100644 --- a/scripts/dev/contexts/e2e_static_smoke +++ b/scripts/dev/contexts/e2e_static_smoke @@ -9,7 +9,6 @@ source "${script_dir}/root-context" source "${script_dir}/variables/om70" export DATABASE_REGISTRY="${QUAY_REGISTRY}" -export APPDB_REGISTRY="${QUAY_REGISTRY}" export INIT_OPS_MANAGER_REGISTRY="${QUAY_REGISTRY}" export OPS_MANAGER_REGISTRY="${QUAY_REGISTRY}" export OPERATOR_REGISTRY="${QUAY_REGISTRY}" diff --git a/scripts/dev/contexts/evg-private-context b/scripts/dev/contexts/evg-private-context index dec163d8c..ed92f125c 100644 --- a/scripts/dev/contexts/evg-private-context +++ b/scripts/dev/contexts/evg-private-context @@ -44,7 +44,6 @@ export INIT_OPS_MANAGER_REGISTRY=${INIT_IMAGES_REGISTRY-"${QUAY_REGISTRY}"} export INIT_DATABASE_REGISTRY=${INIT_IMAGES_REGISTRY:-"${QUAY_REGISTRY}"} export DATABASE_REGISTRY=${INIT_IMAGES_REGISTRY:-"${QUAY_REGISTRY}"} export OPS_MANAGER_REGISTRY=${QUAY_REGISTRY} -export APPDB_REGISTRY=${QUAY_REGISTRY} export MONGODB_ENTERPRISE_DATABASE_IMAGE="${INIT_IMAGES_REGISTRY}/mongodb-kubernetes-database" export INIT_DATABASE_IMAGE_REPOSITORY="${INIT_IMAGES_REGISTRY}/mongodb-kubernetes-init-database" export MDB_AGENT_IMAGE_REPOSITORY="${INIT_IMAGES_REGISTRY}/mongodb-agent" diff --git a/scripts/dev/contexts/local-defaults-context b/scripts/dev/contexts/local-defaults-context index 371cd1202..e0c3b292c 100644 --- a/scripts/dev/contexts/local-defaults-context +++ b/scripts/dev/contexts/local-defaults-context @@ -36,7 +36,6 @@ export INIT_DATABASE_IMAGE_REPOSITORY="${BASE_REPO_URL_SHARED}/mongodb-kubernete 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-kubernetes-database" export MDB_AGENT_IMAGE_OPERATOR_VERSION=latest export MDB_AGENT_IMAGE_REPOSITORY="${BASE_REPO_URL_SHARED}/mongodb-agent" diff --git a/scripts/dev/contexts/variables/om60 b/scripts/dev/contexts/variables/om60 index dac7e8375..e2e77e3ab 100644 --- a/scripts/dev/contexts/variables/om60 +++ b/scripts/dev/contexts/variables/om60 @@ -16,4 +16,3 @@ export CUSTOM_MDB_PREV_VERSION=5.0.7 export CUSTOM_APPDB_VERSION=6.0.21-ent export TEST_MODE=opsmanager export OPS_MANAGER_REGISTRY="${BASE_REPO_URL}" -export APPDB_REGISTRY="${BASE_REPO_URL}" diff --git a/scripts/dev/contexts/variables/om70 b/scripts/dev/contexts/variables/om70 index 09e636593..c0c8b0eb7 100644 --- a/scripts/dev/contexts/variables/om70 +++ b/scripts/dev/contexts/variables/om70 @@ -19,4 +19,3 @@ export AGENT_IMAGE="${MDB_AGENT_IMAGE_REPOSITORY}:${AGENT_VERSION}" export CUSTOM_APPDB_VERSION=7.0.18-ent export TEST_MODE=opsmanager export OPS_MANAGER_REGISTRY="${BASE_REPO_URL}" -export APPDB_REGISTRY="${BASE_REPO_URL}" diff --git a/scripts/dev/contexts/variables/om80 b/scripts/dev/contexts/variables/om80 index 4d84cb943..f0b677d90 100644 --- a/scripts/dev/contexts/variables/om80 +++ b/scripts/dev/contexts/variables/om80 @@ -19,4 +19,3 @@ export AGENT_IMAGE="${MDB_AGENT_IMAGE_REPOSITORY}:${AGENT_VERSION}" export CUSTOM_APPDB_VERSION=8.0.6-ent export TEST_MODE=opsmanager export OPS_MANAGER_REGISTRY="${BASE_REPO_URL}" -export APPDB_REGISTRY="${BASE_REPO_URL}" diff --git a/scripts/funcs/operator_deployment b/scripts/funcs/operator_deployment index f13b31f23..b9357d65c 100644 --- a/scripts/funcs/operator_deployment +++ b/scripts/funcs/operator_deployment @@ -16,7 +16,6 @@ get_operator_helm_values() { "registry.initDatabase=${INIT_DATABASE_REGISTRY}" "registry.agent=${AGENT_BASE_REGISTRY:-${REGISTRY}}" "registry.opsManager=${OPS_MANAGER_REGISTRY}" - "registry.appDb=${APPDB_REGISTRY}" "registry.database=${database_registry}" "opsManager.name=${OPS_MANAGER_NAME:=mongodb-enterprise-ops-manager-ubi}" "database.name=${database_name:=mongodb-kubernetes-database}"