Update addConfigVolume controller

Author: benjaminapetersen

app/scripts/controllers/addConfigVolume.js

@@ -137,7 +137,7 @@ angular.module('openshiftConsole')
           }
         );
 
-        DataService.list("configmaps", context, null, { errorNotification: false }).then(function(configMapData) {
+        DataService.list(APIService.getPreferredVersion('configmaps'), context, null, { errorNotification: false }).then(function(configMapData) {
           $scope.configMaps = orderByDisplayName(configMapData.by("metadata.name"));
         }, function(e) {
           if (e.code === 403) {
@@ -148,7 +148,7 @@ angular.module('openshiftConsole')
           displayError('Could not load config maps', getErrorDetails(e));
         });
 
-        DataService.list("secrets", context, null, { errorNotification: false }).then(function(secretData) {
+        DataService.list(APIService.getPreferredVersion('secrets'), context, null, { errorNotification: false }).then(function(secretData) {
           $scope.secrets = orderByDisplayName(secretData.by("metadata.name"));
         }, function(e) {
           if (e.code === 403) {

dist/scripts/scripts.js

@@ -8324,7 +8324,7 @@ a.attach.items.push({}), v();
 a.attach.items.splice(e, 1), v();
 }, d.get(n.project).then(_.spread(function(t, r) {
 if (a.project = t, i.canI(g, "update", n.project)) {
-var o = e("orderByDisplayName"), d = e("getErrorDetails"), p = e("generateName");
+var d = e("orderByDisplayName"), p = e("getErrorDetails"), f = e("generateName");
 c.get(g, n.name, r, {
 errorNotification: !1
 }).then(function(e) {
@@ -8335,64 +8335,64 @@ subpage: "Add Config Files"
 });
 }, function(e) {
 a.error = e;
-}), c.list("configmaps", r, null, {
+}), c.list(o.getPreferredVersion("configmaps"), r, null, {
 errorNotification: !1
 }).then(function(e) {
-a.configMaps = o(e.by("metadata.name"));
+a.configMaps = d(e.by("metadata.name"));
 }, function(e) {
-403 !== e.code ? b("Could not load config maps", d(e)) : a.configMaps = [];
-}), c.list("secrets", r, null, {
+403 !== e.code ? b("Could not load config maps", p(e)) : a.configMaps = [];
+}), c.list(o.getPreferredVersion("secrets"), r, null, {
 errorNotification: !1
 }).then(function(e) {
-a.secrets = o(e.by("metadata.name"));
+a.secrets = d(e.by("metadata.name"));
 }, function(e) {
-403 !== e.code ? b("Could not load secrets", d(e)) : a.secrets = [];
+403 !== e.code ? b("Could not load secrets", p(e)) : a.secrets = [];
 });
-var f = function(e) {
+var v = function(e) {
 return a.attach.allContainers || a.attach.containers[e.name];
-}, v = function() {
+}, S = function() {
 var e = _.get(a, "targetObject.spec.template");
-a.existingMountPaths = m.getMountPaths(e, f);
+a.existingMountPaths = m.getMountPaths(e, v);
 };
-a.$watchGroup([ "targetObject", "attach.allContainers" ], v), a.$watch("attach.containers", v, !0);
+a.$watchGroup([ "targetObject", "attach.allContainers" ], S), a.$watch("attach.containers", S, !0);
 a.$watch("attach.items", function() {
 var e = _.map(a.attach.items, "path");
 a.itemPaths = _.compact(e);
 }, !0), a.addVolume = function() {
 if (!a.forms.addConfigVolumeForm.$invalid) {
-var t = a.targetObject, o = _.get(a, "attach.source"), i = _.get(t, "spec.template"), s = p("volume-"), l = {
+var t = a.targetObject, o = _.get(a, "attach.source"), i = _.get(t, "spec.template"), s = f("volume-"), l = {
 name: s,
 mountPath: _.get(a, "attach.mountPath")
 };
 "Secret" === o.kind && (l.readOnly = !0), _.each(i.spec.containers, function(e) {
-f(e) && (e.volumeMounts = e.volumeMounts || [], e.volumeMounts.push(l));
+v(e) && (e.volumeMounts = e.volumeMounts || [], e.volumeMounts.push(l));
 });
-var m, h = {
+var d, m = {
 name: s
 };
-switch (a.attach.pickKeys && (m = a.attach.items), o.kind) {
+switch (a.attach.pickKeys && (d = a.attach.items), o.kind) {
 case "ConfigMap":
-h.configMap = {
+m.configMap = {
 name: o.metadata.name,
-items: m
+items: d
 };
 break;
 
 case "Secret":
-h.secret = {
+m.secret = {
 secretName: o.metadata.name,
-items: m
+items: d
 };
 }
-i.spec.volumes = i.spec.volumes || [], i.spec.volumes.push(h), a.disableInputs = !0, C();
-var v = e("humanizeKind"), S = v(o.kind), w = v(n.kind);
+i.spec.volumes = i.spec.volumes || [], i.spec.volumes.push(m), a.disableInputs = !0, C();
+var h = e("humanizeKind"), S = h(o.kind), w = h(n.kind);
 c.update(g, t.metadata.name, a.targetObject, r).then(function() {
 u.addNotification({
 type: "success",
 message: "Successfully added " + S + " " + o.metadata.name + " to " + w + " " + n.name + "."
 }), y();
 }, function(e) {
-a.disableInputs = !1, b("An error occurred attaching the " + S + " to the " + w + ".", d(e));
+a.disableInputs = !1, b("An error occurred attaching the " + S + " to the " + w + ".", p(e));
 });
 }
 };