Skip to content
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.

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

🌱 Remove references to third_party directory #7122

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,4 @@ run:
skip-files:
- "zz_generated.*\\.go$"
- "vendored_openapi\\.go$"
skip-dirs:
- third_party
allow-parallel-runners: true
1 change: 0 additions & 1 deletion Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ providers = {
"exp",
"feature",
"internal",
"third_party",
"util",
"webhooks",
],
Expand Down
5 changes: 0 additions & 5 deletions docs/book/src/developer/repository-layout.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ cluster-api
└───logos
└───scripts
└───test
└───third_party
└───util
└───version
└───webhooks
Expand Down Expand Up @@ -116,10 +115,6 @@ This folder has scripts used for building, testing and developer workflow.

This folder consists of CI scripts related to setup, build and e2e tests. These are mostly called by CI jobs.

[~/third_party](https://github.com/kubernetes-sigs/cluster-api/tree/main/third_party)

This folder is used to copy code from other projects in-tree.

### Util, Feature and Errors

[~/util](https://github.com/kubernetes-sigs/cluster-api/tree/main/util)
Expand Down
2 changes: 1 addition & 1 deletion hack/boilerplate/boilerplate.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def file_passes(filename, refs, regexs):
def file_extension(filename):
return os.path.splitext(filename)[1].split(".")[-1].lower()

skipped_dirs = ['third_party', 'tilt_modules', '_gopath', '_output', '.git', 'cluster/env.sh',
skipped_dirs = ['tilt_modules', '_gopath', '_output', '.git', 'cluster/env.sh',
"vendor", "test/e2e/generated/bindata.go", "hack/boilerplate/test",
"staging/src/k8s.io/kubectl/pkg/generated/bindata.go"]

Expand Down
4 changes: 2 additions & 2 deletions hack/verify-shellcheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ fi

echo "Running shellcheck..."
cd "${ROOT_PATH}" || exit
IGNORE_FILES=$(find . -name "*.sh" | grep "third_party\|tilt_modules")
IGNORE_FILES=$(find . -name "*.sh" | grep "tilt_modules")
echo "Ignoring shellcheck on ${IGNORE_FILES}"
FILES=$(find . -name "*.sh" -not -path "./tilt_modules/*" -not -path "*third_party*")
FILES=$(find . -name "*.sh" -not -path "./tilt_modules/*")
while read -r file; do
"$SHELLCHECK" -x "$file" >> "${OUT}" 2>&1
done <<< "$FILES"