github/sample-controller
4
0
Fork 0
mirror of https://github.com/kubernetes/sample-controller.git synced 2026-04-12 00:00:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #63627 from roycaihw/release-1.10

Browse Source 
Automatic merge from submit-queue.

Manual cherrypick of kube-openapi changes for release-1.10

**What this PR does / why we need it**:
Cherry-picks kubernetes/kube-openapi#64 and kubernetes/kube-openapi#67
Fixes bugs that make apiserver panic when aggregating valid but not well formed OpenAPI spec (with empty `Paths`/`Definitions`)

**Release note**:

```release-note
Fixes bugs that make apiserver panic when aggregating valid but not well formed OpenAPI spec
```

/cc @MaciekPytel
/sig api-machinery

Kubernetes-commit: 42b63c8b19d1ad96399ec3f5a409da67e2fd19bd
This commit is contained in:
Kubernetes Publisher
2018-05-15 07:46:02 -07:00
parent e17af2c44c 7db0ad7e48
commit c8c875a7f5
15 changed files with 1120 additions and 998 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/k8s.io/code-generator/Godeps/Godeps.json
Generated Vendored
+3 -3
View File
@@ -1,7 +1,7 @@
{
"ImportPath": "k8s.io/code-generator",
"GoVersion": "go1.9",
"GodepVersion": "v79",
"GodepVersion": "v80",
"Packages": [
"./..."
],
@@ -260,11 +260,11 @@
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/common",
"Rev": "50ae88d24ede7b8bad68e23c805b5d3da5c8abaf"
"Rev": "39cb288412c48cb533ba4be5d6c28620b9a0c1b4"
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/generators",
"Rev": "50ae88d24ede7b8bad68e23c805b5d3da5c8abaf"
"Rev": "39cb288412c48cb533ba4be5d6c28620b9a0c1b4"
}
]
}