Skip to content

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

Open
bosconi wants to merge 1 commit into
MaterializeInc:mainfrom
bosconi:jc/revert-38908-minio-image-rewrite
Open

bosconi wants to merge 1 commit into
MaterializeInc:mainfrom
bosconi:jc/revert-38908-minio-image-rewrite

Conversation

@bosconi

@bosconi bosconi commented Sep 19, 2026

Copy link
Copy Markdown
Member

Motivation

#38918 and #38908 both fixed the Orchestratord + documentation defaults nightly failure caused by MinIO deleting its Docker Hub repository, and they took opposite approaches. #38918 stopped downloading the published sample-minio.yaml and always applies the in-tree manifest. #38908 kept downloading it and rewrote its image: line to the image the current tree uses.

#38918 merged first (0d4867fce5, 19:01 UTC). #38908 was written against the earlier tree and merged fifteen minutes later without a rebase (b74fff0dd7), so both are on main and only #38918's has any effect: files no longer contains sample-minio.yaml, so the if file == "sample-minio.yaml" branch can never match, and the regex and the import-time MINIO_IMAGE read are dead code. Two comments in the same loop body also give opposite answers about whether released-version iterations exercise the published manifest.

Description

Reverts b74fff0dd7 (#38908), leaving #38918's approach as the fix. This removes the dead branch, the MINIO_IMAGE helper and its import-time read of misc/helm-charts/testing/minio.yaml, and the re import that only the dead branch used. The import-time read is worth removing on its own: test/orchestratord/mzcompose.py is imported during pipeline generation, so a future change to the manifest's shape would have failed the whole composition for no benefit.

If exercising the published manifest with only its image repointed turns out to be the behavior we want, that is a deliberate reversal of #38918 to make with its author, not something to leave half-present on main.

Verification

Existing test; both shards of Orchestratord + documentation defaults in nightly run it, and the workflow's behavior is unchanged from what #38918 established. Loading the composition from test/orchestratord with ../../bin/mzcompose list-workflows still succeeds.

Surfaced by the post-merge QA review on #38908.

🤖 Generated with Claude Code

…efaults

This reverts commit b74fff0 (MaterializeInc#38908).

MaterializeInc#38918 landed fifteen minutes before MaterializeInc#38908 and fixed the same nightly
failure by no longer downloading the published MinIO manifest at all:
sample-minio.yaml is always copied from the in-tree file. MaterializeInc#38908 was written
against the earlier tree and merged without a rebase, so its branch on
`file == "sample-minio.yaml"` can never match, and the regex and the
import-time `MINIO_IMAGE` read are dead code. Two comments in the same loop
also disagreed about whether released-version iterations exercise the
published manifest.

Removing the dead hunks leaves MaterializeInc#38918's approach as the fix and drops an
import-time file read whose only failure mode would have been breaking
pipeline generation for nothing.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant