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: https://github.com/kubernetes/test-infra/pull/1784 @deads2k @stts @lavalamp

Merge pull request #40909 from caesarxuchao/no-vendor-apimachinery
12718026 · Kubernetes Submit Queue · GitHub · 49de5f50 · 13f72310 · 12718026
Commit 12718026 authored Feb 03, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

godeps-json-updater.go staging/godeps-json-updater.go +6 -2

No files found.
--- a/staging/godeps-json-updater.go
+++ b/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
 		}