Skip to content

K
k3s
Commit 21ee9f20 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #41421 from liggitt/patch-proxy

Automatic merge from submit-queue Support PATCH operation in root proxy Not sure if we want to continue to expand the root proxy capabilities, but if we do, this fixes #40383
parents eb755a33 e9a1eb4c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 351 additions and 0 deletions
api/openapi-spec/swagger.json
View file @ 21ee9f20
...@@ -9717,6 +9717,33 @@ ...@@ -9717,6 +9717,33 @@
} }
} }
}, },
"patch": {
"description": "proxy PATCH requests to Pod",
"consumes": [
"*/*"
],
"produces": [
"*/*"
],
"schemes": [
"https"
],
"tags": [
"core_v1"
],
"operationId": "proxyCoreV1PATCHNamespacedPod",
"responses": {
"200": {
"description": "OK",
"schema": {
"type": "string"
}
},
"401": {
"description": "Unauthorized"
}
}
},
"parameters": [ "parameters": [
{ {
"uniqueItems": true, "uniqueItems": true,
...@@ -9899,6 +9926,33 @@ ...@@ -9899,6 +9926,33 @@
} }
} }
}, },
"patch": {
"description": "proxy PATCH requests to Pod",
"consumes": [
"*/*"
],
"produces": [
"*/*"
],
"schemes": [
"https"
],
"tags": [
"core_v1"
],
"operationId": "proxyCoreV1PATCHNamespacedPodWithPath",
"responses": {
"200": {
"description": "OK",
"schema": {
"type": "string"
}
},
"401": {
"description": "Unauthorized"
}
}
},
"parameters": [ "parameters": [
{ {
"uniqueItems": true, "uniqueItems": true,
...@@ -10089,6 +10143,33 @@ ...@@ -10089,6 +10143,33 @@
} }
} }
}, },
"patch": {
"description": "proxy PATCH requests to Service",
"consumes": [
"*/*"
],
"produces": [
"*/*"
],
"schemes": [
"https"
],
"tags": [
"core_v1"
],
"operationId": "proxyCoreV1PATCHNamespacedService",
"responses": {
"200": {
"description": "OK",
"schema": {
"type": "string"
}
},
"401": {
"description": "Unauthorized"
}
}
},
"parameters": [ "parameters": [
{ {
"uniqueItems": true, "uniqueItems": true,
...@@ -10271,6 +10352,33 @@ ...@@ -10271,6 +10352,33 @@
} }
} }
}, },
"patch": {
"description": "proxy PATCH requests to Service",
"consumes": [
"*/*"
],
"produces": [
"*/*"
],
"schemes": [
"https"
],
"tags": [
"core_v1"
],
"operationId": "proxyCoreV1PATCHNamespacedServiceWithPath",
"responses": {
"200": {
"description": "OK",
"schema": {
"type": "string"
}
},
"401": {
"description": "Unauthorized"
}
}
},
"parameters": [ "parameters": [
{ {
"uniqueItems": true, "uniqueItems": true,
...@@ -10461,6 +10569,33 @@ ...@@ -10461,6 +10569,33 @@
} }
} }
}, },
"patch": {
"description": "proxy PATCH requests to Node",
"consumes": [
"*/*"
],
"produces": [
"*/*"
],
"schemes": [
"https"
],
"tags": [
"core_v1"
],
"operationId": "proxyCoreV1PATCHNode",
"responses": {
"200": {
"description": "OK",
"schema": {
"type": "string"
}
},
"401": {
"description": "Unauthorized"
}
}
},
"parameters": [ "parameters": [
{ {
"uniqueItems": true, "uniqueItems": true,
...@@ -10635,6 +10770,33 @@ ...@@ -10635,6 +10770,33 @@
} }
} }
}, },
"patch": {
"description": "proxy PATCH requests to Node",
"consumes": [
"*/*"
],
"produces": [
"*/*"
],
"schemes": [
"https"
],
"tags": [
"core_v1"
],
"operationId": "proxyCoreV1PATCHNodeWithPath",
"responses": {
"200": {
"description": "OK",
"schema": {
"type": "string"
}
},
"401": {
"description": "Unauthorized"
}
}
},
"parameters": [ "parameters": [
{ {
"uniqueItems": true, "uniqueItems": true,
api/swagger-spec/v1.json
View file @ 21ee9f20
...@@ -4845,6 +4845,36 @@ ...@@ -4845,6 +4845,36 @@
}, },
{ {
"type": "string", "type": "string",
"method": "PATCH",
"summary": "proxy PATCH requests to Node",
"nickname": "proxyPATCHNodeWithPath",
"parameters": [
{
"type": "string",
"paramType": "path",
"name": "name",
"description": "name of the Node",
"required": true,
"allowMultiple": false
},
{
"type": "string",
"paramType": "path",
"name": "path",
"description": "path to the resource",
"required": true,
"allowMultiple": false
}
],
"produces": [
"*/*"
],
"consumes": [
"*/*"
]
},
{
"type": "string",
"method": "DELETE", "method": "DELETE",
"summary": "proxy DELETE requests to Node", "summary": "proxy DELETE requests to Node",
"nickname": "proxyDELETENodeWithPath", "nickname": "proxyDELETENodeWithPath",
...@@ -5007,6 +5037,28 @@ ...@@ -5007,6 +5037,28 @@
}, },
{ {
"type": "string", "type": "string",
"method": "PATCH",
"summary": "proxy PATCH requests to Node",
"nickname": "proxyPATCHNode",
"parameters": [
{
"type": "string",
"paramType": "path",
"name": "name",
"description": "name of the Node",
"required": true,
"allowMultiple": false
}
],
"produces": [
"*/*"
],
"consumes": [
"*/*"
]
},
{
"type": "string",
"method": "DELETE", "method": "DELETE",
"summary": "proxy DELETE requests to Node", "summary": "proxy DELETE requests to Node",
"nickname": "proxyDELETENode", "nickname": "proxyDELETENode",
...@@ -8087,6 +8139,44 @@ ...@@ -8087,6 +8139,44 @@
}, },
{ {
"type": "string", "type": "string",
"method": "PATCH",
"summary": "proxy PATCH requests to Pod",
"nickname": "proxyPATCHNamespacedPodWithPath",
"parameters": [
{
"type": "string",
"paramType": "path",
"name": "namespace",
"description": "object name and auth scope, such as for teams and projects",
"required": true,
"allowMultiple": false
},
{
"type": "string",
"paramType": "path",
"name": "name",
"description": "name of the Pod",
"required": true,
"allowMultiple": false
},
{
"type": "string",
"paramType": "path",
"name": "path",
"description": "path to the resource",
"required": true,
"allowMultiple": false
}
],
"produces": [
"*/*"
],
"consumes": [
"*/*"
]
},
{
"type": "string",
"method": "DELETE", "method": "DELETE",
"summary": "proxy DELETE requests to Pod", "summary": "proxy DELETE requests to Pod",
"nickname": "proxyDELETENamespacedPodWithPath", "nickname": "proxyDELETENamespacedPodWithPath",
...@@ -8297,6 +8387,36 @@ ...@@ -8297,6 +8387,36 @@
}, },
{ {
"type": "string", "type": "string",
"method": "PATCH",
"summary": "proxy PATCH requests to Pod",
"nickname": "proxyPATCHNamespacedPod",
"parameters": [
{
"type": "string",
"paramType": "path",
"name": "namespace",
"description": "object name and auth scope, such as for teams and projects",
"required": true,
"allowMultiple": false
},
{
"type": "string",
"paramType": "path",
"name": "name",
"description": "name of the Pod",
"required": true,
"allowMultiple": false
}
],
"produces": [
"*/*"
],
"consumes": [
"*/*"
]
},
{
"type": "string",
"method": "DELETE", "method": "DELETE",
"summary": "proxy DELETE requests to Pod", "summary": "proxy DELETE requests to Pod",
"nickname": "proxyDELETENamespacedPod", "nickname": "proxyDELETENamespacedPod",
...@@ -15032,6 +15152,44 @@ ...@@ -15032,6 +15152,44 @@
}, },
{ {
"type": "string", "type": "string",
"method": "PATCH",
"summary": "proxy PATCH requests to Service",
"nickname": "proxyPATCHNamespacedServiceWithPath",
"parameters": [
{
"type": "string",
"paramType": "path",
"name": "namespace",
"description": "object name and auth scope, such as for teams and projects",
"required": true,
"allowMultiple": false
},
{
"type": "string",
"paramType": "path",
"name": "name",
"description": "name of the Service",
"required": true,
"allowMultiple": false
},
{
"type": "string",
"paramType": "path",
"name": "path",
"description": "path to the resource",
"required": true,
"allowMultiple": false
}
],
"produces": [
"*/*"
],
"consumes": [
"*/*"
]
},
{
"type": "string",
"method": "DELETE", "method": "DELETE",
"summary": "proxy DELETE requests to Service", "summary": "proxy DELETE requests to Service",
"nickname": "proxyDELETENamespacedServiceWithPath", "nickname": "proxyDELETENamespacedServiceWithPath",
...@@ -15242,6 +15400,36 @@ ...@@ -15242,6 +15400,36 @@
}, },
{ {
"type": "string", "type": "string",
"method": "PATCH",
"summary": "proxy PATCH requests to Service",
"nickname": "proxyPATCHNamespacedService",
"parameters": [
{
"type": "string",
"paramType": "path",
"name": "namespace",
"description": "object name and auth scope, such as for teams and projects",
"required": true,
"allowMultiple": false
},
{
"type": "string",
"paramType": "path",
"name": "name",
"description": "name of the Service",
"required": true,
"allowMultiple": false
}
],
"produces": [
"*/*"
],
"consumes": [
"*/*"
]
},
{
"type": "string",
"method": "DELETE", "method": "DELETE",
"summary": "proxy DELETE requests to Service", "summary": "proxy DELETE requests to Service",
"nickname": "proxyDELETENamespacedService", "nickname": "proxyDELETENamespacedService",
......
staging/src/k8s.io/apiserver/pkg/endpoints/installer.go
View file @ 21ee9f20
...@@ -766,6 +766,7 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag ...@@ -766,6 +766,7 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag
addProxyRoute(ws, "GET", a.prefix, action.Path, proxyHandler, namespaced, kind, resource, subresource, hasSubresource, action.Params, operationSuffix) addProxyRoute(ws, "GET", a.prefix, action.Path, proxyHandler, namespaced, kind, resource, subresource, hasSubresource, action.Params, operationSuffix)
addProxyRoute(ws, "PUT", a.prefix, action.Path, proxyHandler, namespaced, kind, resource, subresource, hasSubresource, action.Params, operationSuffix) addProxyRoute(ws, "PUT", a.prefix, action.Path, proxyHandler, namespaced, kind, resource, subresource, hasSubresource, action.Params, operationSuffix)
addProxyRoute(ws, "POST", a.prefix, action.Path, proxyHandler, namespaced, kind, resource, subresource, hasSubresource, action.Params, operationSuffix) addProxyRoute(ws, "POST", a.prefix, action.Path, proxyHandler, namespaced, kind, resource, subresource, hasSubresource, action.Params, operationSuffix)
addProxyRoute(ws, "PATCH", a.prefix, action.Path, proxyHandler, namespaced, kind, resource, subresource, hasSubresource, action.Params, operationSuffix)
addProxyRoute(ws, "DELETE", a.prefix, action.Path, proxyHandler, namespaced, kind, resource, subresource, hasSubresource, action.Params, operationSuffix) addProxyRoute(ws, "DELETE", a.prefix, action.Path, proxyHandler, namespaced, kind, resource, subresource, hasSubresource, action.Params, operationSuffix)
addProxyRoute(ws, "HEAD", a.prefix, action.Path, proxyHandler, namespaced, kind, resource, subresource, hasSubresource, action.Params, operationSuffix) addProxyRoute(ws, "HEAD", a.prefix, action.Path, proxyHandler, namespaced, kind, resource, subresource, hasSubresource, action.Params, operationSuffix)
addProxyRoute(ws, "OPTIONS", a.prefix, action.Path, proxyHandler, namespaced, kind, resource, subresource, hasSubresource, action.Params, operationSuffix) addProxyRoute(ws, "OPTIONS", a.prefix, action.Path, proxyHandler, namespaced, kind, resource, subresource, hasSubresource, action.Params, operationSuffix)
......
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