Skip to content

Conversation

spadgett
Copy link
Member

@spadgett spadgett commented Nov 6, 2017

screen shot 2017-11-06 at 8 26 19 am

  • Avoid adding an undefined element to value from array depending on the
    order that config maps and secrets load
  • Fix typo passing config maps to edit-lifecycle-hooks
  • Show valueFrom values for hooks when viewing the deployment config

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1509842
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1509819
Fixes #2460

/kind bug
/assign @jwforres

@openshift-ci-robot openshift-ci-robot added kind/bug Categorizes issue or PR as related to a bug. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 6, 2017
@spadgett
Copy link
Member Author

spadgett commented Nov 6, 2017

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 6, 2017
* Avoid adding an `undefined` element to value from array depending on the
  order that config maps and secrets load
* Fix typo passing config maps to edit-lifecycle hooks
* Show valueFrom values for hooks when viewing the deployment config

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1509842
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1509819
@@ -123,7 +123,9 @@ angular.module("openshiftConsole")

$scope.valueFromObjects = [];
$scope.$watchGroup(['availableSecrets', 'availableConfigMaps'], function() {
$scope.valueFromObjects = ($scope.availableSecrets || []).concat($scope.availableConfigMaps);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jwforres This could push an undefined element into the array if availableConfigMaps was not initialized yet, causing #2460

@spadgett
Copy link
Member Author

spadgett commented Nov 6, 2017

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 6, 2017
@jwforres
Copy link
Member

jwforres commented Nov 6, 2017

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 6, 2017
@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit 228caa6 into openshift:master Nov 6, 2017
@spadgett spadgett deleted the value-from-hook branch November 6, 2017 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants