github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2017-02-03 06:48:47 -08:00 committed by GitHub
commit 1271802692
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
staging/godeps-json-updater.go
View File

@ -43,12 +43,13 @@ type Godeps struct {
Deps []Dependency 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() { func main() {
flag.Parse() flag.Parse()
var g Godeps var g Godeps
if len(*godepsFile) == 0 { 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 { if len(*clientRepoImportPath) == 0 {
log.Fatalf("import path to a version of client-go is required") 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" // removes the Deps whose ImportPath contains "k8s.io/kubernetes"
i := 0 i := 0
for _, dep := range g.Deps { for _, dep := range g.Deps {
if strings.Contains(dep.ImportPath, "k8s.io/apimachinery") {
continue
}
if strings.Contains(dep.ImportPath, "k8s.io/kubernetes") { if strings.Contains(dep.ImportPath, "k8s.io/kubernetes") {
continue continue
} }