Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Let users add config maps and secrets as volumes #891

Merged
merged 2 commits into from
Nov 22, 2016

Conversation

spadgett
Copy link
Member

https://trello.com/c/gUzfL5OA

@jwforres PTAL

Add all keys:

screen shot 2016-11-18 at 11 41 04 am

Add specific keys:

screen shot 2016-11-18 at 11 41 25 am

@spadgett spadgett force-pushed the add-config-map-secret-volume branch 2 times, most recently from c961884 to 5f43d1e Compare November 21, 2016 19:54
Copy link
Member

@jwforres jwforres left a comment

Choose a reason for hiding this comment

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

one minor comment, otherwise LGTM. lets wait to merge till after the design meeting today

@@ -24,6 +24,15 @@ angular.module('openshiftConsole')
return input;
};
})
.filter('keys', function() {
return function(obj) {
if (!obj) {
Copy link
Member

Choose a reason for hiding this comment

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

what about return _.keys(obj);

@spadgett spadgett force-pushed the add-config-map-secret-volume branch from 5f43d1e to 8e7b54f Compare November 22, 2016 18:17
@spadgett
Copy link
Member Author

@jwforres updated with a second commit for removing volumes

}

var triggers = _.get($scope, 'deploymentConfig.spec.triggers', []);
return _.some(triggers, { type: 'ConfigChange' });
Copy link
Member

Choose a reason for hiding this comment

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

should you be checking automatic true?

Copy link
Member Author

Choose a reason for hiding this comment

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

not for config change, only image change

$scope.removeVolume = function(volume) {
var details;
if (isConfigChangeActive()) {
details = "This will remove the volume from the deployment config and trigger a new deployment.";
Copy link
Member

Choose a reason for hiding this comment

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

should we be clear that it will not delete the PVC/Secret/ConfigMap?

@spadgett spadgett force-pushed the add-config-map-secret-volume branch from 8e7b54f to 40eedd8 Compare November 22, 2016 20:20
@spadgett
Copy link
Member Author

@jwforres updated

@jwforres
Copy link
Member

[merge]

@openshift-bot
Copy link

Evaluated for origin web console merge up to 40eedd8

@openshift-bot
Copy link

openshift-bot commented Nov 22, 2016

Origin Web Console Merge Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_web_console/755/) (Base Commit: bc496f8)

@openshift-bot openshift-bot merged commit 95b0902 into openshift:master Nov 22, 2016
@spadgett spadgett deleted the add-config-map-secret-volume branch November 28, 2016 13:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants