Add preferred version for daemon sets

dist/origin-web-common-services.js

@@ -3923,6 +3923,7 @@ angular.module('openshiftCommonServices')
       clusterroles:                     {group: 'rbac.authorization.k8s.io',  version: 'v1',      resource: 'clusterroles' },
       clusterserviceclasses:            {group: 'servicecatalog.k8s.io',      version: 'v1beta1', resource: 'clusterserviceclasses' },
       clusterserviceplans:              {group: 'servicecatalog.k8s.io',      version: 'v1beta1', resource: 'clusterserviceplans' },
+      daemonsets:                       {group: 'apps',                       version: 'v1',      resource: 'daemonsets' },
       deployments:                      {group: 'apps',                       version: 'v1beta1', resource: 'deployments' },
       deploymentconfigs:                {group: 'apps.openshift.io',          version: 'v1',      resource: 'deploymentconfigs' },
       'deploymentconfigs/instantiate':  {group: 'apps.openshift.io',          version: 'v1',      resource: 'deploymentconfigs/instantiate' },

dist/origin-web-common.js

@@ -1444,6 +1444,7 @@ angular.module('openshiftCommonServices')
       clusterroles:                     {group: 'rbac.authorization.k8s.io',  version: 'v1',      resource: 'clusterroles' },
       clusterserviceclasses:            {group: 'servicecatalog.k8s.io',      version: 'v1beta1', resource: 'clusterserviceclasses' },
       clusterserviceplans:              {group: 'servicecatalog.k8s.io',      version: 'v1beta1', resource: 'clusterserviceplans' },
+      daemonsets:                       {group: 'apps',                       version: 'v1',      resource: 'daemonsets' },
       deployments:                      {group: 'apps',                       version: 'v1beta1', resource: 'deployments' },
       deploymentconfigs:                {group: 'apps.openshift.io',          version: 'v1',      resource: 'deploymentconfigs' },
       'deploymentconfigs/instantiate':  {group: 'apps.openshift.io',          version: 'v1',      resource: 'deploymentconfigs/instantiate' },

dist/origin-web-common.min.js

@@ -527,6 +527,11 @@ group: "servicecatalog.k8s.io",
 version: "v1beta1",
 resource: "clusterserviceplans"
 },
+daemonsets: {
+group: "apps",
+version: "v1",
+resource: "daemonsets"
+},
 deployments: {
 group: "apps",
 version: "v1beta1",
@@ -1080,7 +1085,7 @@ extensions: "v1beta1"
 if (e instanceof ResourceGroupVersion) return e;
 var n, r, o;
 return angular.isString(e) ? (n = d(e), o = f[r = ""]) : e && e.resource && (n = d(e.resource), r = e.group || "", o = e.version || f[r] || _.get(t, [ "groups", r, "preferredVersion" ])), new ResourceGroupVersion(n, r, o);
-}, h = function(e) {
+}, m = function(e) {
 if (e) {
 var t = e.split("/");
 return 1 === t.length ? "v1" === t[0] ? {
@@ -1094,7 +1099,7 @@ group: t[0],
 version: t[1]
 } : void a.warn('Invalid apiVersion "' + e + '"');
 }
-}, m = function(e, t) {
+}, h = function(e, t) {
 return !(!_.find(r.kinds, {
 group: e,
 kind: t
@@ -1129,7 +1134,7 @@ _.each(e.versions[t].resources, function(t) {
 _.includes(t.name, "/") || _.find(o, {
 kind: t.kind,
 group: e.name
-}) || m(e.name, t.kind) || (t.namespaced || n) && r.push({
+}) || h(e.name, t.kind) || (t.namespaced || n) && r.push({
 kind: t.kind,
 group: e.name
 });
@@ -1143,19 +1148,19 @@ toAPIVersion: function(e) {
 return e.group ? e.group + "/" + e.version : e.version;
 },
 toResourceGroupVersion: g,
-parseGroupVersion: h,
+parseGroupVersion: m,
 objectToResourceGroupVersion: function(e) {
 if (e && e.kind && e.apiVersion) {
 var t = p(e.kind);
 if (t) {
-var n = h(e.apiVersion);
+var n = m(e.apiVersion);
 if (n) return new ResourceGroupVersion(t, n.group, n.version);
 }
 }
 },
 deriveTargetResource: function(e, t) {
 if (e && t) {
-var n = p(t.kind), r = h(t.apiVersion), o = g(e);
+var n = p(t.kind), r = m(t.apiVersion), o = g(e);
 if (n && r && o) return angular.isString(e) ? (o.equals(n) && (o.group = r.group, o.version = r.version), o) : (o.equals(n, r.group) && (o.version = r.version), o);
 }
 },
@@ -1272,24 +1277,24 @@ throw n + " not set";
 this.$get = [ "$q", "$injector", "$log", "$rootScope", "Logger", "base64", function(o, i, a, s, c, l) {
 var u = c.get("auth");
 u.log("AuthServiceProvider.$get", arguments);
-var d = $.Callbacks(), p = $.Callbacks(), f = $.Callbacks(), g = null, h = null, m = r(i, e, "AuthServiceProvider.UserStore()");
-m.available() || c.error("AuthServiceProvider.$get user store " + e + " not available");
+var d = $.Callbacks(), p = $.Callbacks(), f = $.Callbacks(), g = null, m = null, h = r(i, e, "AuthServiceProvider.UserStore()");
+h.available() || c.error("AuthServiceProvider.$get user store " + e + " not available");
 var v = r(i, t, "AuthServiceProvider.LoginService()"), b = r(i, n, "AuthServiceProvider.LogoutService()");
 return {
 UserStore: function() {
-return m;
+return h;
 },
 isLoggedIn: function() {
-return !!m.getUser();
+return !!h.getUser();
 },
 withUser: function() {
-var e = m.getUser();
+var e = h.getUser();
 return e ? (s.user = e, u.log("AuthService.withUser()", e), o.when(e)) : (u.log("AuthService.withUser(), calling startLogin()"), this.startLogin());
 },
 setUser: function(e, t, n) {
 u.log("AuthService.setUser()", e, t, n);
-var r = m.getUser();
-m.setUser(e, n), m.setToken(t, n), s.user = e, (r && r.metadata && r.metadata.name) !== (e && e.metadata && e.metadata.name) && (u.log("AuthService.setUser(), user changed", r, e), f.fire(e));
+var r = h.getUser();
+h.setUser(e, n), h.setToken(t, n), s.user = e, (r && r.metadata && r.metadata.name) !== (e && e.metadata && e.metadata.name) && (u.log("AuthService.setUser(), user changed", r, e), f.fire(e));
 },
 requestRequiresAuth: function(e) {
 var t = !!e.auth;
@@ -1297,7 +1302,7 @@ return u.log("AuthService.requestRequiresAuth()", e.url.toString(), t), t;
 },
 addAuthToRequest: function(e) {
 var t = "";
-return e && e.auth && e.auth.token ? (t = e.auth.token, u.log("AuthService.addAuthToRequest(), using token from request config", t)) : (t = m.getToken(), u.log("AuthService.addAuthToRequest(), using token from user store", t)), t ? ("WATCH" === e.method ? (e.protocols = e.protocols || [], _.isArray(e.protocols) || (e.protocols = [ e.protocols ]), 0 == e.protocols.length && e.protocols.unshift("undefined"), e.protocols.unshift("base64url.bearer.authorization.k8s.io." + l.urlencode(t)), u.log("AuthService.addAuthToRequest(), added token protocol", e.protocols)) : (e.headers.Authorization = "Bearer " + t, u.log("AuthService.addAuthToRequest(), added token header", e.headers.Authorization)), !0) : (u.log("AuthService.addAuthToRequest(), no token available"), !1);
+return e && e.auth && e.auth.token ? (t = e.auth.token, u.log("AuthService.addAuthToRequest(), using token from request config", t)) : (t = h.getToken(), u.log("AuthService.addAuthToRequest(), using token from user store", t)), t ? ("WATCH" === e.method ? (e.protocols = e.protocols || [], _.isArray(e.protocols) || (e.protocols = [ e.protocols ]), 0 == e.protocols.length && e.protocols.unshift("undefined"), e.protocols.unshift("base64url.bearer.authorization.k8s.io." + l.urlencode(t)), u.log("AuthService.addAuthToRequest(), added token protocol", e.protocols)) : (e.headers.Authorization = "Bearer " + t, u.log("AuthService.addAuthToRequest(), added token header", e.headers.Authorization)), !0) : (u.log("AuthService.addAuthToRequest(), no token available"), !1);
 },
 startLogin: function() {
 if (g) return u.log("Login already in progress"), g;
@@ -1311,16 +1316,16 @@ g = null;
 });
 },
 startLogout: function() {
-if (h) return u.log("Logout already in progress"), h;
-var e = this, t = m.getUser(), n = m.getToken(), r = this.isLoggedIn();
-return h = b.logout(t, n).then(function() {
+if (m) return u.log("Logout already in progress"), m;
+var e = this, t = h.getUser(), n = h.getToken(), r = this.isLoggedIn();
+return m = b.logout(t, n).then(function() {
 u.log("Logout service success");
 }).catch(function(e) {
 u.error("Logout service error", e);
 }).finally(function() {
 e.setUser(null, null);
 var t = e.isLoggedIn();
-r && !t && p.fire(), h = null;
+r && !t && p.fire(), m = null;
 });
 },
 onLogin: function(e) {
@@ -1380,7 +1385,7 @@ return d(t) && !_.isEmpty(_.intersection(e.verbs, [ "*", "create", "update" ]));
 });
 }, f = {}, g = function(e) {
 return _.get(s.get(e || a), [ "rules" ]);
-}, h = function(e, t, n, r) {
+}, m = function(e, t, n, r) {
 var o = e[n];
 if (!o) return !1;
 var i = o[r];
@@ -1421,7 +1426,7 @@ canI: function(e, t, n) {
 if (c) return !0;
 if (!e) return !1;
 var r = o.toResourceGroupVersion(e), i = g(n || a);
-return !!i && (h(i, t, r.group, r.resource) || h(i, t, "*", "*") || h(i, t, r.group, "*") || h(i, t, "*", r.resource));
+return !!i && (m(i, t, r.group, r.resource) || m(i, t, "*", "*") || m(i, t, r.group, "*") || m(i, t, "*", r.resource));
 },
 canIAddToProject: function(e) {
 return !!c || !!_.get(s.get(e || a), [ "canAddToProject" ]);
@@ -1585,7 +1590,7 @@ t._websocketEventsMap = {};
 function g(e) {
 return e.length >= S && Date.now() - e[0].time < 3e4;
 }
-function h(e) {
+function m(e) {
 if (e.length < 5) return !1;
 for (var t = e.length - 5; t < e.length; t++) if ("close" !== e[t].type) return !1;
 return !0;
@@ -1602,12 +1607,12 @@ angular.forEach(e, function(e, o) {
 p(e, t, n, r ? r[o] : null);
 });
 };
-var m = [], v = _.debounce(function() {
-if (m.length) {
+var h = [], v = _.debounce(function() {
+if (h.length) {
 var e = {
 type: "error",
 message: "An error occurred connecting to the server.",
-details: m.join("\n"),
+details: h.join("\n"),
 links: [ {
 label: "Refresh",
 onClick: function() {
@@ -1615,12 +1620,12 @@ window.location.reload();
 }
 } ]
 };
-r.$emit("NotificationsService.addNotification", e), m = [];
+r.$emit("NotificationsService.addNotification", e), h = [];
 }
 }, 300, {
 maxWait: 1e3
 }), b = function(e, t) {
-t && (e += " (status " + t + ")"), m.push(e), v();
+t && (e += " (status " + t + ")"), h.push(e), v();
 }, y = function(e, t) {
 var n;
 return n = e ? "Unknown resource: " + e.toString() : "Internal error: API resource not specified.", _.get(t, "errorNotification", !0) && b(n), o.reject({
@@ -1788,7 +1793,7 @@ return l.promise;
 }, f.prototype.createStream = function(e, t, r, o, i) {
 var c = this;
 e = a.toResourceGroupVersion(e);
-var d, p = i ? "binary.k8s.io" : "base64.binary.k8s.io", f = {}, g = {}, h = {}, m = {}, v = function() {
+var d, p = i ? "binary.k8s.io" : "base64.binary.k8s.io", f = {}, g = {}, m = {}, h = {}, v = function() {
 return c._getNamespace(e, r, {}).then(function(a) {
 var d = c._urlForResource(e, t, r, !0, _.extend(a, o));
 if (!d) return y(e, o);
@@ -1810,12 +1815,12 @@ i ? n(e.data) : n(t, e.data, v);
 } else s.log("log stream response is not a string", e.data);
 },
 onclose: function(e) {
-_.each(h, function(t) {
+_.each(m, function(t) {
 t(e);
 });
 },
 onerror: function(e) {
-_.each(m, function(t) {
+_.each(h, function(t) {
 t(e);
 });
 },
@@ -1841,17 +1846,17 @@ return g[t] = e, t;
 onClose: function(e) {
 if (_.isFunction(e)) {
 var t = _.uniqueId("stream_");
-return h[t] = e, t;
+return m[t] = e, t;
 }
 },
 onError: function(e) {
 if (_.isFunction(e)) {
 var t = _.uniqueId("stream_");
-return m[t] = e, t;
+return h[t] = e, t;
 }
 },
 remove: function(e) {
-f[e] && delete f[e], g[e] && delete g[e], h[e] && delete h[e], m[e] && delete m[e];
+f[e] && delete f[e], g[e] && delete g[e], m[e] && delete m[e], h[e] && delete h[e];
 },
 start: function() {
 return d = v();
@@ -1959,7 +1964,7 @@ time: Date.now()
 }); n.length > S; ) n.shift();
 }, f.prototype._isTooManyWebsocketRetries = function(e) {
 var t = this._websocketEventsMap[e];
-return !!t && (g(t) ? (s.log("Too many websocket open or close events for resource/context in a short period", e, t), !0) : !!h(t) && (s.log("Too many consecutive websocket close events for resource/context", e, t), !0));
+return !!t && (g(t) ? (s.log("Too many websocket open or close events for resource/context in a short period", e, t), !0) : !!m(t) && (s.log("Too many consecutive websocket close events for resource/context", e, t), !0));
 };
 var w = function(e) {
 var t = _.keysIn(_.pick(e, [ "fieldSelector", "labelSelector" ])).sort();
@@ -2355,7 +2360,7 @@ var u, d = !1, p = r.getPreferredVersion("projects"), f = r.getPreferredVersion(
 s.debug("ProjectsService: clearing project cache"), u = null, d = !1;
 };
 o.onUserChanged(g), o.onLogout(g);
-var h = function(e) {
+var m = function(e) {
 var t = [ l("description"), l("displayName") ];
 return _.each(t, function(t) {
 e.metadata.annotations[t] || delete e.metadata.annotations[t];
@@ -2403,7 +2408,7 @@ u = e, t(e);
 });
 },
 update: function(e, t) {
-return a.update(p, e, h(t), {
+return a.update(p, e, m(t), {
 projectName: e
 }, {
 errorNotification: !1
@@ -2590,15 +2595,15 @@ if (!f.verified) return s.reject({
 error: "invalid_request",
 error_description: "Client state could not be verified"
 });
-var h = [ "grant_type=authorization_code", "code=" + encodeURIComponent(d.code), "redirect_uri=" + encodeURIComponent(r), "client_id=" + encodeURIComponent(e) ].join("&");
-return o && (h += "&scope=" + encodeURIComponent(o)), t({
+var m = [ "grant_type=authorization_code", "code=" + encodeURIComponent(d.code), "redirect_uri=" + encodeURIComponent(r), "client_id=" + encodeURIComponent(e) ].join("&");
+return o && (m += "&scope=" + encodeURIComponent(o)), t({
 method: "POST",
 url: n,
 headers: {
 Authorization: "Basic " + window.btoa(e + ":"),
 "Content-Type": "application/x-www-form-urlencoded"
 },
-data: h
+data: m
 }).then(function(e) {
 return c(e.data, f);
 }, function(e) {

src/constants/apiPreferredVersions.js

@@ -12,6 +12,7 @@ angular.module('openshiftCommonServices')
       clusterroles:                     {group: 'rbac.authorization.k8s.io',  version: 'v1',      resource: 'clusterroles' },
       clusterserviceclasses:            {group: 'servicecatalog.k8s.io',      version: 'v1beta1', resource: 'clusterserviceclasses' },
       clusterserviceplans:              {group: 'servicecatalog.k8s.io',      version: 'v1beta1', resource: 'clusterserviceplans' },
+      daemonsets:                       {group: 'apps',                       version: 'v1',      resource: 'daemonsets' },
       deployments:                      {group: 'apps',                       version: 'v1beta1', resource: 'deployments' },
       deploymentconfigs:                {group: 'apps.openshift.io',          version: 'v1',      resource: 'deploymentconfigs' },
       'deploymentconfigs/instantiate':  {group: 'apps.openshift.io',          version: 'v1',      resource: 'deploymentconfigs/instantiate' },