Merge pull request #40909 from caesarxuchao/no-vendor-apimachinery

Automatic merge from submit-queue (batch tested with PRs 40862, 40909)

Remove apimachinery from staging client-go/Godeps/Godeps.json

The publishing robot will add the latest version of apimachinery to Godeps.json.

This is part of the effort to allow update staging apimachinery and staging client-go in a same PR.

The robot change is here: kubernetes/test-infra#1784

@deads2k @stts @lavalamp

staging/godeps-json-updater.go

@@ -43,12 +43,13 @@ type Godeps struct {
 	Deps         []Dependency
 }
 
-// rewrites the Godeps.ImportPath, removes the Deps whose ImportPath contains "k8s.io/kubernetes"
+// rewrites the Godeps.ImportPath, removes the Deps whose ImportPath contains "k8s.io/kubernetes" or "k8s.io/apimachinery".
+// entries for k8s.io/apimahinery will be written by the publishing robot before publishing to the repository.
 func main() {
 	flag.Parse()
 	var g Godeps
 	if len(*godepsFile) == 0 {
-		log.Fatalf("absolute ath to Godeps.json is required")
+		log.Fatalf("absolute path to Godeps.json is required")
 	}
 	if len(*clientRepoImportPath) == 0 {
 		log.Fatalf("import path to a version of client-go is required")
@@ -67,6 +68,9 @@ func main() {
 	// removes the Deps whose ImportPath contains "k8s.io/kubernetes"
 	i := 0
 	for _, dep := range g.Deps {
+		if strings.Contains(dep.ImportPath, "k8s.io/apimachinery") {
+			continue
+		}
 		if strings.Contains(dep.ImportPath, "k8s.io/kubernetes") {
 			continue
 		}