Update go dependencies to v1.17.0
This commit is contained in:
parent
67dce30ba6
commit
75c3c47f81
516 changed files with 48300 additions and 15154 deletions
10
vendor/k8s.io/kube-openapi/pkg/generators/extension.go
generated
vendored
10
vendor/k8s.io/kube-openapi/pkg/generators/extension.go
generated
vendored
|
|
@ -32,6 +32,7 @@ type extensionAttributes struct {
|
|||
xName string
|
||||
kind types.Kind
|
||||
allowedValues sets.String
|
||||
enforceArray bool
|
||||
}
|
||||
|
||||
// Extension tag to openapi extension attributes
|
||||
|
|
@ -46,8 +47,9 @@ var tagToExtension = map[string]extensionAttributes{
|
|||
allowedValues: sets.NewString("merge", "retainKeys"),
|
||||
},
|
||||
"listMapKey": {
|
||||
xName: "x-kubernetes-list-map-keys",
|
||||
kind: types.Slice,
|
||||
xName: "x-kubernetes-list-map-keys",
|
||||
kind: types.Slice,
|
||||
enforceArray: true,
|
||||
},
|
||||
"listType": {
|
||||
xName: "x-kubernetes-list-type",
|
||||
|
|
@ -113,6 +115,10 @@ func (e extension) hasMultipleValues() bool {
|
|||
return len(e.values) > 1
|
||||
}
|
||||
|
||||
func (e extension) isAlwaysArrayFormat() bool {
|
||||
return tagToExtension[e.idlTag].enforceArray
|
||||
}
|
||||
|
||||
// Returns sorted list of map keys. Needed for deterministic testing.
|
||||
func sortedMapKeys(m map[string][]string) []string {
|
||||
keys := make([]string, len(m))
|
||||
|
|
|
|||
4
vendor/k8s.io/kube-openapi/pkg/generators/openapi.go
generated
vendored
4
vendor/k8s.io/kube-openapi/pkg/generators/openapi.go
generated
vendored
|
|
@ -473,13 +473,13 @@ func (g openAPITypeWriter) emitExtensions(extensions []extension, unions []union
|
|||
g.Do("VendorExtensible: spec.VendorExtensible{\nExtensions: spec.Extensions{\n", nil)
|
||||
for _, extension := range extensions {
|
||||
g.Do("\"$.$\": ", extension.xName)
|
||||
if extension.hasMultipleValues() {
|
||||
if extension.hasMultipleValues() || extension.isAlwaysArrayFormat() {
|
||||
g.Do("[]interface{}{\n", nil)
|
||||
}
|
||||
for _, value := range extension.values {
|
||||
g.Do("\"$.$\",\n", value)
|
||||
}
|
||||
if extension.hasMultipleValues() {
|
||||
if extension.hasMultipleValues() || extension.isAlwaysArrayFormat() {
|
||||
g.Do("},\n", nil)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue