Skip to content

Add wait for minio pod and update images to multi-arch #643

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
lugi0 merged 2 commits into from
Sep 26, 2025
Merged

Add wait for minio pod and update images to multi-arch #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0006a88
Add wait for minio pod and update images to multi-arch
dbasunag Sep 25, 2025
a6c547d
Merge branch 'main' into multi_arch
lugi0 Sep 26, 2025
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
1 change: 1 addition & 0 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,7 @@ def minio_pod(
label=pod_labels,
annotations=request.param.get("annotations"),
) as minio_pod:
minio_pod.wait_for_status(status=Pod.Status.RUNNING)
yield minio_pod


Expand Down
2 changes: 1 addition & 1 deletion tests/model_registry/async_job/test_async_upload_e2e.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"minio_pod, oci_registry_pod_with_minio",
[
pytest.param(
MinIo.PodConfig.MODEL_MESH_MINIO_CONFIG,
MinIo.PodConfig.MODEL_REGISTRY_MINIO_CONFIG,
OCIRegistry.PodConfig.REGISTRY_BASE_CONFIG,
)
],
Expand Down
17 changes: 13 additions & 4 deletions utilities/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ class Metadata:
DEFAULT_HTTP_ADDRESS: str = "0.0.0.0"

class PodConfig:
REGISTRY_IMAGE: str = "ghcr.io/project-zot/zot-linux-amd64:v2.1.7"
REGISTRY_IMAGE: str = "ghcr.io/project-zot/zot:v2.1.8"
REGISTRY_BASE_CONFIG: dict[str, Any] = {
"args": None,
"labels": {
Expand Down Expand Up @@ -291,9 +291,7 @@ class PodConfig:
"quay.io/jooholee/model-minio@sha256:b9554be19a223830cf792d5de984ccc57fc140b954949f5ffc6560fab977ca7a"
# noqa: E501
)

MINIO_BASE_CONFIG: dict[str, Any] = {
"args": ["server", "/data1"],
MINIO_BASE_LABELS_ANNOTATIONS: dict[str, Any] = {
"labels": {
"maistra.io/expose-route": "true",
},
Expand All @@ -302,6 +300,11 @@ class PodConfig:
},
}

MINIO_BASE_CONFIG: dict[str, Any] = {
"args": ["server", "/data1"],
**MINIO_BASE_LABELS_ANNOTATIONS,
}

MODEL_MESH_MINIO_CONFIG: dict[str, Any] = {
"image": "quay.io/trustyai_testing/modelmesh-minio-examples@"
"sha256:d2ccbe92abf9aa5085b594b2cae6c65de2bf06306c30ff5207956eb949bb49da",
Expand All @@ -328,6 +331,12 @@ class PodConfig:
**MINIO_BASE_CONFIG,
}

MODEL_REGISTRY_MINIO_CONFIG: dict[str, Any] = {
"image": "quay.io/minio/minio@sha256:14cea493d9a34af32f524e538b8346cf79f3321eff8e708c1e2960462bd8936e",
"args": ["server", "/data"],
**MINIO_BASE_LABELS_ANNOTATIONS,
}

class RunTimeConfig:
# TODO: Remove runtime_image once ovms/loan_model_alpha model works with latest ovms
IMAGE = "quay.io/opendatahub/openvino_model_server@sha256:564664371d3a21b9e732a5c1b4b40bacad714a5144c0a9aaf675baec4a04b148" # noqa: E501
Expand Down