github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 07:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9963 from smarterclayton/add_options_to_proxy

Browse Source 
OPTIONS should be passed through the proxy
This commit is contained in:
Jeff Lowdermilk 2015-06-22 10:36:25 -07:00
commit 2418173784
3 changed files with 377 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3365,6 +3365,36 @@
"consumes": [
"*/*"
]
},
{
"type": "string",
"method": "OPTIONS",
"summary": "proxy OPTIONS requests to Node",
"nickname": "proxyOPTIONSNode",
"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": [
"*/*"
]
}
]
},
@ -3481,6 +3511,28 @@
"consumes": [
"*/*"
]
},
{
"type": "string",
"method": "OPTIONS",
"summary": "proxy OPTIONS requests to Node",
"nickname": "proxyOPTIONSNode",
"parameters": [
{
"type": "string",
"paramType": "path",
"name": "name",
"description": "name of the Node",
"required": true,
"allowMultiple": false
}
],
"produces": [
"*/*"
],
"consumes": [
"*/*"
]
}
]
},
@ -5415,6 +5467,44 @@
"consumes": [
"*/*"
]
},
{
"type": "string",
"method": "OPTIONS",
"summary": "proxy OPTIONS requests to Pod",
"nickname": "proxyOPTIONSPod",
"parameters": [
{
"type": "string",
"paramType": "path",
"name": "namespaces",
"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": [
"*/*"
]
}
]
},
@ -5571,6 +5661,36 @@
"consumes": [
"*/*"
]
},
{
"type": "string",
"method": "OPTIONS",
"summary": "proxy OPTIONS requests to Pod",
"nickname": "proxyOPTIONSPod",
"parameters": [
{
"type": "string",
"paramType": "path",
"name": "namespaces",
"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": [
"*/*"
]
}
]
},
@ -10445,6 +10565,44 @@
"consumes": [
"*/*"
]
},
{
"type": "string",
"method": "OPTIONS",
"summary": "proxy OPTIONS requests to Service",
"nickname": "proxyOPTIONSService",
"parameters": [
{
"type": "string",
"paramType": "path",
"name": "namespaces",
"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": [
"*/*"
]
}
]
},
@ -10601,6 +10759,36 @@
"consumes": [
"*/*"
]
},
{
"type": "string",
"method": "OPTIONS",
"summary": "proxy OPTIONS requests to Service",
"nickname": "proxyOPTIONSService",
"parameters": [
{
"type": "string",
"paramType": "path",
"name": "namespaces",
"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": [
"*/*"
]
}
]
},

188
api/swagger-spec/v1beta3.json
View File

@ -3365,6 +3365,36 @@
"consumes": [
"*/*"
]
},
{
"type": "string",
"method": "OPTIONS",
"summary": "proxy OPTIONS requests to Node",
"nickname": "proxyOPTIONSNode",
"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": [
"*/*"
]
}
]
},
@ -3481,6 +3511,28 @@
"consumes": [
"*/*"
]
},
{
"type": "string",
"method": "OPTIONS",
"summary": "proxy OPTIONS requests to Node",
"nickname": "proxyOPTIONSNode",
"parameters": [
{
"type": "string",
"paramType": "path",
"name": "name",
"description": "name of the Node",
"required": true,
"allowMultiple": false
}
],
"produces": [
"*/*"
],
"consumes": [
"*/*"
]
}
]
},
@ -5415,6 +5467,44 @@
"consumes": [
"*/*"
]
},
{
"type": "string",
"method": "OPTIONS",
"summary": "proxy OPTIONS requests to Pod",
"nickname": "proxyOPTIONSPod",
"parameters": [
{
"type": "string",
"paramType": "path",
"name": "namespaces",
"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": [
"*/*"
]
}
]
},
@ -5571,6 +5661,36 @@
"consumes": [
"*/*"
]
},
{
"type": "string",
"method": "OPTIONS",
"summary": "proxy OPTIONS requests to Pod",
"nickname": "proxyOPTIONSPod",
"parameters": [
{
"type": "string",
"paramType": "path",
"name": "namespaces",
"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": [
"*/*"
]
}
]
},
@ -10445,6 +10565,44 @@
"consumes": [
"*/*"
]
},
{
"type": "string",
"method": "OPTIONS",
"summary": "proxy OPTIONS requests to Service",
"nickname": "proxyOPTIONSService",
"parameters": [
{
"type": "string",
"paramType": "path",
"name": "namespaces",
"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": [
"*/*"
]
}
]
},
@ -10601,6 +10759,36 @@
"consumes": [
"*/*"
]
},
{
"type": "string",
"method": "OPTIONS",
"summary": "proxy OPTIONS requests to Service",
"nickname": "proxyOPTIONSService",
"parameters": [
{
"type": "string",
"paramType": "path",
"name": "namespaces",
"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": [
"*/*"
]
}
]
},

1
pkg/apiserver/api_installer.go
View File

@ -547,6 +547,7 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag
addProxyRoute(ws, "POST", a.prefix, action.Path, proxyHandler, kind, resource, subresource, hasSubresource, action.Params)
addProxyRoute(ws, "DELETE", a.prefix, action.Path, proxyHandler, kind, resource, subresource, hasSubresource, action.Params)
addProxyRoute(ws, "HEAD", a.prefix, action.Path, proxyHandler, kind, resource, subresource, hasSubresource, action.Params)
addProxyRoute(ws, "OPTIONS", a.prefix, action.Path, proxyHandler, kind, resource, subresource, hasSubresource, action.Params)
case "CONNECT":
for _, method := range connecter.ConnectMethods() {
doc := "connect " + method + " requests to " + kind