Skip to content

K
k3s
Commit 2a228bf4 authored by Saad Ali's avatar Saad Ali
Browse files
Options

Merge pull request #9898 from nikhiljindal/trace

Stop supporting TRACE proxy requests
parents dd7a6a03 34a0bccd
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 377 deletions
api/swagger-spec/v1.json
View file @ 2a228bf4
...@@ -3365,36 +3365,6 @@ ...@@ -3365,36 +3365,6 @@
"consumes": [ "consumes": [
"*/*" "*/*"
] ]
},
{
"type": "string",
"method": "TRACE",
"summary": "proxy TRACE requests to Node",
"nickname": "proxyTRACENode",
"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": [
"*/*"
]
} }
] ]
}, },
...@@ -3511,28 +3481,6 @@ ...@@ -3511,28 +3481,6 @@
"consumes": [ "consumes": [
"*/*" "*/*"
] ]
},
{
"type": "string",
"method": "TRACE",
"summary": "proxy TRACE requests to Node",
"nickname": "proxyTRACENode",
"parameters": [
{
"type": "string",
"paramType": "path",
"name": "name",
"description": "name of the Node",
"required": true,
"allowMultiple": false
}
],
"produces": [
"*/*"
],
"consumes": [
"*/*"
]
} }
] ]
}, },
...@@ -5467,44 +5415,6 @@ ...@@ -5467,44 +5415,6 @@
"consumes": [ "consumes": [
"*/*" "*/*"
] ]
},
{
"type": "string",
"method": "TRACE",
"summary": "proxy TRACE requests to Pod",
"nickname": "proxyTRACEPod",
"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": [
"*/*"
]
} }
] ]
}, },
...@@ -5661,36 +5571,6 @@ ...@@ -5661,36 +5571,6 @@
"consumes": [ "consumes": [
"*/*" "*/*"
] ]
},
{
"type": "string",
"method": "TRACE",
"summary": "proxy TRACE requests to Pod",
"nickname": "proxyTRACEPod",
"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": [
"*/*"
]
} }
] ]
}, },
...@@ -10316,44 +10196,6 @@ ...@@ -10316,44 +10196,6 @@
"consumes": [ "consumes": [
"*/*" "*/*"
] ]
},
{
"type": "string",
"method": "TRACE",
"summary": "proxy TRACE requests to Service",
"nickname": "proxyTRACEService",
"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": [
"*/*"
]
} }
] ]
}, },
...@@ -10510,36 +10352,6 @@ ...@@ -10510,36 +10352,6 @@
"consumes": [ "consumes": [
"*/*" "*/*"
] ]
},
{
"type": "string",
"method": "TRACE",
"summary": "proxy TRACE requests to Service",
"nickname": "proxyTRACEService",
"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": [
"*/*"
]
} }
] ]
}, },
......
api/swagger-spec/v1beta3.json
View file @ 2a228bf4
...@@ -3365,36 +3365,6 @@ ...@@ -3365,36 +3365,6 @@
"consumes": [ "consumes": [
"*/*" "*/*"
] ]
},
{
"type": "string",
"method": "TRACE",
"summary": "proxy TRACE requests to Node",
"nickname": "proxyTRACENode",
"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": [
"*/*"
]
} }
] ]
}, },
...@@ -3511,28 +3481,6 @@ ...@@ -3511,28 +3481,6 @@
"consumes": [ "consumes": [
"*/*" "*/*"
] ]
},
{
"type": "string",
"method": "TRACE",
"summary": "proxy TRACE requests to Node",
"nickname": "proxyTRACENode",
"parameters": [
{
"type": "string",
"paramType": "path",
"name": "name",
"description": "name of the Node",
"required": true,
"allowMultiple": false
}
],
"produces": [
"*/*"
],
"consumes": [
"*/*"
]
} }
] ]
}, },
...@@ -5467,44 +5415,6 @@ ...@@ -5467,44 +5415,6 @@
"consumes": [ "consumes": [
"*/*" "*/*"
] ]
},
{
"type": "string",
"method": "TRACE",
"summary": "proxy TRACE requests to Pod",
"nickname": "proxyTRACEPod",
"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": [
"*/*"
]
} }
] ]
}, },
...@@ -5661,36 +5571,6 @@ ...@@ -5661,36 +5571,6 @@
"consumes": [ "consumes": [
"*/*" "*/*"
] ]
},
{
"type": "string",
"method": "TRACE",
"summary": "proxy TRACE requests to Pod",
"nickname": "proxyTRACEPod",
"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": [
"*/*"
]
} }
] ]
}, },
...@@ -10316,44 +10196,6 @@ ...@@ -10316,44 +10196,6 @@
"consumes": [ "consumes": [
"*/*" "*/*"
] ]
},
{
"type": "string",
"method": "TRACE",
"summary": "proxy TRACE requests to Service",
"nickname": "proxyTRACEService",
"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": [
"*/*"
]
} }
] ]
}, },
...@@ -10510,36 +10352,6 @@ ...@@ -10510,36 +10352,6 @@
"consumes": [ "consumes": [
"*/*" "*/*"
] ]
},
{
"type": "string",
"method": "TRACE",
"summary": "proxy TRACE requests to Service",
"nickname": "proxyTRACEService",
"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": [
"*/*"
]
} }
] ]
}, },
......
pkg/apiserver/api_installer.go
View file @ 2a228bf4
...@@ -571,7 +571,6 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag ...@@ -571,7 +571,6 @@ 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, "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, "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, "HEAD", a.prefix, action.Path, proxyHandler, kind, resource, subresource, hasSubresource, action.Params)
addProxyRoute(ws, "TRACE", a.prefix, action.Path, proxyHandler, kind, resource, subresource, hasSubresource, action.Params)
case "CONNECT": case "CONNECT":
for _, method := range connecter.ConnectMethods() { for _, method := range connecter.ConnectMethods() {
doc := "connect " + method + " requests to " + kind doc := "connect " + method + " requests to " + kind
......
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