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 #63626 from roycaihw/release-1.9

Browse Source 
Automatic merge from submit-queue.

Manual cherrypick of kube-openapi changes for release-1.9

**What this PR does / why we need it**:
Cherry-picks https://github.com/kubernetes/kube-openapi/pull/64 and https://github.com/kubernetes/kube-openapi/pull/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 @mbohlool
/sig api-machinery

Kubernetes-commit: 8d48604c2eca912159636be258a5e68bfc4c6643
This commit is contained in:
Kubernetes Publisher
2018-05-10 02:11:39 -07:00
parent 9d60f698b8 666c7f735a
commit 77833cd56b
2 changed files with 191 additions and 191 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": [
"./..."
],
@@ -252,11 +252,11 @@
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/common",
"Rev": "39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1"
"Rev": "7ee50c0aa8059d610950c952a9ed7a5e33ab336a"
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/generators",
"Rev": "39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1"
"Rev": "7ee50c0aa8059d610950c952a9ed7a5e33ab336a"
}
]
}