Skip to content

Add/Edit env vars from secrets and config maps #1090

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Feb 21, 2017
Merged

Add/Edit env vars from secrets and config maps #1090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2487128
Adding KVE directly to console and adding support for adding/editing …
rhamilto Jan 9, 2017
7d79245
Eliminate kve bookkeeping in controllers
benjaminapetersen Feb 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,7 @@ module.exports = function (grunt) {
'bower_components/google-code-prettify/bin/prettify.min.js',
'bower_components/google-code-prettify/bin/prettify.min.css',
'bower_components/patternfly/dist/css/patternfly.css',
'bower_components/patternfly/dist/css/patternfly-additions.css',
'bower_components/angular-key-value-editor/dist/angular-key-value-editor.css'
'bower_components/patternfly/dist/css/patternfly-additions.css'
]
}
},
Expand Down
5 changes: 3 additions & 2 deletions app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,6 @@ <h1>JavaScript Required</h1>
<script src="bower_components/angular-extension-registry/dist/compiled-templates.js"></script>
<script src="bower_components/ng-sortable/dist/ng-sortable.js"></script>
<script src="bower_components/ui-select/dist/select.js"></script>
<script src="bower_components/angular-key-value-editor/dist/angular-key-value-editor.js"></script>
<script src="bower_components/angular-key-value-editor/dist/compiled-templates.js"></script>
<script src="bower_components/angular-inview/angular-inview.js"></script>
<script src="bower_components/js-yaml/dist/js-yaml.js"></script>
<script src="bower_components/angular-moment/angular-moment.js"></script>
Expand Down Expand Up @@ -215,6 +213,8 @@ <h1>JavaScript Required</h1>
<script src="scripts/services/cliHelp.js"></script>
<script src="scripts/services/html.js"></script>
<script src="scripts/services/environment.js"></script>
<script src="scripts/services/keyValueEditorProvider.js"></script>
<script src="scripts/services/keyValueEditorUtils.js"></script>
<script src="scripts/controllers/projects.js"></script>
<script src="scripts/controllers/pods.js"></script>
<script src="scripts/controllers/pod.js"></script>
Expand Down Expand Up @@ -358,6 +358,7 @@ <h1>JavaScript Required</h1>
<script src="scripts/directives/selectContainers.js"></script>
<script src="scripts/directives/buildHooks.js"></script>
<script src="scripts/directives/pauseRolloutsCheckbox.js"></script>
<script src="scripts/directives/keyValueEditor.js"></script>
<script src="scripts/filters/date.js"></script>
<script src="scripts/filters/resources.js"></script>
<script src="scripts/filters/canI.js"></script>
Expand Down
1 change: 0 additions & 1 deletion app/scripts/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ angular
'extension-registry',
'as.sortable',
'ui.select',
'key-value-editor',
'angular-inview',
'angularMoment',
'ab-base64'
Expand Down
4 changes: 0 additions & 4 deletions app/scripts/controllers/buildConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,6 @@ angular.module('openshiftConsole')
var copyBuildConfigAndEnsureEnv = function(buildConfig) {
$scope.updatedBuildConfig = angular.copy(buildConfig);
$scope.envVars = buildStrategy($scope.updatedBuildConfig).env || [];
// check valueFrom attribs and set an alt text for display if present
_.each($scope.envVars, function(env) {
$filter('altTextForValueFrom')(env);
});
};

$scope.saveEnvVars = function() {
Expand Down
54 changes: 44 additions & 10 deletions app/scripts/controllers/create/createFromImage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,17 @@ angular.module("openshiftConsole")

var appLabel = {name: 'app', value: ''};

var orderByDisplayName = $filter('orderByDisplayName');
var getErrorDetails = $filter('getErrorDetails');

var displayError = function(errorMessage, errorDetails) {
$scope.alerts['from-value-objects'] = {
type: "error",
message: errorMessage,
details: errorDetails
};
};

ProjectsService
.get($routeParams.project)
.then(_.spread(function(project, context) {
Expand Down Expand Up @@ -151,14 +162,37 @@ angular.module("openshiftConsole")
$scope.metricsWarning = !available;
});

DataService.list("secrets", context, function(secrets) {
var secretsByType = SecretsService.groupSecretsByType(secrets);
var secretNamesByType =_.mapValues(secretsByType, function(secrets) {return _.map(secrets, 'metadata.name')});
// Add empty option to the image/source secrets
$scope.secretsByType = _.each(secretNamesByType, function(secretsArray) {
secretsArray.unshift("");
});
});
var configMapDataOrdered = [];
var secretDataOrdered = [];
$scope.valueFromObjects = [];

DataService.list("configmaps", context, null, { errorNotification: false }).then(function(configMapData) {
configMapDataOrdered = orderByDisplayName(configMapData.by("metadata.name"));
$scope.valueFromObjects = configMapDataOrdered.concat(secretDataOrdered);
}, function(e) {
if (e.code === 403) {
return;
}

displayError('Could not load config maps', getErrorDetails(e));
});

DataService.list("secrets", context, null, { errorNotification: false }).then(function(secretData) {
secretDataOrdered = orderByDisplayName(secretData.by("metadata.name"));
$scope.valueFromObjects = secretDataOrdered.concat(configMapDataOrdered);
var secretsByType = SecretsService.groupSecretsByType(secretData);
var secretNamesByType =_.mapValues(secretsByType, function(secretData) {return _.map(secretData, 'metadata.name');});
// Add empty option to the image/source secrets
$scope.secretsByType = _.each(secretNamesByType, function(secretsArray) {
secretsArray.unshift("");
});
}, function(e) {
if (e.code === 403) {
return;
}

displayError('Could not load secrets', getErrorDetails(e));
});

DataService.get("imagestreams", scope.imageName, {namespace: (scope.namespace || $routeParams.project)}).then(function(imageStream){
scope.imageStream = imageStream;
Expand Down Expand Up @@ -340,8 +374,8 @@ angular.module("openshiftConsole")
$scope.createApp = function(){
$scope.disableInputs = true;
$scope.alerts = {};
$scope.buildConfig.envVars = keyValueEditorUtils.mapEntries(keyValueEditorUtils.compactEntries($scope.buildConfigEnvVars));
$scope.deploymentConfig.envVars = keyValueEditorUtils.mapEntries(keyValueEditorUtils.compactEntries($scope.DCEnvVarsFromUser));
$scope.buildConfig.envVars = keyValueEditorUtils.compactEntries($scope.buildConfigEnvVars);
$scope.deploymentConfig.envVars = keyValueEditorUtils.compactEntries($scope.DCEnvVarsFromUser);
var userLabels = keyValueEditorUtils.mapEntries(keyValueEditorUtils.compactEntries($scope.userDefinedLabels));
var systemLabels = keyValueEditorUtils.mapEntries(keyValueEditorUtils.compactEntries($scope.systemLabels));
$scope.labels = _.extend(systemLabels, userLabels);
Expand Down
3 changes: 0 additions & 3 deletions app/scripts/controllers/create/nextSteps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ angular.module("openshiftConsole")

var processedTemplateData = ProcessedTemplateService.getTemplateData();
$scope.parameters = processedTemplateData.params;
_.each($scope.parameters, function(env) {
$filter('altTextForValueFrom')(env);
});
$scope.templateMessage = processedTemplateData.message;
ProcessedTemplateService.clearTemplateData();

Expand Down
37 changes: 37 additions & 0 deletions app/scripts/controllers/deployment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,17 @@ angular.module('openshiftConsole')
};
};

var orderByDisplayName = $filter('orderByDisplayName');
var getErrorDetails = $filter('getErrorDetails');

var displayError = function(errorMessage, errorDetails) {
$scope.alerts['from-value-objects'] = {
type: "error",
message: errorMessage,
details: errorDetails
};
};

var watches = [];

ProjectsService
Expand Down Expand Up @@ -209,6 +220,32 @@ angular.module('openshiftConsole')
updateHPAWarnings();
});

var configMapDataOrdered = [];
var secretDataOrdered = [];
$scope.valueFromObjects = [];

DataService.list("configmaps", context, null, { errorNotification: false }).then(function(configMapData) {
configMapDataOrdered = orderByDisplayName(configMapData.by("metadata.name"));
$scope.valueFromObjects = configMapDataOrdered.concat(secretDataOrdered);
}, function(e) {
if (e.code === 403) {
return;
}

displayError('Could not load config maps', getErrorDetails(e));
});

DataService.list("secrets", context, null, { errorNotification: false }).then(function(secretData) {
secretDataOrdered = orderByDisplayName(secretData.by("metadata.name"));
$scope.valueFromObjects = secretDataOrdered.concat(configMapDataOrdered);
}, function(e) {
if (e.code === 403) {
return;
}

displayError('Could not load secrets', getErrorDetails(e));
});

watches.push(DataService.watch("imagestreams", context, function(imageStreamData) {
var imageStreams = imageStreamData.by("metadata.name");
ImageStreamResolver.buildDockerRefMapForImageStreams(imageStreams, imageStreamImageRefByDockerReference);
Expand Down
39 changes: 38 additions & 1 deletion app/scripts/controllers/deploymentConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,23 @@ angular.module('openshiftConsole')
};
};

var orderByDisplayName = $filter('orderByDisplayName');
var getErrorDetails = $filter('getErrorDetails');

var displayError = function(errorMessage, errorDetails) {
$scope.alerts['from-value-objects'] = {
type: "error",
message: errorMessage,
details: errorDetails
};
};

var watches = [];

var configMapDataOrdered = [];
var secretDataOrdered = [];
$scope.valueFromObjects = [];

ProjectsService
.get($routeParams.project)
.then(_.spread(function(project, context) {
Expand All @@ -117,7 +132,7 @@ angular.module('openshiftConsole')
$scope.deploymentConfig = deploymentConfig;
$scope.strategyParams = $filter('deploymentStrategyParams')(deploymentConfig);
updateHPAWarnings();
$scope.updatedDeploymentConfig = EnvironmentService.copyAndNormalize(deploymentConfig);
$scope.updatedDeploymentConfig = EnvironmentService.copyAndNormalize($scope.deploymentConfig);
$scope.saveEnvVars = function() {
EnvironmentService.compact($scope.updatedDeploymentConfig);
saveEnvPromise = DataService.update("deploymentconfigs",
Expand Down Expand Up @@ -248,6 +263,28 @@ angular.module('openshiftConsole')
updateHPAWarnings();
});

DataService.list("configmaps", context, null, { errorNotification: false }).then(function(configMapData) {
configMapDataOrdered = orderByDisplayName(configMapData.by("metadata.name"));
$scope.valueFromObjects = configMapDataOrdered.concat(secretDataOrdered);
}, function(e) {
if (e.code === 403) {
return;
}

displayError('Could not load config maps', getErrorDetails(e));
});

DataService.list("secrets", context, null, { errorNotification: false }).then(function(secretData) {
secretDataOrdered = orderByDisplayName(secretData.by("metadata.name"));
$scope.valueFromObjects = secretDataOrdered.concat(configMapDataOrdered);
}, function(e) {
if (e.code === 403) {
return;
}

displayError('Could not load secrets', getErrorDetails(e));
});

watches.push(DataService.watch("imagestreams", context, function(imageStreamData) {
var imageStreams = imageStreamData.by("metadata.name");
ImageStreamResolver.buildDockerRefMapForImageStreams(imageStreams, imageStreamImageRefByDockerReference);
Expand Down
5 changes: 1 addition & 4 deletions app/scripts/controllers/edit/buildConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,6 @@ angular.module('openshiftConsole')
$scope.buildStrategy = buildStrategy($scope.updatedBuildConfig);
$scope.strategyType = $scope.buildConfig.spec.strategy.type;
$scope.envVars = $scope.buildStrategy.env || [];
_.each($scope.envVars, function(env) {
$filter('altTextForValueFrom')(env);
});
$scope.triggers = getTriggerMap($scope.triggers, $scope.buildConfig.spec.triggers);
$scope.sources = getSourceMap($scope.sources, $scope.buildConfig.spec.source);

Expand All @@ -249,7 +246,7 @@ angular.module('openshiftConsole')

DataService.list("secrets", context, function(secrets) {
var secretsByType = SecretsService.groupSecretsByType(secrets);
var secretNamesByType =_.mapValues(secretsByType, function(secrets) {return _.map(secrets, 'metadata.name')});
var secretNamesByType =_.mapValues(secretsByType, function(secrets) {return _.map(secrets, 'metadata.name');});
// Add empty option to the image/source secrets
$scope.secrets.secretsByType = _.each(secretNamesByType, function(secretsArray) {
secretsArray.unshift("");
Expand Down
48 changes: 41 additions & 7 deletions app/scripts/controllers/edit/deploymentConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ angular.module('openshiftConsole')
AuthorizationService,
BreadcrumbsService,
DataService,
EnvironmentService,
Navigate,
ProjectsService,
SecretsService,
Expand Down Expand Up @@ -47,8 +48,24 @@ angular.module('openshiftConsole')
$scope.alerts[alert.name] = alert.data;
});
AlertMessageService.clearAlerts();

var orderByDisplayName = $filter('orderByDisplayName');
var getErrorDetails = $filter('getErrorDetails');

var displayError = function(errorMessage, errorDetails) {
$scope.alerts['from-value-objects'] = {
type: "error",
message: errorMessage,
details: errorDetails
};
};

var watches = [];

var configMapDataOrdered = [];
var secretDataOrdered = [];
$scope.valueFromObjects = [];

var getParamsPropertyName = function(strategyType) {
switch (strategyType) {
case "Recreate":
Expand Down Expand Up @@ -97,10 +114,6 @@ angular.module('openshiftConsole')
});
var triggerData = {};
container.env = container.env || [];
// check valueFrom attribs and set an alt text for display if present
_.each(container.env, function(env) {
$filter('altTextForValueFrom')(env);
});
containerConfigByName[container.name] = {
env: container.env,
image: container.image,
Expand Down Expand Up @@ -143,13 +156,34 @@ angular.module('openshiftConsole')
$scope.strategyData.customParams.environment = [];
}

DataService.list("secrets", context, function(secrets) {
var secretsByType = SecretsService.groupSecretsByType(secrets);
var secretNamesByType =_.mapValues(secretsByType, function(secrets) {return _.map(secrets, 'metadata.name')});
DataService.list("configmaps", context, null, { errorNotification: false }).then(function(configMapData) {
configMapDataOrdered = orderByDisplayName(configMapData.by("metadata.name"));
$scope.availableConfigMaps = configMapDataOrdered;
$scope.valueFromObjects = configMapDataOrdered.concat(secretDataOrdered);
}, function(e) {
if (e.code === 403) {
return;
}

displayError('Could not load config maps', getErrorDetails(e));
});

DataService.list("secrets", context, null, { errorNotification: false }).then(function(secretData) {
secretDataOrdered = orderByDisplayName(secretData.by("metadata.name"));
$scope.availableSecrets = secretDataOrdered;
$scope.valueFromObjects = secretDataOrdered.concat(configMapDataOrdered);
var secretsByType = SecretsService.groupSecretsByType(secretData);
var secretNamesByType =_.mapValues(secretsByType, function(secretData) {return _.map(secretData, 'metadata.name');});
// Add empty option to the image/source secrets
$scope.secretsByType = _.each(secretNamesByType, function(secretsArray) {
secretsArray.unshift("");
});
}, function(e) {
if (e.code === 403) {
return;
}

displayError('Could not load secrets', getErrorDetails(e));
});

// If we found the item successfully, watch for changes on it
Expand Down
2 changes: 0 additions & 2 deletions app/scripts/controllers/pod.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,13 +222,11 @@ angular.module('openshiftConsole')
});
};

var altTextForValueFrom = $filter('altTextForValueFrom');
var updateEnv = function() {
// Copy the containers so we aren't modifying the original pod spec.
var containers = angular.copy(_.get($scope, 'pod.spec.containers', []));
_.each(containers, function(container) {
container.env = container.env || [];
_.each(container.env, altTextForValueFrom);
});

$scope.containersEnv = containers;
Expand Down
Loading