Skip to content

Commit 40eedd8

Browse files
spadgettspadgett
committed
Let users remove volumes
1 parent 9e57f47 commit 40eedd8

16 files changed

+559
-231
lines changed

‎app/index.html

+1
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ <h1>JavaScript Required</h1>
205205
<script src="scripts/services/quota.js"></script>
206206
<script src="scripts/services/labels.js"></script>
207207
<script src="scripts/services/catalog.js"></script>
208+
<script src="scripts/services/modals.js"></script>
208209
<script src="scripts/controllers/projects.js"></script>
209210
<script src="scripts/controllers/pods.js"></script>
210211
<script src="scripts/controllers/pod.js"></script>

‎app/scripts/controllers/deployment.js

+44
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ angular.module('openshiftConsole')
1616
DeploymentsService,
1717
HPAService,
1818
ImageStreamResolver,
19+
ModalsService,
1920
Navigate,
2021
Logger,
2122
ProjectsService,
23+
StorageService,
2224
keyValueEditorUtils) {
2325
var imageStreamImageRefByDockerReference = {}; // lets us determine if a particular container's docker image reference belongs to an imageStream
2426

@@ -241,6 +243,48 @@ angular.module('openshiftConsole')
241243
});
242244
};
243245

246+
$scope.removeVolume = function(volume) {
247+
var details;
248+
if (_.get($scope, 'deployment.spec.paused')) {
249+
details = "This will remove the volume from the deployment.";
250+
} else {
251+
details = "This will remove the volume from the deployment and start a new rollout.";
252+
}
253+
254+
if (volume.persistentVolumeClaim) {
255+
details += " It will not delete the persistent volume claim.";
256+
} else if (volume.secret) {
257+
details += " It will not delete the secret.";
258+
} else if (volume.configMap) {
259+
details += " It will not delete the config map.";
260+
}
261+
262+
var confirm = ModalsService.confirm({
263+
message: "Remove volume " + volume.name + "?",
264+
details: details,
265+
okButtonText: "Remove",
266+
okButtonClass: "btn-danger",
267+
cancelButtonText: "Cancel"
268+
});
269+
270+
var showError = function(e) {
271+
$scope.alerts["remove-volume-error"] = {
272+
type: "error",
273+
message: "An error occurred removing the volume.",
274+
details: $filter('getErrorDetails')(e)
275+
};
276+
};
277+
278+
var removeVolume = function() {
279+
// No-op on success since the page updates.
280+
StorageService
281+
.removeVolume($scope.deployment, volume, context)
282+
.then(_.noop, showError);
283+
};
284+
285+
confirm.then(removeVolume);
286+
};
287+
244288
$scope.$on('$destroy', function(){
245289
DataService.unwatchAll(watches);
246290
});

‎app/scripts/controllers/deploymentConfig.js

+55-4
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ angular.module('openshiftConsole')
1717
DeploymentsService,
1818
HPAService,
1919
ImageStreamResolver,
20+
ModalsService,
2021
Navigate,
2122
Logger,
2223
ProjectsService,
24+
StorageService,
2325
LabelFilter,
2426
labelNameFilter,
2527
keyValueEditorUtils) {
@@ -291,8 +293,7 @@ angular.module('openshiftConsole')
291293

292294
$scope.scale = function(replicas) {
293295
var showScalingError = function(result) {
294-
$scope.alerts = $scope.alerts || {};
295-
$scope.alerts["scale"] = {
296+
$scope.alerts["scale-error"] = {
296297
type: "error",
297298
message: "An error occurred scaling the deployment config.",
298299
details: $filter('getErrorDetails')(result)
@@ -309,15 +310,65 @@ angular.module('openshiftConsole')
309310
// Failure
310311
function(e) {
311312
$scope.updatingPausedState = false;
312-
$scope.alerts = $scope.alerts || {};
313-
$scope.alerts["scale"] = {
313+
$scope.alerts["pause-error"] = {
314314
type: "error",
315315
message: "An error occurred " + (paused ? "pausing" : "resuming") + " the deployment config.",
316316
details: $filter('getErrorDetails')(e)
317317
};
318318
});
319319
};
320320

321+
var isConfigChangeActive = function() {
322+
if (_.get($scope, 'deploymentConfig.spec.paused')) {
323+
return false;
324+
}
325+
326+
var triggers = _.get($scope, 'deploymentConfig.spec.triggers', []);
327+
return _.some(triggers, { type: 'ConfigChange' });
328+
};
329+
330+
$scope.removeVolume = function(volume) {
331+
var details;
332+
if (isConfigChangeActive()) {
333+
details = "This will remove the volume from the deployment config and trigger a new deployment.";
334+
} else {
335+
details = "This will remove the volume from the deployment config.";
336+
}
337+
338+
if (volume.persistentVolumeClaim) {
339+
details += " It will not delete the persistent volume claim.";
340+
} else if (volume.secret) {
341+
details += " It will not delete the secret.";
342+
} else if (volume.configMap) {
343+
details += " It will not delete the config map.";
344+
}
345+
346+
var confirm = ModalsService.confirm({
347+
message: "Remove volume " + volume.name + "?",
348+
details: details,
349+
okButtonText: "Remove",
350+
okButtonClass: "btn-danger",
351+
cancelButtonText: "Cancel"
352+
});
353+
354+
var showError = function(e) {
355+
$scope.alerts["remove-volume-error"] = {
356+
type: "error",
357+
message: "An error occurred removing the volume.",
358+
details: $filter('getErrorDetails')(e)
359+
};
360+
};
361+
362+
var removeVolume = function() {
363+
// No-op on success since the page updates.
364+
StorageService
365+
.removeVolume($scope.deploymentConfig, volume, context)
366+
.then(_.noop, showError);
367+
};
368+
369+
confirm.then(removeVolume);
370+
};
371+
321372
$scope.$on('$destroy', function(){
322373
DataService.unwatchAll(watches);
323374
});

‎app/scripts/controllers/replicaSet.js

+42-4
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ angular.module('openshiftConsole')
1414
AlertMessageService,
1515
BreadcrumbsService,
1616
DataService,
17-
HPAService,
18-
MetricsService,
19-
ProjectsService,
2017
DeploymentsService,
18+
HPAService,
2119
ImageStreamResolver,
22-
Navigate,
2320
Logger,
21+
MetricsService,
22+
ModalsService,
23+
Navigate,
24+
ProjectsService,
25+
StorageService,
2426
keyValueEditorUtils,
2527
kind) {
2628
var hasDC = false;
@@ -536,6 +538,42 @@ angular.module('openshiftConsole')
536538
return $scope.isActive && !inProgressDeployment;
537539
};
538540

541+
$scope.removeVolume = function(volume) {
542+
var details = "This will remove the volume from the " + $filter('humanizeKind')($scope.replicaSet.kind) + ".";
543+
if (volume.persistentVolumeClaim) {
544+
details += " It will not delete the persistent volume claim.";
545+
} else if (volume.secret) {
546+
details += " It will not delete the secret.";
547+
} else if (volume.configMap) {
548+
details += " It will not delete the config map.";
549+
}
550+
551+
var confirm = ModalsService.confirm({
552+
message: "Remove volume " + volume.name + "?",
553+
details: details,
554+
okButtonText: "Remove",
555+
okButtonClass: "btn-danger",
556+
cancelButtonText: "Cancel"
557+
});
558+
559+
var showError = function(e) {
560+
$scope.alerts["remove-volume-error"] = {
561+
type: "error",
562+
message: "An error occurred removing the volume.",
563+
details: $filter('getErrorDetails')(e)
564+
};
565+
};
566+
567+
var removeVolume = function() {
568+
// No-op on success since the page updates.
569+
StorageService
570+
.removeVolume($scope.replicaSet, volume, context)
571+
.then(_.noop, showError);
572+
};
573+
574+
confirm.then(removeVolume);
575+
};
576+
539577
$scope.$on('$destroy', function(){
540578
DataService.unwatchAll(watches);
541579
});

‎app/scripts/directives/resources.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,9 @@ angular.module('openshiftConsole')
120120
restrict: 'E',
121121
scope: {
122122
volumes: '=',
123-
namespace: '='
123+
namespace: '=',
124+
canRemove: '=?',
125+
removeFn: '&?'
124126
},
125127
templateUrl: 'views/_volumes.html'
126128
};

‎app/scripts/services/modals.js

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
'use strict';
2+
3+
angular.module("openshiftConsole")
4+
.factory("ModalsService", function($uibModal) {
5+
return {
6+
// Show a confirm dialog using the provided modal config and return a promise.
7+
// See app/scripts/controllers/modals/confirmModal.js
8+
confirm: function(modalConfig) {
9+
var modalInstance = $uibModal.open({
10+
animation: true,
11+
templateUrl: 'views/modals/confirm.html',
12+
controller: 'ConfirmModalController',
13+
resolve: {
14+
modalConfig: modalConfig
15+
}
16+
});
17+
18+
return modalInstance.result;
19+
}
20+
};
21+
});

‎app/scripts/services/storage.js

+20-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
angular.module("openshiftConsole")
4-
.factory("StorageService", function() {
4+
.factory("StorageService", function(APIService, DataService) {
55
return {
66
createVolume: function(name, persistentVolumeClaim) {
77
return {
@@ -11,17 +11,20 @@ angular.module("openshiftConsole")
1111
}
1212
};
1313
},
14+
1415
createVolumeMount: function(name, mountPath) {
1516
return {
1617
name: name,
1718
mountPath: mountPath
1819
};
1920
},
21+
2022
// Gets the volume names currently defined in the pod template.
2123
getVolumeNames: function(podTemplate) {
2224
var volumes = _.get(podTemplate, 'spec.volumes', []);
2325
return _.map(volumes, 'name');
2426
},
27+
2528
// Gets the mount paths currently defined in the pod template. An
2629
// optional filter function for matching specific containers can be used.
2730
getMountPaths: function(podTemplate, /* optional function */ matchContainer) {
@@ -39,6 +42,22 @@ angular.module("openshiftConsole")
3942
});
4043

4144
return mountPaths;
45+
},
46+
47+
// Removes the volume and any container volume mounts.
48+
removeVolume: function(object, volume, context) {
49+
var copy = angular.copy(object);
50+
51+
var volumes = _.get(copy, 'spec.template.spec.volumes');
52+
_.remove(volumes, { name: volume.name });
53+
54+
var containers = _.get(copy, 'spec.template.spec.containers');
55+
_.each(containers, function(container) {
56+
_.remove(container.volumeMounts, { name: volume.name });
57+
});
58+
59+
var resource = APIService.objectToResourceGroupVersion(copy);
60+
return DataService.update(resource, copy.metadata.name, copy, context);
4261
}
4362
};
4463
});

‎app/styles/_core.less

+5
Original file line numberDiff line numberDiff line change
@@ -920,6 +920,11 @@ a.disabled-link {
920920
vertical-align: middle;
921921
}
922922

923+
.header-actions {
924+
.small();
925+
margin-left: 5px;
926+
}
927+
923928
.modal-resource-action {
924929
background-color: @gray-lighter;
925930
h1 {

‎app/views/_volumes.html

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44
namespace
55
-->
66
<div ng-repeat="volume in volumes">
7-
<h5>{{volume.name}}</h5>
7+
<h4>
8+
{{volume.name}}
9+
<span ng-if="canRemove" class="header-actions">
10+
<a href="" ng-click="removeFn({volume: volume})">Remove</a>
11+
</span>
12+
</h4>
813
<dl class="dl-horizontal left">
914
<div ng-if="volume.secret">
1015
<dt>Type:</dt>

0 commit comments

Comments
 (0)