github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 04:06:03 +00:00
Code Issues Projects Releases Wiki Activity

generated

Browse Source
This commit is contained in:
Haowei Cai 2018-05-08 17:27:17 -07:00
parent 707c38cb51
commit 18fd392c13
9 changed files with 48 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json generated
View File

@ -2008,23 +2008,23 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/builder", "ImportPath": "k8s.io/kube-openapi/pkg/builder",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/common", "ImportPath": "k8s.io/kube-openapi/pkg/common",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/handler", "ImportPath": "k8s.io/kube-openapi/pkg/handler",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util", "ImportPath": "k8s.io/kube-openapi/pkg/util",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/equality", "ImportPath": "k8s.io/apimachinery/pkg/api/equality",

2
staging/src/k8s.io/apimachinery/Godeps/Godeps.json generated
View File

@ -180,7 +180,7 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
} }
] ]
} }

10
staging/src/k8s.io/apiserver/Godeps/Godeps.json generated
View File

@ -1736,23 +1736,23 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/builder", "ImportPath": "k8s.io/kube-openapi/pkg/builder",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/common", "ImportPath": "k8s.io/kube-openapi/pkg/common",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/handler", "ImportPath": "k8s.io/kube-openapi/pkg/handler",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util", "ImportPath": "k8s.io/kube-openapi/pkg/util",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
}, },
{ {
"ImportPath": "k8s.io/client-go/discovery", "ImportPath": "k8s.io/client-go/discovery",

2
staging/src/k8s.io/client-go/Godeps/Godeps.json generated
View File

@ -580,7 +580,7 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
} }
] ]
} }

4
staging/src/k8s.io/code-generator/Godeps/Godeps.json generated
View File

@ -260,11 +260,11 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/common", "ImportPath": "k8s.io/kube-openapi/pkg/common",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/generators", "ImportPath": "k8s.io/kube-openapi/pkg/generators",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
} }
] ]
} }

12
staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json generated
View File

@ -1652,27 +1652,27 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/aggregator", "ImportPath": "k8s.io/kube-openapi/pkg/aggregator",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/builder", "ImportPath": "k8s.io/kube-openapi/pkg/builder",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/common", "ImportPath": "k8s.io/kube-openapi/pkg/common",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/handler", "ImportPath": "k8s.io/kube-openapi/pkg/handler",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util", "ImportPath": "k8s.io/kube-openapi/pkg/util",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
} }
] ]
} }

10
staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json generated
View File

@ -1616,23 +1616,23 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/builder", "ImportPath": "k8s.io/kube-openapi/pkg/builder",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/common", "ImportPath": "k8s.io/kube-openapi/pkg/common",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/handler", "ImportPath": "k8s.io/kube-openapi/pkg/handler",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util", "ImportPath": "k8s.io/kube-openapi/pkg/util",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
} }
] ]
} }

2
staging/src/k8s.io/sample-controller/Godeps/Godeps.json generated
View File

@ -916,7 +916,7 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "f08db293d3ef80052d6513ece19792642a289fea" "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7"
} }
] ]
} }

22
vendor/k8s.io/kube-openapi/pkg/aggregator/aggregator.go generated vendored
View File

@ -61,6 +61,10 @@ func (s *referenceWalker) walkRef(ref spec.Ref) spec.Ref {
k := refStr[len(definitionPrefix):] k := refStr[len(definitionPrefix):]
def := s.root.Definitions[k] def := s.root.Definitions[k]
s.walkSchema(&def) s.walkSchema(&def)
// Make sure we don't assign to nil map
if s.root.Definitions == nil {
s.root.Definitions = spec.Definitions{}
}
s.root.Definitions[k] = def s.root.Definitions[k] = def
} }
return s.walkRefCallback(ref) return s.walkRefCallback(ref)
@ -147,6 +151,9 @@ func (s *referenceWalker) walkOperation(op *spec.Operation) {
} }
func (s *referenceWalker) Start() { func (s *referenceWalker) Start() {
if s.root.Paths == nil {
return
}
for _, pathItem := range s.root.Paths.Paths { for _, pathItem := range s.root.Paths.Paths {
s.walkParams(pathItem.Parameters) s.walkParams(pathItem.Parameters)
s.walkOperation(pathItem.Delete) s.walkOperation(pathItem.Delete)
@ -220,6 +227,10 @@ func renameDefinition(s *spec.Swagger, old, new string) {
} }
return ref return ref
}, s) }, s)
// Make sure we don't assign to nil map
if s.Definitions == nil {
s.Definitions = spec.Definitions{}
}
s.Definitions[new] = s.Definitions[old] s.Definitions[new] = s.Definitions[old]
delete(s.Definitions, old) delete(s.Definitions, old)
} }
@ -244,6 +255,13 @@ func MergeSpecs(dest, source *spec.Swagger) error {
func mergeSpecs(dest, source *spec.Swagger, renameModelConflicts, ignorePathConflicts bool) (err error) { func mergeSpecs(dest, source *spec.Swagger, renameModelConflicts, ignorePathConflicts bool) (err error) {
specCloned := false specCloned := false
// Paths may be empty, due to [ACL constraints](http://goo.gl/8us55a#securityFiltering).
if source.Paths == nil {
source.Paths = &spec.Paths{}
}
if dest.Paths == nil {
dest.Paths = &spec.Paths{}
}
if ignorePathConflicts { if ignorePathConflicts {
keepPaths := []string{} keepPaths := []string{}
hasConflictingPath := false hasConflictingPath := false
@ -346,6 +364,10 @@ func mergeSpecs(dest, source *spec.Swagger, renameModelConflicts, ignorePathConf
if _, found := dest.Paths.Paths[k]; found { if _, found := dest.Paths.Paths[k]; found {
return fmt.Errorf("unable to merge: duplicated path %s", k) return fmt.Errorf("unable to merge: duplicated path %s", k)
} }
// PathItem may be empty, due to [ACL constraints](http://goo.gl/8us55a#securityFiltering).
if dest.Paths.Paths == nil {
dest.Paths.Paths = map[string]spec.PathItem{}
}
dest.Paths.Paths[k] = v dest.Paths.Paths[k] = v
} }
return nil return nil