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 #14049 from brendandburns/apiserver2

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-09-17 12:32:26 -07:00
commit 3b221fb074
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
api/swagger-spec/v1.json
View File

@ -3095,7 +3095,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -3125,7 +3125,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -3155,7 +3155,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -3185,7 +3185,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -3215,7 +3215,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -3245,7 +3245,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -5128,7 +5128,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -5166,7 +5166,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -5204,7 +5204,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -5242,7 +5242,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -5280,7 +5280,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -5318,7 +5318,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -6432,7 +6432,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -6478,7 +6478,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -6524,7 +6524,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -6570,7 +6570,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -6616,7 +6616,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -6662,7 +6662,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -10426,7 +10426,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -10464,7 +10464,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -10502,7 +10502,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -10540,7 +10540,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -10578,7 +10578,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false
@ -10616,7 +10616,7 @@
{ {
"type": "string", "type": "string",
"paramType": "path", "paramType": "path",
"name": "path:*", "name": "path",
"description": "path to the resource", "description": "path to the resource",
"required": true, "required": true,
"allowMultiple": false "allowMultiple": false

2
pkg/apiserver/api_installer.go
View File

@ -258,7 +258,7 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag
allowWatchList := isWatcher && isLister // watching on lists is allowed only for kinds that support both watch and list. allowWatchList := isWatcher && isLister // watching on lists is allowed only for kinds that support both watch and list.
scope := mapping.Scope scope := mapping.Scope
nameParam := ws.PathParameter("name", "name of the "+kind).DataType("string") nameParam := ws.PathParameter("name", "name of the "+kind).DataType("string")
pathParam := ws.PathParameter("path:*", "path to the resource").DataType("string") pathParam := ws.PathParameter("path", "path to the resource").DataType("string")
params := []*restful.Parameter{} params := []*restful.Parameter{}
actions := []action{} actions := []action{}