Skip to content

Commit

Permalink
Merge pull request #66807 from caesarxuchao/remove-connectrequest
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 66196, 67016, 66807, 67023). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Make admission webhooks conversion convert CONNECT body correctly

Fix #59759.

1. Make apiserver pass connectRequest.Options directly to the admission layer. All other information in rest.ConnectRequest is present in admission attributes.
2. Make the scope.Kind of pod/attach, pod/exec, pod/portforward, node/proxy, service/proxy to their respective options Kind, instead of the parent Kind.

I've tested it locally, the conversion is working correctly for "kubectl attach". I'll add e2e tests.

I'll keep this to myself until I add the tests, but cc @mikedanese @liggitt RE. kubernetes/kubernetes#66633.

Kubernetes-commit: d1636b8019fa042eb1135263b00293b1c806b1d7
  • Loading branch information
k8s-publishing-bot committed Aug 7, 2018
2 parents eb687b1 + 15ecce8 commit 9a8af0d
Show file tree
Hide file tree
Showing 4 changed files with 158 additions and 171 deletions.

0 comments on commit 9a8af0d

Please sign in to comment.