Skip to content

Commit 5f43d1e

Browse files
spadgettspadgett
committed
Let users add config maps and secrets as volumes
1 parent 843d4ae commit 5f43d1e

17 files changed

+1017
-219
lines changed

‎app/index.html

+2
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ <h1>JavaScript Required</h1>
260260
<script src="scripts/controllers/edit/project.js"></script>
261261
<script src="scripts/controllers/createRoute.js"></script>
262262
<script src="scripts/controllers/attachPVC.js"></script>
263+
<script src="scripts/controllers/addConfigVolume.js"></script>
263264
<script src="scripts/controllers/modals/createSecretModal.js"></script>
264265
<script src="scripts/controllers/modals/confirmModal.js"></script>
265266
<script src="scripts/controllers/modals/confirmScale.js"></script>
@@ -337,6 +338,7 @@ <h1>JavaScript Required</h1>
337338
<script src="scripts/directives/istagSelect.js"></script>
338339
<script src="scripts/directives/deployImage.js"></script>
339340
<script src="scripts/directives/selector.js"></script>
341+
<script src="scripts/directives/selectContainers.js"></script>
340342
<script src="scripts/filters/date.js"></script>
341343
<script src="scripts/filters/resources.js"></script>
342344
<script src="scripts/filters/canI.js"></script>

‎app/scripts/app.js

+4
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,10 @@ angular
318318
templateUrl: 'views/attach-pvc.html',
319319
controller: 'AttachPVCController'
320320
})
321+
.when('/project/:project/add-config-volume', {
322+
templateUrl: 'views/add-config-volume.html',
323+
controller: 'AddConfigVolumeController'
324+
})
321325
.when('/project/:project/create', {
322326
templateUrl: 'views/create.html',
323327
controller: 'CreateController',

‎app/scripts/controllers/addConfigVolume.js

+233
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,233 @@
1+
'use strict';
2+
3+
/**
4+
* @ngdoc function
5+
* @name openshiftConsole.controller:AddConfigVolumeController
6+
* @description
7+
* # AddConfigVolumeController
8+
* Controller of the openshiftConsole
9+
*/
10+
angular.module('openshiftConsole')
11+
.controller('AddConfigVolumeController',
12+
function($filter,
13+
$routeParams,
14+
$scope,
15+
$window,
16+
APIService,
17+
BreadcrumbsService,
18+
DataService,
19+
Navigate,
20+
ProjectsService,
21+
StorageService) {
22+
if (!$routeParams.kind || !$routeParams.name) {
23+
Navigate.toErrorPage("Kind or name parameter missing.");
24+
return;
25+
}
26+
27+
var supportedKinds = [
28+
'Deployment',
29+
'DeploymentConfig',
30+
'ReplicaSet',
31+
'ReplicationController'
32+
];
33+
34+
if (!_.includes(supportedKinds, $routeParams.kind)) {
35+
Navigate.toErrorPage("Volumes are not supported for kind " + $routeParams.kind + ".");
36+
return;
37+
}
38+
39+
var resourceGroupVersion = {
40+
resource: APIService.kindToResource($routeParams.kind),
41+
group: $routeParams.group
42+
};
43+
44+
$scope.alerts = {};
45+
$scope.projectName = $routeParams.project;
46+
$scope.kind = $routeParams.kind;
47+
$scope.name = $routeParams.name;
48+
$scope.attach = {
49+
allContainers: true,
50+
pickKeys: false
51+
};
52+
$scope.forms = {};
53+
54+
$scope.breadcrumbs = BreadcrumbsService.getBreadcrumbs({
55+
name: $routeParams.name,
56+
kind: $routeParams.kind,
57+
namespace: $routeParams.project,
58+
subpage: 'Add Config Files',
59+
includeProject: true
60+
});
61+
62+
var humanizeKind = $filter('humanizeKind');
63+
$scope.groupByKind = function(object) {
64+
return humanizeKind(object.kind);
65+
};
66+
67+
var resetItems = function() {
68+
// Add an empty item so one appears when the section is first expanded.
69+
_.set($scope, 'attach.items', [{}]);
70+
};
71+
72+
// Clear the items if the source has changed.
73+
$scope.$watch('attach.source', resetItems);
74+
75+
var setDirty = function() {
76+
$scope.forms.addConfigVolumeForm.$setDirty();
77+
};
78+
79+
$scope.addItem = function() {
80+
$scope.attach.items.push({});
81+
setDirty();
82+
};
83+
84+
$scope.removeItem = function(index) {
85+
$scope.attach.items.splice(index, 1);
86+
setDirty();
87+
};
88+
89+
ProjectsService
90+
.get($routeParams.project)
91+
.then(_.spread(function(project, context) {
92+
$scope.project = project;
93+
94+
var orderByDisplayName = $filter('orderByDisplayName');
95+
var getErrorDetails = $filter('getErrorDetails');
96+
var generateName = $filter('generateName');
97+
98+
var displayError = function(errorMessage, errorDetails) {
99+
$scope.disableInputs = true;
100+
$scope.alerts['attach-persistent-volume-claim'] = {
101+
type: "error",
102+
message: errorMessage,
103+
details: errorDetails
104+
};
105+
};
106+
107+
DataService.get(resourceGroupVersion, $routeParams.name, context, { errorNotification: false }).then(
108+
function(object) {
109+
$scope.targetObject = object;
110+
$scope.breadcrumbs = BreadcrumbsService.getBreadcrumbs({
111+
object: object,
112+
project: project,
113+
subpage: 'Add Config Files',
114+
includeProject: true
115+
});
116+
},
117+
function(e) {
118+
$scope.error = e;
119+
}
120+
);
121+
122+
DataService.list("configmaps", context, null, { errorNotification: false }).then(function(configMapData) {
123+
$scope.configMaps = orderByDisplayName(configMapData.by("metadata.name"));
124+
}, function(e) {
125+
if (e.status === 403) {
126+
$scope.configMaps = [];
127+
return;
128+
}
129+
130+
displayError('Could not load config maps', getErrorDetails(e));
131+
});
132+
DataService.list("secrets", context, null, { errorNotification: false }).then(function(secretData) {
133+
$scope.secrets = orderByDisplayName(secretData.by("metadata.name"));
134+
}, function(e) {
135+
if (e.status === 403) {
136+
$scope.secrets = [];
137+
return;
138+
}
139+
140+
displayError('Could not load secrets', getErrorDetails(e));
141+
});
142+
143+
var isContainerSelected = function(container) {
144+
return $scope.attach.allContainers || $scope.attach.containers[container.name];
145+
};
146+
147+
// Look at the existing mount paths so that we can warn if the new value is not unique.
148+
var updateMountPaths = function() {
149+
var podTemplate = _.get($scope, 'targetObject.spec.template');
150+
$scope.existingMountPaths = StorageService.getMountPaths(podTemplate, isContainerSelected);
151+
};
152+
153+
$scope.$watchGroup(['targetObject', 'attach.allContainers'], updateMountPaths);
154+
$scope.$watch('attach.containers', updateMountPaths, true);
155+
156+
// Make sure the path for each item is unique.
157+
var updateItemPaths = function() {
158+
// Call `_.compact` to remove empty values.
159+
var paths = _.map($scope.attach.items, 'path');
160+
$scope.itemPaths = _.compact(paths);
161+
};
162+
$scope.$watch('attach.items', updateItemPaths, true);
163+
164+
$scope.addVolume = function() {
165+
if ($scope.forms.addConfigVolumeForm.$invalid) {
166+
return;
167+
}
168+
169+
var resource = $scope.targetObject;
170+
var source = _.get($scope, 'attach.source');
171+
var podTemplate = _.get(resource, 'spec.template');
172+
var name = generateName('volume-');
173+
var mountPath = _.get($scope, 'attach.mountPath');
174+
var newVolumeMount = {
175+
name: name,
176+
mountPath: mountPath
177+
};
178+
179+
// The volume mount is read-only for secrets.
180+
if (source.kind === 'Secret') {
181+
newVolumeMount.readOnly = true;
182+
}
183+
184+
// For each selected container, add the new volume mount.
185+
_.each(podTemplate.spec.containers, function(container) {
186+
if (isContainerSelected(container)) {
187+
container.volumeMounts = container.volumeMounts || [];
188+
container.volumeMounts.push(newVolumeMount);
189+
}
190+
});
191+
192+
var newVolume = {
193+
name: name
194+
};
195+
196+
var items;
197+
if ($scope.attach.pickKeys) {
198+
items = $scope.attach.items;
199+
}
200+
201+
switch (source.kind) {
202+
case 'ConfigMap':
203+
newVolume.configMap = {
204+
name: source.metadata.name,
205+
items: items
206+
};
207+
break;
208+
case 'Secret':
209+
newVolume.secret = {
210+
secretName: source.metadata.name,
211+
items: items
212+
};
213+
break;
214+
}
215+
216+
podTemplate.spec.volumes = podTemplate.spec.volumes || [];
217+
podTemplate.spec.volumes.push(newVolume);
218+
219+
// Clear any previous alerts.
220+
$scope.alerts = {};
221+
222+
$scope.disableInputs = true;
223+
DataService.update(resourceGroupVersion, resource.metadata.name, $scope.targetObject, context).then(
224+
function() {
225+
$window.history.back();
226+
},
227+
function(result) {
228+
displayError("An error occurred attaching the persistent volume claim to the " + $filter('humanizeKind')($routeParams.kind) + ".", getErrorDetails(result));
229+
}
230+
);
231+
};
232+
}));
233+
});

‎app/scripts/controllers/attachPVC.js

+17-68
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,8 @@ angular.module('openshiftConsole')
5353
persistentVolumeClaim: null,
5454
volumeName: null,
5555
mountPath: null,
56-
containers: {
57-
all: true,
58-
individual: {}
59-
}
56+
allContainers: true,
57+
containers: {}
6058
};
6159

6260
$scope.breadcrumbs = BreadcrumbsService.getBreadcrumbs({
@@ -88,20 +86,31 @@ angular.module('openshiftConsole')
8886
};
8987
};
9088

89+
var isContainerSelected = function(container) {
90+
return $scope.attach.allContainers || $scope.attach.containers[container.name];
91+
};
92+
93+
// Look at the existing mount paths so that we can warn if the new value is not unique.
94+
var updateMountPaths = function() {
95+
var podTemplate = _.get($scope, 'attach.resource.spec.template');
96+
$scope.existingMountPaths = StorageService.getMountsPaths(podTemplate, isContainerSelected);
97+
};
98+
$scope.$watchGroup(['attach.resource', 'attach.allContainers'], updateMountPaths);
99+
$scope.$watch('attach.containers', updateMountPaths, true);
100+
91101
// load resources required to show the page (list of pvcs and deployment or deployment config)
92102
var load = function() {
93103
DataService.get(resourceGroupVersion, $routeParams.name, context).then(
94104
function(resource) {
95-
angular.forEach(resource.spec.template.spec.containers, function(container) {
96-
$scope.attach.containers.individual[container.name] = true;
97-
});
98105
$scope.attach.resource = resource;
99106
$scope.breadcrumbs = BreadcrumbsService.getBreadcrumbs({
100107
object: resource,
101108
project: project,
102109
subpage: 'Add Storage',
103110
includeProject: true
104111
});
112+
var podTemplate = _.get(resource, 'spec.template');
113+
$scope.existingVolumeNames = StorageService.getVolumeNames(podTemplate);
105114
},
106115
function(e) {
107116
displayError($routeParams.name + " could not be loaded.", getErrorDetails(e));
@@ -116,55 +125,8 @@ angular.module('openshiftConsole')
116125
});
117126
};
118127

119-
var isVolumeNameUsed = function(name, podTemplate) {
120-
if (podTemplate.spec.volumes) {
121-
for (var i = 0; i < podTemplate.spec.volumes.length; i++) {
122-
var volume = podTemplate.spec.volumes[i];
123-
if (volume.name === name) {
124-
$scope.isVolumeNameUsed = true;
125-
return true;
126-
}
127-
}
128-
}
129-
$scope.isVolumeNameUsed = false;
130-
return false;
131-
};
132-
133-
var isVolumeMountPathUsed = function(name, mountPath, podTemplate) {
134-
if (podTemplate.spec.containers) {
135-
for (var i = 0; i < podTemplate.spec.containers.length; i++) {
136-
var container = podTemplate.spec.containers[i];
137-
if ($scope.attach.containers.all || $scope.attach.containers.individual[container.name]) {
138-
if (container.volumeMounts) {
139-
for (var j = 0; j < container.volumeMounts.length; j++) {
140-
var volumeMount = container.volumeMounts[j];
141-
if (volumeMount.mountPath === mountPath && name !== volumeMount.Name) {
142-
$scope.isVolumeMountPathUsed = true;
143-
return true;
144-
}
145-
}
146-
}
147-
}
148-
}
149-
}
150-
$scope.isVolumeMountPathUsed = false;
151-
return false;
152-
};
153-
154128
load();
155129

156-
$scope.containerToAttachProvided = function() {
157-
if ($scope.attach.containers.all) {
158-
return true;
159-
}
160-
for (var key in $scope.attach.containers.individual) {
161-
if ($scope.attach.containers.individual[key] === true) {
162-
return true;
163-
}
164-
}
165-
return false;
166-
};
167-
168130
$scope.attachPVC = function() {
169131
$scope.disableInputs = true;
170132

@@ -179,23 +141,10 @@ angular.module('openshiftConsole')
179141
var persistentVolumeClaim = $scope.attach.persistentVolumeClaim;
180142
var name = $scope.attach.volumeName;
181143
var mountPath = $scope.attach.mountPath;
182-
183-
// check the volume name wanted was not yet used in this pod template
184-
if (isVolumeNameUsed(name, podTemplate)) {
185-
$scope.disableInputs = false;
186-
return;
187-
}
188-
189144
if (mountPath) {
190-
// if we want to mount, check if the mount path is unique in this pod template
191-
if (isVolumeMountPathUsed(name, mountPath, podTemplate)) {
192-
$scope.disableInputs = false;
193-
return;
194-
}
195-
196145
// for each container in the pod spec, add the new volume mount
197146
angular.forEach(podTemplate.spec.containers, function(container) {
198-
if ($scope.attach.containers.all || $scope.attach.containers.individual[container.name]) {
147+
if (isContainerSelected(container)) {
199148
var newVolumeMount = StorageService.createVolumeMount(name, mountPath);
200149
if (!container.volumeMounts) {
201150
container.volumeMounts = [];

0 commit comments

Comments
 (0)