Fix API sync to exclude monorepo-only files and preserve Makefile#180
Merged
caseydavenport merged 5 commits intomasterfrom Mar 3, 2026
Merged
Conversation
caseydavenport
force-pushed
the
casey/fix-api-sync-exclude-monorepo-dirs
branch
from
c2ef204 to
e29a071
Compare
The upstream calico/api directory now has config/, admission/, and patches/ dirs that are monorepo-only, and bgpfilter_test.go requires a kind cluster. The blanket cp -r was copying them into the standalone repo, creating noisy PR diffs and breaking CI. Add cleanup in pull-upstream-changes for monorepo-only dirs and files, and add Makefile to KEEP_LOCAL_FILES so the standalone version isn't overwritten.
caseydavenport
force-pushed
the
casey/fix-api-sync-exclude-monorepo-dirs
branch
from
e29a071 to
fdb9b65
Compare
This reverts commit ff8d891.
This reverts commit 1b5b104.
Restores the standalone ut target (no kind cluster dependency), removes CALICO_API_GROUP and KIND_CONFIG vars, removes CRD generation steps from gen-files. Adds deepcopy-gen for usage.tigera.io/v1 which is a new API type that needs to be generated standalone.
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
2 participants
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.
Same fix as projectcalico/api#117.
The upstream calico/api directory now has
config/,admission/, andpatches/directories that are monorepo-only. The blanket
cp -rwas copying them into thestandalone repo, and the upstream
Makefilenow requires kind forut, breakingCI.
Two fixes in
Makefile.local:rm -rf config/ admission/ patches/after thecp -rMakefiletoKEEP_LOCAL_FILES