Merge pull request #11999 from brendandburns/attach2

Add support for attach to kubectl
2015-07-31 12:51:08 -07:00
parent 066237e62a 97cb1cd071
commit a23ee556ad
25 changed files with 1257 additions and 43 deletions
--- a/pkg/master/master.go
+++ b/pkg/master/master.go
@@ -478,6 +478,7 @@ func (m *Master) init(c *Config) {
 	// TODO: Factor out the core API registration
 	m.storage = map[string]rest.Storage{
 		"pods":             podStorage.Pod,
+		"pods/attach":      podStorage.Attach,
 		"pods/status":      podStorage.Status,
 		"pods/log":         podStorage.Log,
 		"pods/exec":        podStorage.Exec,