Update CreatePersistentVolumeClaimController to use getPreferredVersion

Author: benjaminapetersen

app/scripts/controllers/createPersistentVolumeClaim.js

@@ -13,6 +13,7 @@ angular.module('openshiftConsole')
                        $routeParams,
                        $scope,
                        $window,
+                       APIService,
                        ApplicationGenerator,
                        AuthorizationService,
                        DataService,
@@ -24,6 +25,8 @@ angular.module('openshiftConsole')
     $scope.accessModes="ReadWriteOnce";
     $scope.claim = {};
 
+    var persistentVolumeClaimsVersion = APIService.getPreferredVersion('persistentvolumeclaims');
+
     $scope.breadcrumbs = [
       {
         title: "Storage",
@@ -49,7 +52,7 @@ angular.module('openshiftConsole')
       .then(_.spread(function(project, context) {
         $scope.project = project;
 
-        if (!AuthorizationService.canI('persistentvolumeclaims', 'create', $routeParams.project)) {
+        if (!AuthorizationService.canI(persistentVolumeClaimsVersion, 'create', $routeParams.project)) {
           Navigate.toErrorPage('You do not have authority to create persistent volume claims in project ' + $routeParams.project + '.', 'access_denied');
           return;
         }
@@ -59,7 +62,8 @@ angular.module('openshiftConsole')
           if ($scope.createPersistentVolumeClaimForm.$valid) {
             $scope.disableInputs = true;
             var claim = generatePersistentVolumeClaim();
-            DataService.create('persistentvolumeclaims', null, claim, context)
+            var createClaimVersion = APIService.objectToResourceGroupVersion(claim);
+            DataService.create(createClaimVersion, null, claim, context)
               .then(function(claim) { // Success
                 NotificationsService.addNotification({
                   type: "success",

dist/scripts/scripts.js

@@ -8677,22 +8677,24 @@ kubernetes: n.VERSION.kubernetes
 };
 } ]), angular.module("openshiftConsole").controller("CommandLineController", [ "$scope", "DataService", "AuthService", "Constants", function(e, t, n, a) {
 n.withUser(), e.cliDownloadURL = a.CLI, e.cliDownloadURLPresent = e.cliDownloadURL && !_.isEmpty(e.cliDownloadURL), e.loginBaseURL = t.openshiftAPIBaseUrl(), a.DISABLE_COPY_LOGIN_COMMAND || (e.sessionToken = n.UserStore().getToken());
-} ]), angular.module("openshiftConsole").controller("CreatePersistentVolumeClaimController", [ "$filter", "$routeParams", "$scope", "$window", "ApplicationGenerator", "AuthorizationService", "DataService", "Navigate", "NotificationsService", "ProjectsService", "keyValueEditorUtils", function(e, t, n, a, r, o, i, s, c, l, u) {
-n.projectName = t.project, n.accessModes = "ReadWriteOnce", n.claim = {}, n.breadcrumbs = [ {
+} ]), angular.module("openshiftConsole").controller("CreatePersistentVolumeClaimController", [ "$filter", "$routeParams", "$scope", "$window", "APIService", "ApplicationGenerator", "AuthorizationService", "DataService", "Navigate", "NotificationsService", "ProjectsService", "keyValueEditorUtils", function(e, t, n, a, r, o, i, s, c, l, u, d) {
+n.projectName = t.project, n.accessModes = "ReadWriteOnce", n.claim = {};
+var p = r.getPreferredVersion("persistentvolumeclaims");
+n.breadcrumbs = [ {
 title: "Storage",
 link: "project/" + n.projectName + "/browse/storage"
 }, {
 title: "Create Storage"
 } ];
-var d = function() {
-c.hideNotification("create-pvc-error");
+var m = function() {
+l.hideNotification("create-pvc-error");
 };
-n.$on("$destroy", d);
-var p = function() {
+n.$on("$destroy", m);
+var f = function() {
 a.history.back();
 };
-n.cancel = p, l.get(t.project).then(_.spread(function(a, r) {
-function l() {
+n.cancel = f, u.get(t.project).then(_.spread(function(a, o) {
+function u() {
 var e = {
 kind: "PersistentVolumeClaim",
 apiVersion: "v1",
@@ -8710,30 +8712,30 @@ requests: {}
 e.spec.accessModes = [ n.claim.accessModes || "ReadWriteOnce" ];
 var t = n.claim.unit || "Mi";
 if (e.spec.resources.requests.storage = n.claim.amount + t, n.claim.selectedLabels) {
-var a = u.mapEntries(u.compactEntries(n.claim.selectedLabels));
+var a = d.mapEntries(d.compactEntries(n.claim.selectedLabels));
 _.isEmpty(a) || _.set(e, "spec.selector.matchLabels", a);
 }
 return n.claim.storageClass && "No Storage Class" !== n.claim.storageClass.metadata.name && (e.metadata.annotations["volume.beta.kubernetes.io/storage-class"] = n.claim.storageClass.metadata.name), e;
 }
-n.project = a, o.canI("persistentvolumeclaims", "create", t.project) ? n.createPersistentVolumeClaim = function() {
-if (d(), n.createPersistentVolumeClaimForm.$valid) {
+n.project = a, i.canI(p, "create", t.project) ? n.createPersistentVolumeClaim = function() {
+if (m(), n.createPersistentVolumeClaimForm.$valid) {
 n.disableInputs = !0;
-var t = l();
-i.create("persistentvolumeclaims", null, t, r).then(function(e) {
-c.addNotification({
+var t = u(), a = r.objectToResourceGroupVersion(t);
+s.create(a, null, t, o).then(function(e) {
+l.addNotification({
 type: "success",
 message: "Persistent volume claim " + e.metadata.name + " successfully created."
-}), p();
+}), f();
 }, function(t) {
-n.disableInputs = !1, c.addNotification({
+n.disableInputs = !1, l.addNotification({
 id: "create-pvc-error",
 type: "error",
 message: "An error occurred requesting storage.",
 details: e("getErrorDetails")(t)
 });
 });
 }
-} : s.toErrorPage("You do not have authority to create persistent volume claims in project " + t.project + ".", "access_denied");
+} : c.toErrorPage("You do not have authority to create persistent volume claims in project " + t.project + ".", "access_denied");
 }));
 } ]), angular.module("openshiftConsole").directive("buildClose", [ "$window", function(e) {
 var t = function(e) {