Skip to content

orchestratord: revert the dead MinIO image rewrite in documentation-defaults #38939

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

Open
bosconi wants to merge 1 commit into
base: main
Choose a base branch
from
+0 −27
Open

orchestratord: revert the dead MinIO image rewrite in documentation-defaults #38939

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
27 changes: 0 additions & 27 deletions test/orchestratord/mzcompose.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import json
import os
import random
import re
import shutil
import signal
import subprocess
Expand Down Expand Up @@ -771,18 +770,6 @@ def check() -> None:
retry(check, 240)


def _minio_image() -> str:
"""The MinIO image the current tree's manifest uses, read from the file so the
two cannot drift."""
manifest = MZ_ROOT / "misc" / "helm-charts" / "testing" / "minio.yaml"
for line in manifest.read_text().splitlines():
if line.strip().startswith("image:"):
return line.split("image:", 1)[1].strip()
raise ValueError(f"no image line in {manifest}")


MINIO_IMAGE = _minio_image()

# Must match test/orchestratord/priorityclass.yaml.
PRIORITY_CLASS_NAME = "mz-test-priority"
PRIORITY_CLASS_VALUE = 1000000000
Expand Down Expand Up @@ -2388,20 +2375,6 @@ def workflow_documentation_defaults(
shutil.copyfile(path, os.path.join(dir, file))
else:
content = download_repo_file_at_tag(path, str(version))
if file == "sample-minio.yaml":
# Every released tag's manifest still says `image:
# minio/minio`, which resolves to docker.io, where MinIO
# deleted the repository (#38802, #38824). The published
# files cannot be changed, so point the downloaded copy at
# the image the current tree uses. Everything else in the
# manifest is exercised as published.
content = re.sub(
rb"^(\s*image:\s*)minio/minio\s*$",
rb"\g<1>" + MINIO_IMAGE.encode(),
content,
count=1,
flags=re.MULTILINE,
)
with open(os.path.join(dir, file), "wb") as f:
f.write(content)

Expand Down
Loading