Skip to content

fix(quick_start): align MinIO credential vars with documented .env #576

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

Closed
Ahmath-Gadji wants to merge 1 commit into from
Closed

fix(quick_start): align MinIO credential vars with documented .env #576

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
8 changes: 4 additions & 4 deletions infra/quick_start/vdb/milvus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ services:
minio:
image: minio/minio:RELEASE.2023-03-20T20-16-18Z
environment:
MINIO_ROOT_USER: ${MINIO_ROOT_USER:?Set MINIO_ROOT_USER in your .env}
MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD:?Set MINIO_ROOT_PASSWORD in your .env}
MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY:?Set MINIO_ACCESS_KEY in your .env}
MINIO_SECRET_KEY: ${MINIO_SECRET_KEY:?Set MINIO_SECRET_KEY in your .env}
volumes:
- ${MILVUS_VOLUME_DIRECTORY:-./volumes}/minio:/minio_data
command: minio server /minio_data --console-address ":9001"
Expand All @@ -37,8 +37,8 @@ services:
ETCD_ENDPOINTS: etcd:2379
MINIO_ADDRESS: minio:9000
# Keep Milvus's MinIO credentials in sync with the minio service above.
MINIO_ACCESS_KEY_ID: ${MINIO_ROOT_USER:?Set MINIO_ROOT_USER in your .env}
MINIO_SECRET_ACCESS_KEY: ${MINIO_ROOT_PASSWORD:?Set MINIO_ROOT_PASSWORD in your .env}
MINIO_ACCESS_KEY_ID: ${MINIO_ACCESS_KEY:?Set MINIO_ACCESS_KEY in your .env}
MINIO_SECRET_ACCESS_KEY: ${MINIO_SECRET_KEY:?Set MINIO_SECRET_KEY in your .env}
volumes:
- ${MILVUS_VOLUME_DIRECTORY:-./volumes}/milvus:/var/lib/milvus
healthcheck:
Expand Down
21 changes: 14 additions & 7 deletions tests/unit/infra/test_compose_storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,25 @@ def test_named_volume_profile_is_opt_in() -> None:
assert milvus_env["MINIO_SECRET_ACCESS_KEY"] == "${MINIO_SECRET_KEY:?Set MINIO_SECRET_KEY in your .env}"


def test_quick_start_milvus_uses_current_minio_root_env_names() -> None:
def test_quick_start_milvus_uses_matching_minio_credentials() -> None:
# The quickstart docs tell users to ``cp .env.example .env`` (which defines
# MINIO_ACCESS_KEY / MINIO_SECRET_KEY) and drop it in quick_start/. The
# quick_start compose must therefore read the same variable names, both so
# interpolation succeeds and so Milvus's object-storage creds match minio's.
quickstart = _load_yaml(ROOT / "infra" / "quick_start" / "vdb" / "milvus.yaml")
default_env_values = _load_env_example(COMPOSE_DIR / ".env.example")

minio_env = quickstart["services"]["minio"]["environment"]
milvus_env = quickstart["services"]["milvus"]["environment"]

assert "MINIO_ACCESS_KEY" not in minio_env
assert "MINIO_SECRET_KEY" not in minio_env
assert minio_env["MINIO_ROOT_USER"] == "${MINIO_ROOT_USER:?Set MINIO_ROOT_USER in your .env}"
assert minio_env["MINIO_ROOT_PASSWORD"] == "${MINIO_ROOT_PASSWORD:?Set MINIO_ROOT_PASSWORD in your .env}"
assert milvus_env["MINIO_ACCESS_KEY_ID"] == "${MINIO_ROOT_USER:?Set MINIO_ROOT_USER in your .env}"
assert milvus_env["MINIO_SECRET_ACCESS_KEY"] == "${MINIO_ROOT_PASSWORD:?Set MINIO_ROOT_PASSWORD in your .env}"
assert "MINIO_ROOT_USER" not in minio_env
assert "MINIO_ROOT_PASSWORD" not in minio_env
assert "MINIO_ACCESS_KEY" in default_env_values
assert "MINIO_SECRET_KEY" in default_env_values
assert minio_env["MINIO_ACCESS_KEY"] == "${MINIO_ACCESS_KEY:?Set MINIO_ACCESS_KEY in your .env}"
assert minio_env["MINIO_SECRET_KEY"] == "${MINIO_SECRET_KEY:?Set MINIO_SECRET_KEY in your .env}"
assert milvus_env["MINIO_ACCESS_KEY_ID"] == minio_env["MINIO_ACCESS_KEY"]
assert milvus_env["MINIO_SECRET_ACCESS_KEY"] == minio_env["MINIO_SECRET_KEY"]


def test_ollama_cpu_milvus_uses_matching_minio_credentials() -> None:
Expand Down
Loading