Bug 1495460 - Fix build config source namespace

Correctly set the build config source image namespace when adding a builder using advanced options. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1495460
openshift · Sep 26, 2017 · 4b73da6 · 4b73da6
1 parent cf9c610
commit 4b73da6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/scripts/services/applicationGenerator.js b/app/scripts/services/applicationGenerator.js
@@ -359,9 +359,11 @@ angular.module("openshiftConsole")
           triggers: triggers
         }
       };
+
       if(input.namespace) {
-        bc.spec.strategy.namespace = input.namespace;
+        bc.spec.strategy.sourceStrategy.from.namespace = input.namespace;
       }
+
       if (_.get(input, 'buildConfig.secrets.gitSecret[0].name')) {
         bc.spec.source.sourceSecret = _.head(input.buildConfig.secrets.gitSecret);
       }

diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
@@ -1504,7 +1504,7 @@ env: n
 triggers: a
 }
 };
-return e.namespace && (l.spec.strategy.namespace = e.namespace), _.get(e, "buildConfig.secrets.gitSecret[0].name") && (l.spec.source.sourceSecret = _.head(e.buildConfig.secrets.gitSecret)), e.buildConfig.contextDir && (l.spec.source.contextDir = e.buildConfig.contextDir), l;
+return e.namespace && (l.spec.strategy.sourceStrategy.from.namespace = e.namespace), _.get(e, "buildConfig.secrets.gitSecret[0].name") && (l.spec.source.sourceSecret = _.head(e.buildConfig.secrets.gitSecret)), e.buildConfig.contextDir && (l.spec.source.contextDir = e.buildConfig.contextDir), l;
 }, o._generateImageStream = function(e) {
 return {
 apiVersion: "v1",