Fix gen-files ordering: run openapi-gen before client-gen#123
Merged
caseydavenport merged 1 commit intoprojectcalico:masterfrom Apr 2, 2026
Merged
Conversation
The updated update-client-gen.sh uses hack/openapi-schema/ which imports pkg/openapi. Since clean-generated deletes pkg/openapi, openapi-gen must run first to regenerate it. Also add applyconfiguration_generated to the clean-generated target.
caseydavenport
force-pushed
the
casey-fix-makefile-ordering
branch
from
9f4bc57 to
c332044
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The updated
update-client-gen.sh(synced from the monorepo) now useshack/openapi-schema/which importspkg/openapi. Two things were broken:clean-generateddeletespkg/openapi, soopenapi-genmust run beforeupdate-client-gen.shto regenerate it first. The standalone repo had them in the wrong order (the monorepo already has the correct order).update-client-gen.shapplies patches frompatches/, but the sync was stripping that directory.Also adds
pkg/client/applyconfiguration_generatedto theclean-generatedtarget since the new client-gen script generates it.Fixes the CI failure on #121.