Skip to content

K
k3s
Commit 3b221fb0 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #14049 from brendandburns/apiserver2

Auto commit by PR queue bot
parents 7cee0284 3153c25a
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
api/swagger-spec/v1.json
View file @ 3b221fb0
...@@ -3095,7 +3095,7 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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
......
pkg/apiserver/api_installer.go
View file @ 3b221fb0
...@@ -258,7 +258,7 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag ...@@ -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{}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment