From 13f72310c4038214a6f95781d1212332045a5fb6 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Thu, 2 Feb 2017 00:11:52 -0800 Subject: [PATCH] remove apimachinery from client-go/Godeps/Godeps.json; the publishing robot will add the latest version of apimachinery to Godeps.json. --- staging/godeps-json-updater.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/staging/godeps-json-updater.go b/staging/godeps-json-updater.go index 7f8fbe985d321..9b87dc93a4788 100644 --- 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 }