Bug 1433244 - allow imageimports to be long runing requests

openshift · Mar 20, 2017 · 7e52677 · 7e52677
1 parent 0f7e04d
commit 7e52677
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/client/imagestreams.go b/pkg/client/imagestreams.go
@@ -2,6 +2,7 @@ package client
 
 import (
 	"errors"
+	"time"
 
 	kapi "k8s.io/kubernetes/pkg/api"
 	apierrs "k8s.io/kubernetes/pkg/api/errors"
@@ -109,7 +110,7 @@ func (c *imageStreams) UpdateStatus(stream *imageapi.ImageStream) (result *image
 // will be returned if no actual import was requested (the to fields were not set), or an ImageStream if import was requested.
 func (c *imageStreams) Import(isi *imageapi.ImageStreamImport) (*imageapi.ImageStreamImport, error) {
 	result := &imageapi.ImageStreamImport{}
-	if err := c.r.Post().Namespace(c.ns).Resource("imageStreamImports").Body(isi).Do().Into(result); err != nil {
+	if err := c.r.Post().Namespace(c.ns).Resource("imageStreamImports").Timeout(2 * time.Minute).Body(isi).Do().Into(result); err != nil {
 		return nil, transformUnsupported(err)
 	}
 	return result, nil

diff --git a/pkg/cmd/server/kubernetes/master_config.go b/pkg/cmd/server/kubernetes/master_config.go
@@ -61,7 +61,7 @@ import (
 
 // request paths that match this regular expression will be treated as long running
 // and not subjected to the default server timeout.
-const originLongRunningEndpointsRE = "(/|^)buildconfigs/.*/instantiatebinary$"
+const originLongRunningEndpointsRE = "(/|^)(buildconfigs/.*/instantiatebinary|imagestreamimports)$"
 
 var LegacyAPIGroupPrefixes = sets.NewString(genericapiserver.DefaultLegacyAPIPrefix, api.Prefix, api.LegacyPrefix)