Skip to content

Commit e937d28

Browse files
authored
Merge pull request #7122 from killianmuldoon/clean/remove-third-party-refs
🌱 Remove references to third_party directory
2 parents e3a017a + 1d14182 commit e937d28

File tree

5 files changed

+3
-11
lines changed

5 files changed

+3
-11
lines changed

.golangci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,4 @@ run:
274274
skip-files:
275275
- "zz_generated.*\\.go$"
276276
- "vendored_openapi\\.go$"
277-
skip-dirs:
278-
- third_party
279277
allow-parallel-runners: true

Tiltfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ providers = {
5555
"exp",
5656
"feature",
5757
"internal",
58-
"third_party",
5958
"util",
6059
"webhooks",
6160
],

docs/book/src/developer/repository-layout.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ cluster-api
2121
└───logos
2222
└───scripts
2323
└───test
24-
└───third_party
2524
└───util
2625
└───version
2726
└───webhooks
@@ -116,10 +115,6 @@ This folder has scripts used for building, testing and developer workflow.
116115

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

119-
[~/third_party](https://github.com/kubernetes-sigs/cluster-api/tree/main/third_party)
120-
121-
This folder is used to copy code from other projects in-tree.
122-
123118
### Util, Feature and Errors
124119

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

hack/boilerplate/boilerplate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def file_passes(filename, refs, regexs):
150150
def file_extension(filename):
151151
return os.path.splitext(filename)[1].split(".")[-1].lower()
152152

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

hack/verify-shellcheck.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ fi
6464

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

0 commit comments

Comments
 (0)