Merge pull request #76153 from liggitt/update-vendor-cleanup

Update vendor cleanup

go.mod

@@ -1,4 +1,4 @@
-// This is a generated file.
+// This is a generated file. Do not edit directly.
 // Run hack/pin-dependency.sh to change pinned dependency versions.
 // Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 

hack/update-vendor.sh

@@ -232,6 +232,14 @@ for repo in $(tsort "${TMP_DIR}/tidy_deps.txt"); do
   pushd "${KUBE_ROOT}/staging/src/${repo}" >/dev/null 2>&1
     echo "=== tidying ${repo}" >> "${LOG_FILE}"
     go mod tidy >>"${LOG_FILE}" 2>&1
+
+    # disallow transitive dependencies on k8s.io/kubernetes
+    loopback_deps="$(go list all 2>/dev/null | grep k8s.io/kubernetes/ || true)"
+    if [[ ! -z "${loopback_deps}" ]]; then
+      kube::log::error "Disallowed ${repo} -> k8s.io/kubernetes dependencies exist via the following imports:
+$(go mod why ${loopback_deps})"
+      exit 1
+    fi
   popd >/dev/null 2>&1
 done
 echo "=== tidying root" >> "${LOG_FILE}"
@@ -241,17 +249,13 @@ go mod tidy >>"${LOG_FILE}" 2>&1
 # Phase 6: add generated comments to go.mod files
 kube::log::status "go.mod: adding generated comments"
 add_generated_comments "
-// This is a generated file.
+// This is a generated file. Do not edit directly.
 // Run hack/pin-dependency.sh to change pinned dependency versions.
 // Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 "
 for repo in $(ls staging/src/k8s.io | sort); do
   pushd "staging/src/k8s.io/${repo}" >/dev/null 2>&1
-    add_generated_comments "
+    add_generated_comments "// This is a generated file. Do not edit directly."
-// This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
-"
   popd >/dev/null 2>&1
 done
 

staging/src/k8s.io/api/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/api
 

staging/src/k8s.io/apiextensions-apiserver/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/apiextensions-apiserver
 

staging/src/k8s.io/apimachinery/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/apimachinery
 

staging/src/k8s.io/apiserver/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/apiserver
 

staging/src/k8s.io/cli-runtime/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/cli-runtime
 

staging/src/k8s.io/client-go/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/client-go
 

staging/src/k8s.io/cloud-provider/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/cloud-provider
 

staging/src/k8s.io/cluster-bootstrap/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/cluster-bootstrap
 

staging/src/k8s.io/code-generator/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/code-generator
 

staging/src/k8s.io/component-base/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/component-base
 

staging/src/k8s.io/cri-api/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/cri-api
 

staging/src/k8s.io/csi-translation-lib/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/csi-translation-lib
 

staging/src/k8s.io/kube-aggregator/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/kube-aggregator
 

staging/src/k8s.io/kube-controller-manager/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/kube-controller-manager
 

staging/src/k8s.io/kube-proxy/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/kube-proxy
 

staging/src/k8s.io/kube-scheduler/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/kube-scheduler
 

staging/src/k8s.io/kubelet/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/kubelet
 

staging/src/k8s.io/metrics/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/metrics
 

staging/src/k8s.io/node-api/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/node-api
 

staging/src/k8s.io/sample-apiserver/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/sample-apiserver
 

staging/src/k8s.io/sample-cli-plugin/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/sample-cli-plugin
 

staging/src/k8s.io/sample-controller/go.mod

@@ -1,6 +1,4 @@
 // This is a generated file. Do not edit directly.
-// Run hack/pin-dependency.sh to change pinned dependency versions.
-// Run hack/update-vendor.sh to update go.mod files and the vendor directory.
 
 module k8s.io/sample-controller