Skip to content

Commit 2de3f83

Browse files
committed
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
1 parent cf9c610 commit 2de3f83

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

app/scripts/services/applicationGenerator.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -359,9 +359,11 @@ angular.module("openshiftConsole")
359359
triggers: triggers
360360
}
361361
};
362-
if(input.namespace) {
363-
bc.spec.strategy.namespace = input.namespace;
362+
363+
if (input.namespace) {
364+
bc.spec.strategy.sourceStrategy.from.namespace = input.namespace;
364365
}
366+
365367
if (_.get(input, 'buildConfig.secrets.gitSecret[0].name')) {
366368
bc.spec.source.sourceSecret = _.head(input.buildConfig.secrets.gitSecret);
367369
}

dist/scripts/scripts.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1504,7 +1504,7 @@ env: n
15041504
triggers: a
15051505
}
15061506
};
1507-
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;
1507+
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;
15081508
}, o._generateImageStream = function(e) {
15091509
return {
15101510
apiVersion: "v1",

0 commit comments

Comments
 (0)