Skip to content

Commit 2cb38e1

Browse files
author
OpenShift Bot
authored
Merge pull request #997 from zherman0/StorageClassesSelect
Merged by openshift-bot
2 parents 04dcf30 + 888a686 commit 2cb38e1

File tree

5 files changed

+102
-57
lines changed

5 files changed

+102
-57
lines changed

‎app/scripts/controllers/createPersistentVolumeClaim.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ angular.module('openshiftConsole')
9595
_.set(pvc, 'spec.selector.matchLabels', selectorLabel);
9696
}
9797
}
98-
if ($scope.claim.storageClass ) {
98+
if ($scope.claim.storageClass && $scope.claim.storageClass.metadata.name !== "No Storage Class") {
9999
//we can only have one storage class per claim
100100
pvc.metadata.annotations["volume.beta.kubernetes.io/storage-class"] = $scope.claim.storageClass.metadata.name;
101101
}

‎app/scripts/directives/oscPersistentVolumeClaim.js

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ angular.module("openshiftConsole")
1818
var usageValue = $filter('usageValue');
1919

2020
scope.storageClasses = [];
21+
scope.defaultStorageClass = "";
2122
scope.claim.unit = 'Gi';
2223
scope.units = [{
2324
value: "Mi",
@@ -81,9 +82,28 @@ angular.module("openshiftConsole")
8182
scope.persistentVolumeClaimForm.capacity.$setValidity('limitRangeMax', maxValid);
8283
};
8384

84-
DataService.list({group: 'storage.k8s.io', resource: 'storageclasses'}, {}, function(storageClasses) {
85-
scope.storageClasses = storageClasses.by('metadata.name');
86-
}, {errorNotification: false});
85+
DataService.list({group: 'storage.k8s.io', resource: 'storageclasses'}, {}, function(storageClassData) {
86+
var storageClasses = storageClassData.by('metadata.name');
87+
scope.storageClasses = _.sortBy(storageClasses, 'metadata.name');
88+
var annotation = $filter('annotation');
89+
scope.defaultStorageClass = _.find(scope.storageClasses, function(storageClass) {
90+
return annotation(storageClass, 'storageclass.beta.kubernetes.io/is-default-class') === 'true';
91+
});
92+
if (!scope.defaultStorageClass) { //if there is no default, set a no storage class option
93+
var noclass = {
94+
metadata: {
95+
name: "No Storage Class",
96+
labels: {},
97+
annotations: {
98+
description: "No storage class will be assigned"
99+
}
100+
}
101+
};
102+
scope.storageClasses.unshift(noclass);
103+
} else {
104+
scope.claim.storageClass = scope.defaultStorageClass;
105+
}
106+
}, {errorNotification: false});
87107

88108
DataService.list('limitranges', { namespace: scope.projectName }, function(limitRangeData) {
89109
var limitRanges = limitRangeData.by('metadata.name');

‎app/views/directives/osc-persistent-volume-claim.html

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,43 @@
22
<fieldset ng-disabled="claimDisabled">
33
<div ng-show="storageClasses | hashSize" class="form-group">
44
<!--storage class-->
5-
<label class="required">Storage Classes</label>
6-
<div id="claim-storage-class-help" class="help-block mar-bottom-lg">
5+
<label>Storage Class</label>
6+
<div>
7+
<ui-select
8+
ng-if="storageClasses"
9+
ng-model="claim.storageClass"
10+
theme="bootstrap"
11+
search-enabled="true"
12+
title="Select a storage class"
13+
class="select-role">
14+
<ui-select-match placeholder="Select a storage class">
15+
<span>
16+
{{$select.selected.metadata.name}}
17+
</span>
18+
</ui-select-match>
19+
<ui-select-choices
20+
repeat="sclass as sclass in storageClasses | toArray | filter : { metadata: { name: $select.search } } ">
21+
<div>
22+
<span ng-bind-html="sclass.metadata.name | highlight : $select.search"></span>
23+
<span ng-if="sclass | annotation : 'description'" class="text-muted">
24+
<small>&ndash;
25+
<span ng-if="sclass.parameters.type">Type: {{sclass.parameters.type}} | </span>
26+
<span ng-if="sclass.parameters.zone">Zone: {{sclass.parameters.zone}} | </span>
27+
{{sclass | annotation : 'description'}}
28+
</small>
29+
</span>
30+
</div>
31+
</ui-select-choices>
32+
</ui-select>
33+
</div>
34+
<div id="claim-storage-class-help" class="help-block">
735
Storage classes are set by the administrator to define types of storage the users can select.
36+
<span ng-if="defaultStorageClass"> If another storage class is not chosen, the default storage class <var>{{defaultStorageClass.metadata.name}}</var> will be used.</span>
837
<div class="learn-more-block">
9-
<a ng-href="{{'storage_classes' | helpLink}}" target="_blank">Learn More&nbsp;<i class="fa fa-external-link" aria-hidden="true"></i></a>
10-
</div>
11-
</div>
12-
<div ng-repeat="sclass in storageClasses track by (sclass | uid)" id="storageclass-{{sclass.metadata.name}}">
13-
<div class="radio">
14-
<label>
15-
<input type="radio"
16-
name="storageClass"
17-
ng-value="sclass"
18-
ng-model="claim.storageClass">
19-
{{sclass.metadata.name}}
20-
</label>
21-
</div>
22-
<div class="help-block">
23-
Type: {{sclass.parameters.type}} | Zone: {{sclass.parameters.zone}}
24-
<span ng-if="sclass.metadata.annotations.description"> | {{sclass.metadata.annotations.description}}</span>
38+
<a ng-href="{{'storage_classes' | helpLink}}" target="_blank">Learn More&nbsp;<i class="fa fa-external-link" aria-hidden="true"> </i></a>
2539
</div>
2640
</div>
27-
<div class="radio">
28-
<label>
29-
<input type="radio"
30-
name="storageClass"
31-
ng-model="claim.storageClass">
32-
No Storage Class
33-
<div class="help-block">No storage class will be assigned unless a default class has been assigned by the system administrator.</div>
34-
</label>
35-
</div>
41+
3642
</div>
3743

3844
<!-- Name -->

‎dist/scripts/scripts.js

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8931,7 +8931,7 @@ if (a.spec.resources.requests.storage = c.claim.amount + b, c.claim.selectedLabe
89318931
var d = j.mapEntries(j.compactEntries(c.claim.selectedLabels));
89328932
_.isEmpty(d) || _.set(a, "spec.selector.matchLabels", d);
89338933
}
8934-
return c.claim.storageClass && (a.metadata.annotations["volume.beta.kubernetes.io/storage-class"] = c.claim.storageClass.metadata.name), a;
8934+
return c.claim.storageClass && "No Storage Class" !== c.claim.storageClass.metadata.name && (a.metadata.annotations["volume.beta.kubernetes.io/storage-class"] = c.claim.storageClass.metadata.name), a;
89358935
}
89368936
return c.project = e, c.breadcrumbs[0].title = a("displayName")(e), f.canI("persistentvolumeclaims", "create", b.project) ? void (c.createPersistentVolumeClaim = function() {
89378937
if (c.createPersistentVolumeClaimForm.$valid) {
@@ -10122,7 +10122,7 @@ projectName:"="
1012210122
templateUrl:"views/directives/osc-persistent-volume-claim.html",
1012310123
link:function(e) {
1012410124
var f = a("amountAndUnit"), g = a("usageValue");
10125-
e.storageClasses = [], e.claim.unit = "Gi", e.units = [ {
10125+
e.storageClasses = [], e.defaultStorageClass = "", e.claim.unit = "Gi", e.units = [ {
1012610126
value:"Mi",
1012710127
label:"MiB"
1012810128
}, {
@@ -10163,8 +10163,24 @@ a && b && (d = a >= b), a && c && (f = a <= c), e.persistentVolumeClaimForm.capa
1016310163
b.list({
1016410164
group:"storage.k8s.io",
1016510165
resource:"storageclasses"
10166-
}, {}, function(a) {
10167-
e.storageClasses = a.by("metadata.name");
10166+
}, {}, function(b) {
10167+
var c = b.by("metadata.name");
10168+
e.storageClasses = _.sortBy(c, "metadata.name");
10169+
var d = a("annotation");
10170+
if (e.defaultStorageClass = _.find(e.storageClasses, function(a) {
10171+
return "true" === d(a, "storageclass.beta.kubernetes.io/is-default-class");
10172+
}), e.defaultStorageClass) e.claim.storageClass = e.defaultStorageClass; else {
10173+
var f = {
10174+
metadata:{
10175+
name:"No Storage Class",
10176+
labels:{},
10177+
annotations:{
10178+
description:"No storage class will be assigned"
10179+
}
10180+
}
10181+
};
10182+
e.storageClasses.unshift(f);
10183+
}
1016810184
}, {
1016910185
errorNotification:!1
1017010186
}), b.list("limitranges", {

‎dist/scripts/templates.js

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7509,31 +7509,34 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
75097509
"<fieldset ng-disabled=\"claimDisabled\">\n" +
75107510
"<div ng-show=\"storageClasses | hashSize\" class=\"form-group\">\n" +
75117511
"\n" +
7512-
"<label class=\"required\">Storage Classes</label>\n" +
7513-
"<div id=\"claim-storage-class-help\" class=\"help-block mar-bottom-lg\">\n" +
7514-
"Storage classes are set by the administrator to define types of storage the users can select.\n" +
7515-
"<div class=\"learn-more-block\">\n" +
7516-
"<a ng-href=\"{{'storage_classes' | helpLink}}\" target=\"_blank\">Learn More&nbsp;<i class=\"fa fa-external-link\" aria-hidden=\"true\"></i></a>\n" +
7517-
"</div>\n" +
7518-
"</div>\n" +
7519-
"<div ng-repeat=\"sclass in storageClasses track by (sclass | uid)\" id=\"storageclass-{{sclass.metadata.name}}\">\n" +
7520-
"<div class=\"radio\">\n" +
7521-
"<label>\n" +
7522-
"<input type=\"radio\" name=\"storageClass\" ng-value=\"sclass\" ng-model=\"claim.storageClass\">\n" +
7523-
"{{sclass.metadata.name}}\n" +
7524-
"</label>\n" +
7512+
"<label>Storage Class</label>\n" +
7513+
"<div>\n" +
7514+
"<ui-select ng-if=\"storageClasses\" ng-model=\"claim.storageClass\" theme=\"bootstrap\" search-enabled=\"true\" title=\"Select a storage class\" class=\"select-role\">\n" +
7515+
"<ui-select-match placeholder=\"Select a storage class\">\n" +
7516+
"<span>\n" +
7517+
"{{$select.selected.metadata.name}}\n" +
7518+
"</span>\n" +
7519+
"</ui-select-match>\n" +
7520+
"<ui-select-choices repeat=\"sclass as sclass in storageClasses | toArray | filter : { metadata: { name: $select.search } } \">\n" +
7521+
"<div>\n" +
7522+
"<span ng-bind-html=\"sclass.metadata.name | highlight : $select.search\"></span>\n" +
7523+
"<span ng-if=\"sclass | annotation : 'description'\" class=\"text-muted\">\n" +
7524+
"<small>&ndash;\n" +
7525+
"<span ng-if=\"sclass.parameters.type\">Type: {{sclass.parameters.type}} | </span>\n" +
7526+
"<span ng-if=\"sclass.parameters.zone\">Zone: {{sclass.parameters.zone}} | </span>\n" +
7527+
"{{sclass | annotation : 'description'}}\n" +
7528+
"</small>\n" +
7529+
"</span>\n" +
75257530
"</div>\n" +
7526-
"<div class=\"help-block\">\n" +
7527-
"Type: {{sclass.parameters.type}} | Zone: {{sclass.parameters.zone}}\n" +
7528-
"<span ng-if=\"sclass.metadata.annotations.description\"> | {{sclass.metadata.annotations.description}}</span>\n" +
7531+
"</ui-select-choices>\n" +
7532+
"</ui-select>\n" +
75297533
"</div>\n" +
7534+
"<div id=\"claim-storage-class-help\" class=\"help-block\">\n" +
7535+
"Storage classes are set by the administrator to define types of storage the users can select.\n" +
7536+
"<span ng-if=\"defaultStorageClass\"> If another storage class is not chosen, the default storage class <var>{{defaultStorageClass.metadata.name}}</var> will be used.</span>\n" +
7537+
"<div class=\"learn-more-block\">\n" +
7538+
"<a ng-href=\"{{'storage_classes' | helpLink}}\" target=\"_blank\">Learn More&nbsp;<i class=\"fa fa-external-link\" aria-hidden=\"true\"> </i></a>\n" +
75307539
"</div>\n" +
7531-
"<div class=\"radio\">\n" +
7532-
"<label>\n" +
7533-
"<input type=\"radio\" name=\"storageClass\" ng-model=\"claim.storageClass\">\n" +
7534-
"No Storage Class\n" +
7535-
"<div class=\"help-block\">No storage class will be assigned unless a default class has been assigned by the system administrator.</div>\n" +
7536-
"</label>\n" +
75377540
"</div>\n" +
75387541
"</div>\n" +
75397542
"\n" +

0 commit comments

Comments
 (0)