Merge pull request #854 from zherman0/bug1390826

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/controllers/createPersistentVolumeClaim.js

@@ -67,28 +67,25 @@ angular.module('openshiftConsole')
           spec: {
             resources: {
               requests:{}
-            },
-              selector:{
-                matchLabels:{}
             }
           }
         };
 
-          pvc.spec.accessModes = [$scope.claim.accessModes || "ReadWriteOnce"] ;
-          var unit =  $scope.claim.unit || "Mi";
-          pvc.spec.resources.requests.storage = $scope.claim.amount + unit;
-          if ($scope.claim.selectedLabels) {
-            pvc.spec.selector.matchLabels = keyValueEditorUtils.mapEntries( keyValueEditorUtils.compactEntries($scope.claim.selectedLabels) );
-          }
-          else {
-            pvc.spec.selector = {};
-          }
-          if ($scope.claim.storageClass ) {
-            //we can only have one storage class per claim
-            pvc.metadata.annotations["volume.beta.kubernetes.io/storage-class"] = $scope.claim.storageClass.metadata.name;
+        pvc.spec.accessModes = [$scope.claim.accessModes || "ReadWriteOnce"] ;
+        var unit =  $scope.claim.unit || "Mi";
+        pvc.spec.resources.requests.storage = $scope.claim.amount + unit;
+        if ($scope.claim.selectedLabels) {
+          var selectorLabel = keyValueEditorUtils.mapEntries( keyValueEditorUtils.compactEntries($scope.claim.selectedLabels) );
+          if (!_.isEmpty(selectorLabel)) {
+            _.set(pvc, 'spec.selector.matchLabels', selectorLabel);
           }
+        }
+        if ($scope.claim.storageClass ) {
+          //we can only have one storage class per claim
+          pvc.metadata.annotations["volume.beta.kubernetes.io/storage-class"] = $scope.claim.storageClass.metadata.name;
+        }
 
-          return pvc;
+        return pvc;
         }
 
     }));

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

@@ -30,6 +30,7 @@
                  name="storageClass"
                  ng-model="claim.storageClass">
             No Storage Class
+          <div class="help-block">No storage class will be assigned unless a default class has been assigned by the system administrator.</div>
         </label>
       </div>
     </div>

dist/scripts/scripts.js

@@ -7989,15 +7989,16 @@ annotations:{}
 spec:{
 resources:{
 requests:{}
-},
-selector:{
-matchLabels:{}
 }
 }
 };
 a.spec.accessModes = [ c.claim.accessModes || "ReadWriteOnce" ];
 var b = c.claim.unit || "Mi";
-return a.spec.resources.requests.storage = c.claim.amount + b, c.claim.selectedLabels ? a.spec.selector.matchLabels = i.mapEntries(i.compactEntries(c.claim.selectedLabels)) :a.spec.selector = {}, c.claim.storageClass && (a.metadata.annotations["volume.beta.kubernetes.io/storage-class"] = c.claim.storageClass.metadata.name), a;
+if (a.spec.resources.requests.storage = c.claim.amount + b, c.claim.selectedLabels) {
+var d = i.mapEntries(i.compactEntries(c.claim.selectedLabels));
+_.isEmpty(d) || _.set(a, "spec.selector.matchLabels", d);
+}
+return c.claim.storageClass && (a.metadata.annotations["volume.beta.kubernetes.io/storage-class"] = c.claim.storageClass.metadata.name), a;
 }
 c.project = b, c.breadcrumbs[0].title = a("displayName")(b), c.createPersistentVolumeClaim = function() {
 if (c.createPersistentVolumeClaimForm.$valid) {

dist/scripts/templates.js

@@ -6670,6 +6670,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<label>\n" +
     "<input type=\"radio\" name=\"storageClass\" ng-model=\"claim.storageClass\">\n" +
     "No Storage Class\n" +
+    "<div class=\"help-block\">No storage class will be assigned unless a default class has been assigned by the system administrator.</div>\n" +
     "</label>\n" +
     "</div>\n" +
     "</div>\n" +