From 1d141820acb8ef83b285e9475fc6b6937ecf4ed9 Mon Sep 17 00:00:00 2001
From: killianmuldoon <kmuldoon@vmware.com>
Date: Thu, 25 Aug 2022 10:48:03 +0100
Subject: [PATCH] Remove references to third_party directory

Signed-off-by: killianmuldoon <kmuldoon@vmware.com>
---
 .golangci.yml                                | 2 --
 Tiltfile                                     | 1 -
 docs/book/src/developer/repository-layout.md | 5 -----
 hack/boilerplate/boilerplate.py              | 2 +-
 hack/verify-shellcheck.sh                    | 4 ++--
 5 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 0973f7b03a8e..4f7b602dc059 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -274,6 +274,4 @@ run:
   skip-files:
   - "zz_generated.*\\.go$"
   - "vendored_openapi\\.go$"
-  skip-dirs:
-  - third_party
   allow-parallel-runners: true
diff --git a/Tiltfile b/Tiltfile
index a9a700bead92..4e58b51e906a 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -55,7 +55,6 @@ providers = {
             "exp",
             "feature",
             "internal",
-            "third_party",
             "util",
             "webhooks",
         ],
diff --git a/docs/book/src/developer/repository-layout.md b/docs/book/src/developer/repository-layout.md
index 12efa69ec8aa..dc918cef3051 100644
--- a/docs/book/src/developer/repository-layout.md
+++ b/docs/book/src/developer/repository-layout.md
@@ -21,7 +21,6 @@ cluster-api
 └───logos
 └───scripts
 └───test
-└───third_party
 └───util
 └───version
 └───webhooks
@@ -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)
diff --git a/hack/boilerplate/boilerplate.py b/hack/boilerplate/boilerplate.py
index 1af9d03ca5f6..cf5d9ef5548d 100755
--- a/hack/boilerplate/boilerplate.py
+++ b/hack/boilerplate/boilerplate.py
@@ -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"]
 
diff --git a/hack/verify-shellcheck.sh b/hack/verify-shellcheck.sh
index 5920668a2c58..137be70b2f17 100755
--- a/hack/verify-shellcheck.sh
+++ b/hack/verify-shellcheck.sh
@@ -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"