Browse code

Merge pull request #37686 from andrewhsu/bk-no-ex

remove experimental guard for buildkit

Tibor Vass authored on 2018/08/22 08:43:46
Showing 2 changed files
... ...
@@ -231,8 +231,7 @@ func (br *buildRouter) postBuild(ctx context.Context, w http.ResponseWriter, r *
231 231
 	}
232 232
 
233 233
 	// check if the builder feature has been enabled from daemon as well.
234
-	if buildOptions.Version == types.BuilderBuildKit &&
235
-		(br.builderVersion != types.BuilderBuildKit || !br.daemon.HasExperimental()) {
234
+	if buildOptions.Version == types.BuilderBuildKit && br.builderVersion != types.BuilderBuildKit {
236 235
 		return errdefs.InvalidParameter(errors.New("buildkit is not enabled on daemon"))
237 236
 	}
238 237
 
... ...
@@ -24,6 +24,6 @@ func (r *sessionRouter) Routes() []router.Route {
24 24
 
25 25
 func (r *sessionRouter) initRoutes() {
26 26
 	r.routes = []router.Route{
27
-		router.Experimental(router.NewPostRoute("/session", r.startSession)),
27
+		router.NewPostRoute("/session", r.startSession),
28 28
 	}
29 29
 }