Merge pull request #2097 from benjaminapetersen/bpetersen/trello-api-groups-attach-pvc

Merged by openshift-bot

Author: OpenShift Bot

Diff for: app/scripts/controllers/attachPVC.js

@@ -67,6 +67,10 @@ angular.module('openshiftConsole')
       subpage: 'Add Storage'
     });
 
+    $scope.pvcVersion = APIService.getPreferredVersion('persistentvolumeclaims');
+    var resourceQuotasVersion = APIService.getPreferredVersion('resourcequotas');
+    var appliedClusterResourceQuotasVersion = APIService.getPreferredVersion('appliedclusterresourcequotas');
+
     ProjectsService
       .get($routeParams.project)
       .then(_.spread(function(project, context) {
@@ -132,18 +136,18 @@ angular.module('openshiftConsole')
             }
           );
 
-          DataService.list("persistentvolumeclaims", context).then(function(pvcs) {
+          DataService.list($scope.pvcVersion, context).then(function(pvcs) {
             $scope.pvcs = orderByDisplayName(pvcs.by("metadata.name"));
             if (!_.isEmpty($scope.pvcs) && !$scope.attach.persistentVolumeClaim) {
               $scope.attach.persistentVolumeClaim = _.head($scope.pvcs);
             }
           });
 
-          DataService.list('resourcequotas', { namespace: $scope.projectName }, function(quotaData) {
+          DataService.list(resourceQuotasVersion, { namespace: $scope.projectName }, function(quotaData) {
             $scope.quotas = quotaData.by('metadata.name');
             $scope.outOfClaims = QuotaService.isAnyStorageQuotaExceeded($scope.quotas, $scope.clusterQuotas);
           });
-          DataService.list('appliedclusterresourcequotas', { namespace: $scope.projectName }, function(quotaData) {
+          DataService.list(appliedClusterResourceQuotasVersion, { namespace: $scope.projectName }, function(quotaData) {
             $scope.clusterQuotas = quotaData.by('metadata.name');
             $scope.outOfClaims = QuotaService.isAnyStorageQuotaExceeded($scope.quotas, $scope.clusterQuotas);
           });

Diff for: app/views/attach-pvc.html

@@ -14,12 +14,12 @@ <h2 class="text-center">No persistent volume claims.</h2>
               but none are loaded on this project.
             </p>
 
-            <div ng-if="project && ('persistentvolumeclaims' | canI : 'create')" class="text-center">
+            <div ng-if="project && (pvcVersion | canI : 'create')" class="text-center">
               <a ng-href="project/{{project.metadata.name}}/create-pvc"
                  class="btn btn-primary">Create Storage</a>
             </div>
 
-            <p ng-if="project && !('persistentvolumeclaims' | canI : 'create')">
+            <p ng-if="project && !(pvcVersion | canI : 'create')">
               To claim storage from a persistent volume, refer to the documentation on <a target="_blank" ng-href="{{'persistent_volumes' | helpLink}}">using persistent volumes</a>.
             </p>
 
@@ -60,10 +60,10 @@ <h1>Add Storage to {{name}}</h1>
                     </tbody>
                   </table>
                 </div>
-                <div ng-if="!(project && ('persistentvolumeclaims' | canI : 'create'))" class="help-block">
+                <div ng-if="!(project && (pvcVersion | canI : 'create'))" class="help-block">
                   Select storage to use.
                 </div>
-                <div ng-if="project && ('persistentvolumeclaims' | canI : 'create')" class="help-block">
+                <div ng-if="project && (pvcVersion | canI : 'create')" class="help-block">
                   Select storage to use<span ng-if="!outOfClaims"> or <a ng-href="project/{{project.metadata.name}}/create-pvc" >create storage</a>.</span>
                   <span ng-if="outOfClaims">. You cannot create new storage since you are at quota.</span>
                 </div>

Diff for: dist/scripts/scripts.js

@@ -8406,30 +8406,32 @@ name: t.name,
 kind: t.kind,
 namespace: t.project,
 subpage: "Add Storage"
-}), d.get(t.project).then(_.spread(function(r, d) {
+}), n.pvcVersion = r.getPreferredVersion("persistentvolumeclaims");
+var v = r.getPreferredVersion("resourcequotas"), y = r.getPreferredVersion("appliedclusterresourcequotas");
+d.get(t.project).then(_.spread(function(r, d) {
 if (n.project = r, o.canI(h, "update", t.project)) {
-var m = e("orderByDisplayName"), f = e("getErrorDetails"), v = e("generateName"), y = function(e, t) {
+var m = e("orderByDisplayName"), f = e("getErrorDetails"), b = e("generateName"), C = function(e, t) {
 n.disableInputs = !0, u.addNotification({
 id: "attach-pvc-error",
 type: "error",
 message: e,
 details: t
 });
-}, b = function() {
+}, S = function() {
 u.hideNotification("attach-pvc-error");
 };
-n.$on("$destroy", b);
-var C = function() {
+n.$on("$destroy", S);
+var w = function() {
 a.history.back();
 };
-n.cancel = C;
-var S = function(e) {
+n.cancel = w;
+var k = function(e) {
 return n.attach.allContainers || n.attach.containers[e.name];
-}, w = function() {
+}, j = function() {
 var e = _.get(n, "attach.resource.spec.template");
-n.existingMountPaths = p.getMountPaths(e, S);
+n.existingMountPaths = p.getMountPaths(e, k);
 };
-n.$watchGroup([ "attach.resource", "attach.allContainers" ], w), n.$watch("attach.containers", w, !0);
+n.$watchGroup([ "attach.resource", "attach.allContainers" ], j), n.$watch("attach.containers", j, !0);
 s.get(h, t.name, d).then(function(e) {
 n.attach.resource = e, n.breadcrumbs = i.getBreadcrumbs({
 object: e,
@@ -8439,23 +8441,23 @@ subpage: "Add Storage"
 var t = _.get(e, "spec.template");
 n.existingVolumeNames = p.getVolumeNames(t);
 }, function(e) {
-y(t.name + " could not be loaded.", f(e));
-}), s.list("persistentvolumeclaims", d).then(function(e) {
+C(t.name + " could not be loaded.", f(e));
+}), s.list(n.pvcVersion, d).then(function(e) {
 n.pvcs = m(e.by("metadata.name")), _.isEmpty(n.pvcs) || n.attach.persistentVolumeClaim || (n.attach.persistentVolumeClaim = _.head(n.pvcs));
-}), s.list("resourcequotas", {
+}), s.list(v, {
 namespace: n.projectName
 }, function(e) {
 n.quotas = e.by("metadata.name"), n.outOfClaims = c.isAnyStorageQuotaExceeded(n.quotas, n.clusterQuotas);
-}), s.list("appliedclusterresourcequotas", {
+}), s.list(y, {
 namespace: n.projectName
 }, function(e) {
 n.clusterQuotas = e.by("metadata.name"), n.outOfClaims = c.isAnyStorageQuotaExceeded(n.quotas, n.clusterQuotas);
 }), n.attachPVC = function() {
-if (n.disableInputs = !0, b(), n.attachPVCForm.$valid) {
-n.attach.volumeName || (n.attach.volumeName = v("volume-"));
+if (n.disableInputs = !0, S(), n.attachPVCForm.$valid) {
+n.attach.volumeName || (n.attach.volumeName = b("volume-"));
 var e = n.attach.resource, a = _.get(e, "spec.template"), r = n.attach.persistentVolumeClaim, o = n.attach.volumeName, i = n.attach.mountPath, c = n.attach.subPath, l = n.attach.readOnly;
 i && angular.forEach(a.spec.containers, function(e) {
-if (S(e)) {
+if (k(e)) {
 var t = p.createVolumeMount(o, i, c, l);
 e.volumeMounts || (e.volumeMounts = []), e.volumeMounts.push(t);
 }
@@ -8467,9 +8469,9 @@ i || (e = "No mount path was provided. The volume reference was added to the con
 type: "success",
 message: "Persistent volume claim " + r.metadata.name + " added to " + g(t.kind) + " " + t.name + ".",
 details: e
-}), C();
+}), w();
 }, function(e) {
-y("An error occurred attaching the persistent volume claim to the " + g(t.kind) + ".", f(e)), n.disableInputs = !1;
+C("An error occurred attaching the persistent volume claim to the " + g(t.kind) + ".", f(e)), n.disableInputs = !1;
 });
 }
 };

Diff for: dist/scripts/templates.js

@@ -984,10 +984,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<p class=\"gutter-top\">\n" +
     "A <b>persistent volume claim</b> is required to attach to this {{kind | humanizeKind}}, but none are loaded on this project.\n" +
     "</p>\n" +
-    "<div ng-if=\"project && ('persistentvolumeclaims' | canI : 'create')\" class=\"text-center\">\n" +
+    "<div ng-if=\"project && (pvcVersion | canI : 'create')\" class=\"text-center\">\n" +
     "<a ng-href=\"project/{{project.metadata.name}}/create-pvc\" class=\"btn btn-primary\">Create Storage</a>\n" +
     "</div>\n" +
-    "<p ng-if=\"project && !('persistentvolumeclaims' | canI : 'create')\">\n" +
+    "<p ng-if=\"project && !(pvcVersion | canI : 'create')\">\n" +
     "To claim storage from a persistent volume, refer to the documentation on <a target=\"_blank\" ng-href=\"{{'persistent_volumes' | helpLink}}\">using persistent volumes</a>.\n" +
     "</p>\n" +
     "<p ng-if=\"attach.resource\"><a ng-href=\"{{attach.resource | navigateResourceURL}}\">Back to {{kind | humanizeKind}} {{name}}</a></p>\n" +
@@ -1021,10 +1021,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</tbody>\n" +
     "</table>\n" +
     "</div>\n" +
-    "<div ng-if=\"!(project && ('persistentvolumeclaims' | canI : 'create'))\" class=\"help-block\">\n" +
+    "<div ng-if=\"!(project && (pvcVersion | canI : 'create'))\" class=\"help-block\">\n" +
     "Select storage to use.\n" +
     "</div>\n" +
-    "<div ng-if=\"project && ('persistentvolumeclaims' | canI : 'create')\" class=\"help-block\">\n" +
+    "<div ng-if=\"project && (pvcVersion | canI : 'create')\" class=\"help-block\">\n" +
     "Select storage to use<span ng-if=\"!outOfClaims\"> or <a ng-href=\"project/{{project.metadata.name}}/create-pvc\">create storage</a>.</span>\n" +
     "<span ng-if=\"outOfClaims\">. You cannot create new storage since you are at quota.</span>\n" +
     "</div>\n" +