Skip to content

Commit 80b9671

Browse files
committed
Bug 1502914 - Compact empty envFrom entries
Don't include empty `envFrom` entries when updating environment variables. This causes a validation failure. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1502914
1 parent 77ce2ce commit 80b9671

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

app/scripts/services/environment.js

+3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ angular.module("openshiftConsole")
3131
var containers = getContainers(object);
3232
_.each(containers, function(container) {
3333
container.env = keyValueEditorUtils.compactEntries(container.env);
34+
container.envFrom = _.reject(container.envFrom, function(envFromEntry) {
35+
return !_.get(envFromEntry, 'configMapRef.name') && !_.get(envFromEntry, 'secretRef.name');
36+
});
3437
});
3538
},
3639

dist/scripts/scripts.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -3953,7 +3953,9 @@ e.env = e.env || [], e.envFrom = e.envFrom || [];
39533953
compact: function(e) {
39543954
var a = n(e);
39553955
_.each(a, function(e) {
3956-
e.env = t.compactEntries(e.env);
3956+
e.env = t.compactEntries(e.env), e.envFrom = _.reject(e.envFrom, function(e) {
3957+
return !_.get(e, "configMapRef.name") && !_.get(e, "secretRef.name");
3958+
});
39573959
});
39583960
},
39593961
copyAndNormalize: function(e) {

0 commit comments

Comments
 (0)