Skip to content

Commit f61dba9

Browse files
committed
Fix missing overrides for repositories
1 parent dd3345b commit f61dba9

File tree

1 file changed

+24
-22
lines changed

1 file changed

+24
-22
lines changed

scripts/dev/contexts/root-context

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -56,38 +56,40 @@ if [[ "${OVERRIDE_VERSION_ID:-}" != "" ]]; then
5656
fi
5757

5858
export OPERATOR_VERSION="${OPERATOR_VERSION}"
59-
export INIT_APPDB_VERSION="${OPERATOR_VERSION}"
60-
export INIT_DATABASE_VERSION="${OPERATOR_VERSION}"
61-
export INIT_OPS_MANAGER_VERSION="${OPERATOR_VERSION}"
62-
export DATABASE_VERSION="${OPERATOR_VERSION}"
63-
export READINESS_PROBE_VERSION="${READINESS_PROBE_VERSION}"
64-
export VERSION_UPGRADE_HOOK_VERSION="${VERSION_UPGRADE_HOOK_VERSION}"
59+
export INIT_APPDB_VERSION="${INIT_APPDB_VERSION:-$OPERATOR_VERSION}"
60+
export INIT_DATABASE_VERSION="${INIT_DATABASE_VERSION:-$OPERATOR_VERSION}"
61+
export INIT_OPS_MANAGER_VERSION="${INIT_OPS_MANAGER_VERSION:-$OPERATOR_VERSION}"
62+
export DATABASE_VERSION="${DATABASE_VERSION:-$OPERATOR_VERSION}"
63+
export READINESS_PROBE_VERSION="${READINESS_PROBE_VERSION:-$READINESS_PROBE_VERSION}"
64+
export VERSION_UPGRADE_HOOK_VERSION="${VERSION_UPGRADE_HOOK_VERSION:-$VERSION_UPGRADE_HOOK_VERSION}"
6565

6666
### Registries and images
6767
export QUAY_REGISTRY="quay.io/mongodb"
68-
export OPERATOR_REGISTRY=${REGISTRY}
69-
export INIT_IMAGES_REGISTRY=${INIT_IMAGES_REGISTRY:-${REGISTRY}}
68+
export OPERATOR_REGISTRY=${OPERATOR_REGISTRY:-$REGISTRY}
69+
export INIT_IMAGES_REGISTRY=${INIT_IMAGES_REGISTRY:-$REGISTRY}
7070

7171
# Specific registries for different images, can be overridden if needed
72-
export INIT_APPDB_REGISTRY=${INIT_IMAGES_REGISTRY}
73-
export INIT_APPDB_IMAGE_REPOSITORY="${INIT_IMAGES_REGISTRY}/mongodb-kubernetes-init-appdb"
74-
export INIT_OPS_MANAGER_REGISTRY=${INIT_IMAGES_REGISTRY}
75-
export INIT_OPS_MANAGER_IMAGE_REPOSITORY="${INIT_IMAGES_REGISTRY}/mongodb-kubernetes-init-ops-manager"
76-
export INIT_DATABASE_REGISTRY=${INIT_IMAGES_REGISTRY}
77-
export INIT_DATABASE_IMAGE_REPOSITORY="${INIT_IMAGES_REGISTRY}/mongodb-kubernetes-init-database"
78-
export DATABASE_REGISTRY=${INIT_IMAGES_REGISTRY}
79-
export MONGODB_ENTERPRISE_DATABASE_IMAGE="${INIT_IMAGES_REGISTRY}/mongodb-kubernetes-database"
80-
export OPS_MANAGER_REGISTRY=${REGISTRY}
72+
export INIT_APPDB_REGISTRY=${INIT_APPDB_REGISTRY:-$INIT_IMAGES_REGISTRY}
73+
export INIT_APPDB_IMAGE_REPOSITORY="${INIT_APPDB_REGISTRY}/mongodb-kubernetes-init-appdb"
74+
export INIT_OPS_MANAGER_REGISTRY=${INIT_OPS_MANAGER_REGISTRY:-$INIT_IMAGES_REGISTRY}
75+
export INIT_OPS_MANAGER_IMAGE_REPOSITORY="${INIT_OPS_MANAGER_REGISTRY}/mongodb-kubernetes-init-ops-manager"
76+
export INIT_DATABASE_REGISTRY=${INIT_DATABASE_REGISTRY:-$INIT_IMAGES_REGISTRY}
77+
export INIT_DATABASE_IMAGE_REPOSITORY="${INIT_DATABASE_REGISTRY}/mongodb-kubernetes-init-database"
78+
export DATABASE_REGISTRY=${DATABASE_REGISTRY:-$INIT_IMAGES_REGISTRY}
79+
export MONGODB_ENTERPRISE_DATABASE_IMAGE="${DATABASE_REGISTRY}/mongodb-kubernetes-database"
80+
export OPS_MANAGER_REGISTRY=${OPS_MANAGER_REGISTRY:-$REGISTRY}
8181
export OPS_MANAGER_IMAGE_REPOSITORY="${OPS_MANAGER_REGISTRY}/mongodb-enterprise-ops-manager-ubi"
82-
export MDB_AGENT_REGISTRY=${REGISTRY}
82+
export MDB_AGENT_REGISTRY=${MDB_AGENT_REGISTRY:-$REGISTRY}
8383
export MDB_AGENT_IMAGE_REPOSITORY="${MDB_AGENT_REGISTRY}/mongodb-agent"
84-
export MONGODB_REPO_URL="${QUAY_REGISTRY}"
85-
export MEKO_TESTS_REGISTRY=${REGISTRY}
84+
export MONGODB_REPO_URL="${MONGODB_REPO_URL:-$QUAY_REGISTRY}"
85+
export MEKO_TESTS_REGISTRY=${MEKO_TESTS_REGISTRY:-$REGISTRY}
8686
export MEKO_TESTS_IMAGE_REPOSITORY="${MEKO_TESTS_REGISTRY}/mongodb-kubernetes-tests"
87+
export READINESS_PROBE_REGISTRY=${READINESS_PROBE_REGISTRY:-$REGISTRY}
88+
export VERSION_UPGRADE_HOOK_REGISTRY=${VERSION_UPGRADE_HOOK_REGISTRY:-$REGISTRY}
8789

8890
export AGENT_IMAGE="${MDB_AGENT_IMAGE_REPOSITORY}:${AGENT_VERSION}"
89-
export READINESS_PROBE_IMAGE="${REGISTRY}/mongodb-kubernetes-readinessprobe:${READINESS_PROBE_VERSION}"
90-
export VERSION_UPGRADE_HOOK_IMAGE="${REGISTRY}/mongodb-kubernetes-operator-version-upgrade-post-start-hook:${VERSION_UPGRADE_HOOK_VERSION}"
91+
export READINESS_PROBE_IMAGE="${READINESS_PROBE_REGISTRY}/mongodb-kubernetes-readinessprobe:${READINESS_PROBE_VERSION}"
92+
export VERSION_UPGRADE_HOOK_IMAGE="${VERSION_UPGRADE_HOOK_REGISTRY}/mongodb-kubernetes-operator-version-upgrade-post-start-hook:${VERSION_UPGRADE_HOOK_VERSION}"
9193

9294
export KUBE_ENVIRONMENT_NAME=kind
9395

0 commit comments

Comments
 (0)