-
+
+
+
Success
- {{$ctrl.name}} completed.
+ {{$ctrl.kind | humanizeKind | upperFirst}}
+ {{$ctrl.name}} has been {{$ctrl.actionLabel}} in {{$ctrl.projectName}} successfully.
@@ -37,7 +42,8 @@
Success
- {{$ctrl.name}} has been created in {{$ctrl.projectName}} successfully.
+ {{$ctrl.kind | humanizeKind | upperFirst}}
+ {{$ctrl.name}} has been {{$ctrl.actionLabel}} in {{$ctrl.projectName}} successfully.
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
index 7717b35f7f..4dffdf87a7 100644
--- a/dist/scripts/scripts.js
+++ b/dist/scripts/scripts.js
@@ -1,6 +1,6 @@
"use strict";
-function OverviewController(e, t, n, a, r, o, i, s, c, l, u, d, m, p, f, g, v, h, y, b, C, S, w, P, k, j, R, I) {
+function OverviewController(e, t, n, a, r, o, i, s, c, l, u, d, m, p, f, g, v, h, y, b, C, S, w, k, P, j, R, I) {
var E = this, T = t("isIE")();
e.projectName = a.project, E.catalogLandingPageEnabled = !u.DISABLE_SERVICE_CATALOG_LANDING_PAGE;
var N, D, A = t("annotation"), B = t("canI"), L = t("buildConfigForBuild"), U = t("deploymentIsInProgress"), O = t("imageObjectRef"), F = t("isJenkinsPipelineStrategy"), x = t("isNewerResource"), V = t("label"), M = t("podTemplate"), q = o.getPreferredVersion("servicebindings"), z = o.getPreferredVersion("clusterserviceclasses"), H = o.getPreferredVersion("serviceinstances"), G = o.getPreferredVersion("clusterserviceplans"), K = {}, W = {}, Q = {}, J = E.state = {
@@ -175,7 +175,7 @@ E.getPreviousReplicationController = function(e) {
var t = we(e);
return _.size(t) < 2 ? null : t[1];
};
-var Pe = function(e) {
+var ke = function(e) {
var t = {}, n = _e(e);
_.assign(t, j.getDeploymentStatusAlerts(e, n), j.getPausedDeploymentAlerts(e));
var a = we(e);
@@ -183,8 +183,8 @@ _.each(a, function(e) {
var n = be(e);
_.assign(t, n);
}), ye(e, t);
-}, ke = function() {
-_.each(E.deploymentConfigs, Pe);
+}, Pe = function() {
+_.each(E.deploymentConfigs, ke);
}, je = function(e) {
var t = X(e);
return t ? _.get(E, [ "replicaSetsByDeploymentUID", t ]) : {};
@@ -200,7 +200,7 @@ _.each(E.deployments, Re);
Se(E.replicationControllers), Se(E.replicaSets), Se(E.statefulSets), Se(E.monopods);
}, Te = _.debounce(function() {
e.$evalAsync(function() {
-Ee(), ke(), Ie();
+Ee(), Pe(), Ie();
});
}, 500), Ne = function(e) {
_.isEmpty(e) || (h.addLabelSuggestionsFromResources(e, K), "pipeline" !== E.viewBy && h.setLabelSuggestions(K));
@@ -231,7 +231,7 @@ _.set(n, [ t, e.metadata.name ], e);
}), _.each(n, function(e, t) {
var n = m.sortByDeploymentVersion(e, !0);
E.replicationControllersByDeploymentConfig[t] = n, E.currentByDeploymentConfig[t] = _.head(n);
-}), E.vanillaReplicationControllers = _.sortBy(e, "metadata.name"), ke();
+}), E.vanillaReplicationControllers = _.sortBy(e, "metadata.name"), Pe();
}
}, Oe = function(e, t) {
if (_.get(e, "status.replicas")) return !0;
@@ -375,7 +375,7 @@ return _.get(_.head(t), [ "metadata", "name" ]) || e.metadata.name;
}, rt = function() {
J.bindableServiceInstances = s.filterBindableServiceInstances(J.serviceInstances, J.serviceClasses, J.servicePlans), J.orderedServiceInstances = s.sortServiceInstances(J.serviceInstances, J.serviceClasses);
}, ot = [];
-P.get(a.project).then(_.spread(function(t, a) {
+k.get(a.project).then(_.spread(function(t, a) {
J.project = e.project = t, J.context = a;
var r = function() {
E.pods && g.fetchReferencedImageStreamImages(E.pods, J.imagesByDockerReference, J.imageStreamImageRefByDockerReference, a);
@@ -467,7 +467,7 @@ var t = [];
_.each(J.serviceInstances, function(e) {
var n = j.getServiceInstanceAlerts(e);
ye(e, n), t.push(o(e)), t.push(i(e));
-}), k.waitForAll(t).finally(function() {
+}), P.waitForAll(t).finally(function() {
rt(), fe();
}), Ne(J.serviceInstances);
}, {
@@ -3563,7 +3563,7 @@ memory: "resources.requests.memory",
"limits.memory": "resources.limits.memory",
persistentvolumeclaims: "resources.limits.persistentvolumeclaims",
"requests.storage": "resources.request.storage"
-}, P = function(e, t, n, a) {
+}, k = function(e, t, n, a) {
var r = e.status.total || e.status, o = w[a], i = 0;
if (_.each(n.spec.containers, function(e) {
var t = _.get(e, o);
@@ -3581,14 +3581,14 @@ target: "_blank"
} ]
};
}
-}, k = function(e, t) {
+}, P = function(e, t) {
var n = [], a = "Pod" === e.kind ? e : _.get(e, "spec.template");
return a ? (_.each([ "cpu", "memory", "requests.cpu", "requests.memory", "limits.cpu", "limits.memory", "pods" ], function(r) {
var o = t.status.total || t.status;
if (("Pod" !== e.kind || "pods" !== r) && _.has(o, [ "hard", r ]) && _.has(o, [ "used", r ])) {
var i = S(t, e, r);
if (i) n.push(i); else if ("pods" !== r) {
-var s = P(t, e, a, r);
+var s = k(t, e, a, r);
s && n.push(s);
}
}
@@ -3611,7 +3611,7 @@ href: "project/" + e.metadata.namespace + "/quota",
label: "View Quota",
target: "_blank"
} ]
-}), r = r.concat(k(t, e));
+}), r = r.concat(P(t, e));
};
_.each(o, p), _.each(i, p);
}
@@ -3637,7 +3637,7 @@ return {
filterQuotasForResource: y,
isBestEffortPod: g,
isTerminatingPod: v,
-getResourceLimitAlerts: k,
+getResourceLimitAlerts: P,
getQuotaAlerts: j,
getLatestQuotaAlerts: function(e, t) {
var n, a, r = [];
@@ -4587,7 +4587,7 @@ onSortChange: S
};
var w = function(t) {
d = _.toArray(t.by("metadata.name")), e.loading = !1, e.showGetStarted = _.isEmpty(d) && !e.isProjectListIncomplete, S();
-}, P = function() {
+}, k = function() {
g || u.list().then(w);
};
e.newProjectPanelShown = !1, e.createProject = function(t) {
@@ -4596,14 +4596,14 @@ e.popupElement = n, e.newProjectPanelShown = !0;
}, e.closeNewProjectPanel = function() {
e.newProjectPanelShown = !1;
}, e.onNewProject = function() {
-e.newProjectPanelShown = !1, P();
+e.newProjectPanelShown = !1, k();
}, e.editProjectPanelShown = !1, e.editProject = function(t) {
e.editingProject = t, e.editProjectPanelShown = !0;
}, e.closeEditProjectPanel = function() {
e.editProjectPanelShown = !1;
}, e.onEditProject = function() {
-e.editProjectPanelShown = !1, P();
-}, e.onDeleteProject = P, e.goToProject = function(e) {
+e.editProjectPanelShown = !1, k();
+}, e.onDeleteProject = k, e.goToProject = function(e) {
c.toProjectOverview(e);
}, e.$watch("search.text", _.debounce(function(t) {
e.keywords = f = s.generateKeywords(t), e.$applyAsync(y);
@@ -4740,8 +4740,8 @@ name: t.containerName
}), a = b(n);
t.containerState = a;
});
-}, P = t("annotation"), k = function(t, n) {
-if (e.loaded = !0, e.pod = t, e.dcName = P(t, "deploymentConfig"), e.rcName = P(t, "deployment"), e.deploymentVersion = P(t, "deploymentVersion"), e.logCanRun = !_.includes([ "New", "Pending", "Unknown" ], t.status.phase), g(), delete e.controllerRef, !e.dcName) {
+}, k = t("annotation"), P = function(t, n) {
+if (e.loaded = !0, e.pod = t, e.dcName = k(t, "deploymentConfig"), e.rcName = k(t, "deployment"), e.deploymentVersion = k(t, "deploymentVersion"), e.logCanRun = !_.includes([ "New", "Pending", "Unknown" ], t.status.phase), g(), delete e.controllerRef, !e.dcName) {
var a = u.getControllerReferences(t);
e.controllerRef = _.find(a, function(e) {
return "ReplicationController" === e.kind || "ReplicaSet" === e.kind || "Build" === e.kind;
@@ -4756,10 +4756,10 @@ m.get(n.project).then(_.spread(function(a, l) {
f = l, e.project = a, e.projectContext = l, i.get("pods", n.pod, l, {
errorNotification: !1
}).then(function(t) {
-k(t);
+P(t);
var a = {};
a[t.metadata.name] = t, e.logOptions.container = n.container || t.spec.containers[0].name, e.containerTerminals = C(), S(t), c.fetchReferencedImageStreamImages(a, e.imagesByDockerReference, e.imageStreamImageRefByDockerReference, f), p.push(i.watchObject("pods", n.pod, l, function(t, n) {
-k(t, n), w(e.containerTerminals), S(t);
+P(t, n), w(e.containerTerminals), S(t);
}));
}, function(n) {
e.loaded = !0, e.alerts.load = {
@@ -4935,8 +4935,8 @@ var h, y, b, C;
l.isAvailable().then(function(e) {
n.metricsAvailable = e;
});
-var S = a("orderObjectsByDate"), w = [ "metadata.name" ], P = [], k = function() {
-n.filteredPods = s.filterForKeywords(C, w, P), n.filteredReplicationControllers = s.filterForKeywords(y, w, P), n.filteredReplicaSets = s.filterForKeywords(b, w, P), n.filteredBuilds = s.filterForKeywords(h, w, P), n.filteredStatefulSets = s.filterForKeywords(_.values(n.statefulSets), w, P);
+var S = a("orderObjectsByDate"), w = [ "metadata.name" ], k = [], P = function() {
+n.filteredPods = s.filterForKeywords(C, w, k), n.filteredReplicationControllers = s.filterForKeywords(y, w, k), n.filteredReplicaSets = s.filterForKeywords(b, w, k), n.filteredBuilds = s.filterForKeywords(h, w, k), n.filteredStatefulSets = s.filterForKeywords(_.values(n.statefulSets), w, k);
}, j = function(e) {
n.logOptions.pods[e.metadata.name] = {
container: e.spec.containers[0].name
@@ -4948,11 +4948,11 @@ t && (n.logOptions.replicationControllers[e.metadata.name].version = t), n.logCa
}, I = function(e) {
n.logOptions.builds[e.metadata.name] = {}, n.logCanRun.builds[e.metadata.name] = !_.includes([ "New", "Pending", "Error" ], e.status.phase);
}, E = function() {
-n.filteredStatefulSets = s.filterForKeywords(_.values(n.statefulSets), w, P);
+n.filteredStatefulSets = s.filterForKeywords(_.values(n.statefulSets), w, k);
}, T = function() {
C = _.filter(n.pods, function(e) {
return !n.filters.hideOlderResources || "Succeeded" !== e.status.phase && "Failed" !== e.status.phase;
-}), n.filteredPods = s.filterForKeywords(C, w, P);
+}), n.filteredPods = s.filterForKeywords(C, w, k);
}, N = a("isIncompleteBuild"), D = a("buildConfigForBuild"), A = a("isRecentBuild"), B = function() {
moment().subtract(5, "m");
h = _.filter(n.builds, function(e) {
@@ -4960,15 +4960,15 @@ if (!n.filters.hideOlderResources) return !0;
if (N(e)) return !0;
var t = D(e);
return t ? n.latestBuildByConfig[t].metadata.name === e.metadata.name : A(e);
-}), n.filteredBuilds = s.filterForKeywords(h, w, P);
+}), n.filteredBuilds = s.filterForKeywords(h, w, k);
}, L = a("deploymentStatus"), U = a("deploymentIsInProgress"), O = function() {
y = _.filter(n.replicationControllers, function(e) {
return !n.filters.hideOlderResources || (U(e) || "Active" === L(e));
-}), n.filteredReplicationControllers = s.filterForKeywords(y, w, P);
+}), n.filteredReplicationControllers = s.filterForKeywords(y, w, k);
}, F = function() {
b = _.filter(n.replicaSets, function(e) {
return !n.filters.hideOlderResources || _.get(e, "status.replicas");
-}), n.filteredReplicaSets = s.filterForKeywords(b, w, P);
+}), n.filteredReplicaSets = s.filterForKeywords(b, w, k);
};
n.toggleItem = function(e, t, r) {
var o = $(e.target);
@@ -5045,7 +5045,7 @@ e.hideOlderResources = n.filters.hideOlderResources ? "true" : "false", t.replac
var e = t.search();
e.kind = n.kindSelector.selected.kind, t.replace().search(e);
}), n.$watch("filters.text", _.debounce(function() {
-n.filterKeywords = P = s.generateKeywords(n.filters.text), n.$apply(k);
+n.filterKeywords = k = s.generateKeywords(n.filters.text), n.$apply(P);
}, 50, {
maxWait: 250
})), n.$watch("renderOptions.collapseEventsSidebar", function(e, t) {
@@ -5086,7 +5086,7 @@ details: n
});
}, w = function() {
a.disableAddForm = !1, a.newBinding.name = "", a.newBinding.namespace = g, a.newBinding.newRole = null;
-}, P = function(e) {
+}, k = function(e) {
c.list("serviceaccounts", e).then(function(e) {
var t = _.keys(e.by("metadata.name")).sort();
angular.extend(a, {
@@ -5096,7 +5096,7 @@ e && !_.includes(a.serviceAccounts, e) ? a.serviceAccounts = [ e ].concat(t) : a
}
});
});
-}, k = function(e) {
+}, P = function(e) {
c.list("rolebindings", f, null, {
errorNotification: !1
}).then(function(e) {
@@ -5110,12 +5110,12 @@ e && (a.roleBindings[e.metadata.name] = e, a.subjectKindsForUI = u.mapRolebindin
});
}, j = function(t, n) {
a.disableAddForm = !0, m.create(t, n, g, f).then(function() {
-k(), S("success", C.update.subject.success({
+P(), S("success", C.update.subject.success({
roleName: t.metadata.name,
subjectName: n.name
}));
}, function(a) {
-w(), k(), S("error", C.update.subject.error({
+w(), P(), S("error", C.update.subject.error({
roleName: t.metadata.name,
subjectName: n.name
}), C.errorReason({
@@ -5124,12 +5124,12 @@ httpErr: e("getErrorDetails")(a)
});
}, R = function(t, n, r) {
a.disableAddForm = !0, m.addSubject(t, n, r, f).then(function() {
-k(), S("success", C.update.subject.success({
+P(), S("success", C.update.subject.success({
roleName: t.roleRef.name,
subjectName: n.name
}));
}, function(a) {
-w(), k(), S("error", C.update.subject.error({
+w(), P(), S("error", C.update.subject.error({
roleName: t.roleRef.name,
subjectName: n.name
}), C.errorReason({
@@ -5208,7 +5208,7 @@ var t = _.keys(e.by("metadata.name")).sort();
angular.extend(a, {
projects: t,
selectProject: function(e) {
-a.newBinding.name = "", P({
+a.newBinding.name = "", k({
namespace: e
});
},
@@ -5217,7 +5217,7 @@ e && !_.includes(a.projects, e) ? a.projects = [ e ].concat(t) : a.projects = t;
}
});
}), l.get(n.project).then(_.spread(function(n, r) {
-f = r, k(), P(f), angular.extend(a, {
+f = r, P(), k(f), angular.extend(a, {
project: n,
subjectKinds: E,
canUpdateRolebindings: y("rolebindings", "update", g),
@@ -5235,7 +5235,7 @@ return d;
}).result.then(function() {
m.removeSubject(n, i, c, a.roleBindings, f).then(function(e) {
l ? t.url("./") : (s.getProjectRules(g, !0).then(function() {
-k(e[0]);
+P(e[0]);
var t = y("rolebindings", "update", g);
angular.extend(a, {
canUpdateRolebindings: t,
@@ -5284,7 +5284,7 @@ name: e
}
});
};
-k(), angular.extend(a, {
+P(), angular.extend(a, {
toggle: {
roles: !1
},
@@ -5823,7 +5823,7 @@ namespace: n.project
}), e.emptyMessage = "Loading...", e.deploymentConfigsInstantiateVersion = a.getPreferredVersion("deploymentconfigs/instantiate"), e.deploymentConfigsVersion = a.getPreferredVersion("deploymentconfigs"), e.eventsVersion = a.getPreferredVersion("events"), e.horizontalPodAutoscalersVersion = a.getPreferredVersion("horizontalpodautoscalers");
var y = a.getPreferredVersion("builds"), b = a.getPreferredVersion("imagestreams"), C = a.getPreferredVersion("limitranges"), S = a.getPreferredVersion("replicationcontrollers");
e.healthCheckURL = u.healthCheckURL(n.project, "DeploymentConfig", n.deploymentconfig, e.deploymentConfigsVersion.group);
-var w = t("mostRecent"), P = t("orderObjectsByDate"), k = [];
+var w = t("mostRecent"), k = t("orderObjectsByDate"), P = [];
p.get(n.project).then(_.spread(function(a, r) {
function u() {
g.getLabelSelector().isEmpty() || !$.isEmptyObject(e.deployments) || $.isEmptyObject(e.unfilteredDeployments) ? delete e.alerts.deployments : e.alerts.deployments = {
@@ -5840,7 +5840,7 @@ e.hpaWarnings = t;
o.get(e.deploymentConfigsVersion, n.deploymentconfig, r, {
errorNotification: !1
}).then(function(a) {
-e.loaded = !0, e.deploymentConfig = a, e.strategyParams = t("deploymentStrategyParams")(a), p(), k.push(o.watchObject(e.deploymentConfigsVersion, n.deploymentconfig, r, function(t, n) {
+e.loaded = !0, e.deploymentConfig = a, e.strategyParams = t("deploymentStrategyParams")(a), p(), P.push(o.watchObject(e.deploymentConfigsVersion, n.deploymentconfig, r, function(t, n) {
"DELETED" === n && (e.alerts.deleted = {
type: "warning",
message: "This deployment configuration has been deleted."
@@ -5852,7 +5852,7 @@ type: "error",
message: 404 === n.status ? "This deployment configuration can not be found, it may have been deleted." : "The deployment configuration details could not be loaded.",
details: 404 === n.status ? "Any remaining deployment history for this deployment will be shown." : t("getErrorDetails")(n)
};
-}), k.push(o.watch(S, r, function(a, r, o) {
+}), P.push(o.watch(S, r, function(a, r, o) {
var s = n.deploymentconfig;
if (e.emptyMessage = "No deployments to show", r) {
if (i.deploymentBelongsToConfig(o, n.deploymentconfig)) {
@@ -5873,7 +5873,7 @@ e.unfilteredDeployments = l[n.deploymentconfig] || {}, angular.forEach(e.unfilte
e.causes = t("deploymentCauses")(e);
}), e.deploymentConfigDeploymentsInProgress = i.associateRunningDeploymentToDeploymentConfig(l);
}
-e.deployments = g.getLabelSelector().select(e.unfilteredDeployments), e.orderedDeployments = P(e.deployments, !0), e.deploymentInProgress = !!_.size(e.deploymentConfigDeploymentsInProgress[s]), e.mostRecent = w(e.unfilteredDeployments), u(), g.addLabelSuggestionsFromResources(e.unfilteredDeployments, e.labelSuggestions), g.setLabelSuggestions(e.labelSuggestions);
+e.deployments = g.getLabelSelector().select(e.unfilteredDeployments), e.orderedDeployments = k(e.deployments, !0), e.deploymentInProgress = !!_.size(e.deploymentConfigDeploymentsInProgress[s]), e.mostRecent = w(e.unfilteredDeployments), u(), g.addLabelSuggestionsFromResources(e.unfilteredDeployments, e.labelSuggestions), g.setLabelSuggestions(e.labelSuggestions);
}, {
http: {
params: {
@@ -5882,16 +5882,16 @@ labelSelector: v("deploymentConfig") + "=" + e.deploymentConfigName
}
})), o.list(C, r).then(function(e) {
d = e.by("metadata.name"), p();
-}), k.push(o.watch(b, r, function(t) {
+}), P.push(o.watch(b, r, function(t) {
var n = t.by("metadata.name");
c.buildDockerRefMapForImageStreams(n, h), e.deploymentConfig && c.fetchReferencedImageStreamImages([ e.deploymentConfig.spec.template ], e.imagesByDockerReference, h, r), m.log("imagestreams (subscribe)", e.imageStreams);
-})), k.push(o.watch(y, r, function(t) {
+})), P.push(o.watch(y, r, function(t) {
e.builds = t.by("metadata.name"), m.log("builds (subscribe)", e.builds);
-})), k.push(o.watch(e.horizontalPodAutoscalersVersion, r, function(t) {
+})), P.push(o.watch(e.horizontalPodAutoscalersVersion, r, function(t) {
e.autoscalers = s.filterHPA(t.by("metadata.name"), "DeploymentConfig", n.deploymentconfig), p();
})), g.onActiveFiltersChanged(function(t) {
e.$apply(function() {
-e.deployments = t.select(e.unfilteredDeployments), e.orderedDeployments = P(e.deployments, !0), u();
+e.deployments = t.select(e.unfilteredDeployments), e.orderedDeployments = k(e.deployments, !0), u();
});
}), e.canDeploy = function() {
return !!e.deploymentConfig && (!e.deploymentConfig.metadata.deletionTimestamp && (!e.deploymentInProgress && !e.deploymentConfig.spec.paused));
@@ -5934,7 +5934,7 @@ cancelButtonText: "Cancel"
f.removeVolume(e.deploymentConfig, t, r);
});
}, e.$on("$destroy", function() {
-o.unwatchAll(k);
+o.unwatchAll(P);
});
}));
} ]), angular.module("openshiftConsole").controller("ReplicaSetController", [ "$scope", "$filter", "$routeParams", "AuthorizationService", "BreadcrumbsService", "DataService", "DeploymentsService", "HPAService", "ImageStreamResolver", "Logger", "MetricsService", "ModalsService", "Navigate", "OwnerReferencesService", "PodsService", "ProjectsService", "StorageService", "keyValueEditorUtils", "kind", function(e, t, n, a, r, o, i, s, c, l, u, d, m, p, f, g, v, h, y) {
@@ -5950,9 +5950,9 @@ break;
case "ReplicationController":
e.resource = "replicationcontrollers", e.healthCheckURL = m.healthCheckURL(n.project, "ReplicationController", n.replicaSet);
}
-var P = {};
+var k = {};
e.projectName = n.project, e.kind = y, e.replicaSet = null, e.deploymentConfig = null, e.deploymentConfigMissing = !1, e.imagesByDockerReference = {}, e.builds = {}, e.alerts = {}, e.renderOptions = e.renderOptions || {}, e.renderOptions.hideFilterWidget = !0, e.forms = {}, e.logOptions = {};
-var k = [];
+var P = [];
u.isAvailable().then(function(t) {
e.metricsAvailable = t;
});
@@ -5970,7 +5970,7 @@ var a = s.filterHPA(h, "Deployment", e.deployment.metadata.name);
e.autoscalers = e.hpaForRS.concat(a);
} else e.autoscalers = e.hpaForRS;
}, T = function() {
-k.push(o.watch(e.resource, g, function(t) {
+P.push(o.watch(e.resource, g, function(t) {
var n, a = [];
angular.forEach(t.by("metadata.name"), function(t) {
(C(t, "deploymentConfig") || "") === e.deploymentConfigName && a.push(t);
@@ -6016,7 +6016,7 @@ a && o.get({
group: "apps",
resource: "deployments"
}, a.name, g).then(function(t) {
-e.deployment = t, e.healthCheckURL = m.healthCheckURL(n.project, "Deployment", t.metadata.name, "apps"), k.push(o.watchObject({
+e.deployment = t, e.healthCheckURL = m.healthCheckURL(n.project, "Deployment", t.metadata.name, "apps"), P.push(o.watchObject({
group: "apps",
resource: "deployments"
}, t.metadata.name, g, function(t, a) {
@@ -6033,7 +6033,7 @@ link: m.resourceURL(e.deployment)
},
humanizedKind: "Deployments"
}), A(), E();
-})), k.push(o.watch({
+})), P.push(o.watch({
group: "extensions",
resource: "replicasets"
}, g, function(e) {
@@ -6042,9 +6042,9 @@ B = $(t);
}));
});
}, U = function() {
-if (!_.isEmpty(P)) {
+if (!_.isEmpty(k)) {
var t = _.get(e, "replicaSet.spec.template");
-t && c.fetchReferencedImageStreamImages([ t ], e.imagesByDockerReference, P, g);
+t && c.fetchReferencedImageStreamImages([ t ], e.imagesByDockerReference, k, g);
}
};
o.get(e.resource, n.replicaSet, g, {
@@ -6060,12 +6060,12 @@ L();
}
N(), e.breadcrumbs = r.getBreadcrumbs({
object: t
-}), k.push(o.watchObject(e.resource, n.replicaSet, g, function(t, n) {
+}), P.push(o.watchObject(e.resource, n.replicaSet, g, function(t, n) {
"DELETED" === n && (e.alerts.deleted = {
type: "warning",
message: "This " + S + " has been deleted."
}), e.replicaSet = t, R(t), N(), U(), e.deployment && A();
-})), e.deploymentConfigName && T(), k.push(o.watch("pods", g, function(t) {
+})), e.deploymentConfigName && T(), P.push(o.watch("pods", g, function(t) {
var n = t.by("metadata.name");
e.podsForDeployment = f.filterForOwner(n, e.replicaSet);
}));
@@ -6079,18 +6079,18 @@ name: n.replicaSet,
kind: y,
namespace: n.project
});
-}), k.push(o.watch(e.resource, g, function(n, a, r) {
+}), P.push(o.watch(e.resource, g, function(n, a, r) {
e.replicaSets = n.by("metadata.name"), "ReplicationController" === y && (e.deploymentsByDeploymentConfig = i.associateDeploymentsToDeploymentConfig(e.replicaSets));
var o, s;
r && (o = C(r, "deploymentConfig"), s = r.metadata.name), e.deploymentConfigDeploymentsInProgress = e.deploymentConfigDeploymentsInProgress || {}, a ? "ADDED" === a || "MODIFIED" === a && t("deploymentIsInProgress")(r) ? (e.deploymentConfigDeploymentsInProgress[o] = e.deploymentConfigDeploymentsInProgress[o] || {}, e.deploymentConfigDeploymentsInProgress[o][s] = r) : "MODIFIED" === a && e.deploymentConfigDeploymentsInProgress[o] && delete e.deploymentConfigDeploymentsInProgress[o][s] : e.deploymentConfigDeploymentsInProgress = i.associateRunningDeploymentToDeploymentConfig(e.deploymentsByDeploymentConfig), r ? "DELETED" !== a && (r.causes = t("deploymentCauses")(r)) : angular.forEach(e.replicaSets, function(e) {
e.causes = t("deploymentCauses")(e);
});
-})), k.push(o.watch("imagestreams", g, function(e) {
+})), P.push(o.watch("imagestreams", g, function(e) {
var t = e.by("metadata.name");
-c.buildDockerRefMapForImageStreams(t, P), U(), l.log("imagestreams (subscribe)", t);
-})), k.push(o.watch("builds", g, function(t) {
+c.buildDockerRefMapForImageStreams(t, k), U(), l.log("imagestreams (subscribe)", t);
+})), P.push(o.watch("builds", g, function(t) {
e.builds = t.by("metadata.name"), l.log("builds (subscribe)", e.builds);
-})), k.push(o.watch({
+})), P.push(o.watch({
group: "autoscaling",
resource: "horizontalpodautoscalers",
version: "v1"
@@ -6102,12 +6102,12 @@ pollInterval: 6e4
})), o.list("limitranges", g).then(function(t) {
e.limitRanges = t.by("metadata.name"), N();
});
-k.push(o.watch("resourcequotas", g, function(t) {
+P.push(o.watch("resourcequotas", g, function(t) {
e.quotas = t.by("metadata.name");
}, {
poll: !0,
pollInterval: 6e4
-})), k.push(o.watch("appliedclusterresourcequotas", g, function(t) {
+})), P.push(o.watch("appliedclusterresourcequotas", g, function(t) {
e.clusterQuotas = t.by("metadata.name");
}, {
poll: !0,
@@ -6148,7 +6148,7 @@ cancelButtonText: "Cancel"
v.removeVolume(e.replicaSet, n, g);
});
}, e.$on("$destroy", function() {
-o.unwatchAll(k);
+o.unwatchAll(P);
});
}));
} ]), angular.module("openshiftConsole").controller("StatefulSetsController", [ "$scope", "$routeParams", "DataService", "ProjectsService", "LabelFilter", "PodsService", function(e, t, n, a, r, o) {
@@ -6393,23 +6393,23 @@ e.editAvailable = n && h(e.serviceInstance) && !_.get(e.serviceInstance, "metada
}
}, w = function() {
e.parameterFormDefinition = angular.copy(_.get(e.plan, "spec.externalMetadata.schemas.service_instance.update.openshift_form_definition")), e.parameterSchema = _.get(e.plan, "spec.instanceCreateParameterSchema"), C();
-}, P = function() {
+}, k = function() {
var t = _.get(e.serviceInstance, "spec.clusterServicePlanRef.name");
e.plan = _.find(e.servicePlans, {
metadata: {
name: t
}
}), w(), S();
-}, k = function() {
-e.serviceClass && !p && (e.servicePlans ? P() : p = i.getServicePlansForServiceClass(e.serviceClass).then(function(t) {
+}, P = function() {
+e.serviceClass && !p && (e.servicePlans ? k() : p = i.getServicePlansForServiceClass(e.serviceClass).then(function(t) {
var n = _.get(e.serviceInstance, "spec.clusterServicePlanRef.name");
e.servicePlans = _.reject(t.by("metadata.name"), function(e) {
return _.get(e, "status.removedFromBrokerCatalog") && e.metadata.name !== n;
-}), P(), p = null;
+}), k(), p = null;
}));
}, j = function() {
-e.serviceInstance && !m && (e.serviceClass ? k() : m = d.fetchServiceClassForInstance(e.serviceInstance).then(function(t) {
-e.serviceClass = t, e.displayName = v(e.serviceInstance, e.serviceClass), b(), m = null, k();
+e.serviceInstance && !m && (e.serviceClass ? P() : m = d.fetchServiceClassForInstance(e.serviceInstance).then(function(t) {
+e.serviceClass = t, e.displayName = v(e.serviceInstance, e.serviceClass), b(), m = null, P();
}));
}, R = function(t, n) {
e.loaded = !0, e.serviceInstance = t, "DELETED" === n && (e.alerts.deleted = {
@@ -7004,7 +7004,7 @@ return _.map(e, "metadata.name");
});
e.secrets.secretsByType = _.each(a, function(e) {
e.unshift("");
-}), k();
+}), P();
});
var n = function(e, n) {
e.type = n && n.kind ? n.kind : "None";
@@ -7149,12 +7149,12 @@ name: _.last(a)
}).namespace = 1 !== _.size(a) ? _.head(a) : e.buildConfig.metadata.namespace;
}
return n;
-}, P = function() {
+}, k = function() {
var t = [].concat(e.triggers.githubWebhooks, e.triggers.gitlabWebhooks, e.triggers.bitbucketWebhooks, e.triggers.genericWebhooks, e.triggers.imageChangeTriggers, e.triggers.builderImageChangeTrigger, e.triggers.configChangeTrigger);
return t = _.filter(t, function(e) {
return _.has(e, "disabled") && !e.disabled || e.present;
}), t = _.map(t, "data");
-}, k = function() {
+}, P = function() {
switch (e.secrets.picked = {
gitSecret: e.buildConfig.spec.source.sourceSecret ? [ e.buildConfig.spec.source.sourceSecret ] : [ {
name: ""
@@ -7228,7 +7228,7 @@ break;
case "Custom":
R(h(e.updatedBuildConfig), e.secrets.picked.sourceSecrets);
}
-e.updatedBuildConfig.spec.triggers = P(), b(), s.update("buildconfigs", e.updatedBuildConfig.metadata.name, e.updatedBuildConfig, e.context).then(function() {
+e.updatedBuildConfig.spec.triggers = k(), b(), s.update("buildconfigs", e.updatedBuildConfig.metadata.name, e.updatedBuildConfig, e.context).then(function() {
l.addNotification({
type: "success",
message: "Build config " + e.updatedBuildConfig.metadata.name + " was successfully updated."
@@ -7410,7 +7410,7 @@ details: t("getErrorDetails")(n)
}));
var w = function() {
return "Custom" !== e.strategyData.type && "Custom" !== e.originalStrategy && e.strategyData.type !== e.originalStrategy;
-}, P = function(t) {
+}, k = function(t) {
_.has(e.strategyData, t) || r.open({
animation: !0,
templateUrl: "views/modals/confirm.html",
@@ -7435,13 +7435,13 @@ e.strategyData[t] = {};
};
e.strategyChanged = function() {
var t = S(e.strategyData.type);
-w() ? P(t) : _.has(e.strategyData, t) || ("Custom" !== e.strategyData.type ? e.strategyData[t] = {} : e.strategyData[t] = {
+w() ? k(t) : _.has(e.strategyData, t) || ("Custom" !== e.strategyData.type ? e.strategyData[t] = {} : e.strategyData[t] = {
image: "",
command: [],
environment: []
}), e.strategyParamsPropertyName = t;
};
-var k = function(e, t, n, a) {
+var P = function(e, t, n, a) {
var r = {
kind: "ImageStreamTag",
namespace: t.namespace,
@@ -7460,7 +7460,7 @@ var t = _.reject(e.updatedDeploymentConfig.spec.triggers, function(e) {
return "ImageChange" === e.type || "ConfigChange" === e.type;
});
return _.each(e.containerConfigByName, function(n, a) {
-n.hasDeploymentTrigger ? t.push(k(a, n.triggerData.istag, n.triggerData.data, n.triggerData.automatic)) : _.find(e.updatedDeploymentConfig.spec.template.spec.containers, {
+n.hasDeploymentTrigger ? t.push(P(a, n.triggerData.istag, n.triggerData.data, n.triggerData.automatic)) : _.find(e.updatedDeploymentConfig.spec.template.spec.containers, {
name: a
}).image = n.image;
}), e.triggers.hasConfigTrigger && t.push({
@@ -7886,7 +7886,7 @@ e.projectTemplates = t.by("metadata.name");
}))) : l.toErrorPage("Catalog category " + r.category + "/" + r.subcategory + " not found.");
} else l.toErrorPage("Catalog category " + r.category + " not found.");
} ]), angular.module("openshiftConsole").controller("CreateFromImageController", [ "$scope", "$filter", "$parse", "$q", "$routeParams", "$uibModal", "APIService", "ApplicationGenerator", "DataService", "HPAService", "ImagesService", "LimitRangesService", "Logger", "MetricsService", "Navigate", "NotificationsService", "ProjectsService", "QuotaService", "SOURCE_URL_PATTERN", "SecretsService", "TaskList", "failureObjectNameFilter", "keyValueEditorUtils", function(e, t, n, a, r, o, i, s, c, l, u, d, m, p, f, g, v, h, y, b, C, S, w) {
-var P = t("displayName"), k = t("humanize");
+var k = t("displayName"), P = t("humanize");
e.projectName = r.project, e.sourceURLPattern = y;
var j = r.imageStream;
if (j) if (r.imageTag) {
@@ -8033,13 +8033,13 @@ message: "All resources for application " + e.name + " were created successfully
}) : (r = !0, n.failure.forEach(function(e) {
a.push({
type: "error",
-message: "Cannot create " + k(e.object.kind).toLowerCase() + ' "' + e.object.metadata.name + '". ',
+message: "Cannot create " + P(e.object.kind).toLowerCase() + ' "' + e.object.metadata.name + '". ',
details: e.data.message
});
}), n.success.forEach(function(e) {
a.push({
type: "success",
-message: "Created " + k(e.kind).toLowerCase() + ' "' + e.metadata.name + '" successfully. '
+message: "Created " + P(e.kind).toLowerCase() + ' "' + e.metadata.name + '" successfully. '
});
})), t.resolve({
alerts: a,
@@ -8075,7 +8075,7 @@ e.id = _.uniqueId("create-builder-alert-"), g.addNotification(e);
})) : _.isEmpty(N) ? $() : (B(N), e.disableInputs = !1);
};
e.projectDisplayName = function() {
-return P(this.project) || this.projectName;
+return k(this.project) || this.projectName;
}, e.createApp = function() {
e.disableInputs = !0, D(), e.buildConfig.envVars = w.compactEntries(e.buildConfigEnvVars), e.deploymentConfig.envVars = w.compactEntries(e.DCEnvVarsFromUser), e.labels = w.mapEntries(w.compactEntries(e.labelArray));
var t = s.generate(e);
@@ -8123,7 +8123,7 @@ return t;
}
function m() {
var e = g();
-r.templateImages = _.map(P, function(t) {
+r.templateImages = _.map(k, function(t) {
return _.isEmpty(t.usesParameters) ? t : {
name: _.template(t.name, {
interpolate: w
@@ -8140,12 +8140,12 @@ r && (a = r), a && t.push(a);
}), t;
}
function f(e) {
-P = [];
+k = [];
var t = [], n = {};
angular.forEach(e.objects, function(e) {
if ("BuildConfig" === e.kind) {
var a = S(b(e), h);
-a && P.push({
+a && k.push({
name: a,
usesParameters: d(a)
});
@@ -8154,11 +8154,11 @@ r && (n[r] = !0);
}
"DeploymentConfig" === e.kind && (t = t.concat(p(e)));
}), t.forEach(function(e) {
-n[e] || P.push({
+n[e] || k.push({
name: e,
usesParameters: d(e)
});
-}), P = _.uniqBy(P, "name");
+}), k = _.uniqBy(k, "name");
}
function g() {
var e = {};
@@ -8189,13 +8189,13 @@ details: "The `templateParamsMap` URL parameter is not valid JSON. " + e
});
}
}());
-var w = /\${([a-zA-Z0-9\_]+)}/g, P = [];
+var w = /\${([a-zA-Z0-9\_]+)}/g, k = [];
l.get(a.project).then(_.spread(function(n) {
if (r.project = n, h) i.get("templates", v, {
namespace: h || r.project.metadata.name
}).then(function(t) {
r.template = t, r.breadcrumbs[2].title = e("displayName")(t), f(t);
-_.some(P, function(e) {
+_.some(k, function(e) {
return !_.isEmpty(e.usesParameters);
}) ? (r.parameterDisplayNames = {}, _.each(t.parameters, function(e) {
r.parameterDisplayNames[e.name] = e.displayName || e.name;
@@ -8203,7 +8203,7 @@ r.parameterDisplayNames[e.name] = e.displayName || e.name;
r.$apply(m);
}, 50, {
maxWait: 250
-}), !0)) : r.templateImages = P;
+}), !0)) : r.templateImages = k;
}, function() {
s.toErrorPage("Cannot create from template: the specified template could not be retrieved.");
}); else {
@@ -8578,13 +8578,13 @@ var w = function() {
a.history.back();
};
n.cancel = w;
-var P = function(e) {
+var k = function(e) {
return n.attach.allContainers || n.attach.containers[e.name];
-}, k = function() {
+}, P = function() {
var e = _.get(n, "attach.resource.spec.template");
-n.existingMountPaths = m.getMountPaths(e, P);
+n.existingMountPaths = m.getMountPaths(e, k);
};
-n.$watchGroup([ "attach.resource", "attach.allContainers" ], k), n.$watch("attach.containers", k, !0);
+n.$watchGroup([ "attach.resource", "attach.allContainers" ], P), n.$watch("attach.containers", P, !0);
s.get(v, t.name, d).then(function(e) {
n.attach.resource = e, n.breadcrumbs = i.getBreadcrumbs({
object: e,
@@ -8610,7 +8610,7 @@ 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 (P(e)) {
+if (k(e)) {
var t = m.createVolumeMount(o, i, c, l);
e.volumeMounts || (e.volumeMounts = []), e.volumeMounts.push(t);
}
@@ -9518,7 +9518,7 @@ function y() {
var e = p.createResources.length, t = p.updateResources.length;
if (p.resourceKind.endsWith("List")) {
var a = [];
-t > 0 && a.push(P()), e > 0 && a.push(w()), n.all(a).then(b);
+t > 0 && a.push(k()), e > 0 && a.push(w()), n.all(a).then(b);
} else S();
}
function b() {
@@ -9529,7 +9529,9 @@ template: p.resource
}) : (n = p.templateOptions.add || p.updateResources.length > 0 ? p.input.selectedProject.metadata.name : "", e = s.createFromTemplateURL(p.resource, p.input.selectedProject.metadata.name, {
namespace: n
}), t.url(e)) : p.isDialog ? p.$emit("fileImportedFromYAMLOrJSON", {
-project: p.input.selectedProject
+project: p.input.selectedProject,
+resource: p.resource,
+isList: p.isList
}) : (e = s.projectOverviewURL(p.input.selectedProject.metadata.name), t.url(e));
}
function C(e) {
@@ -9626,7 +9628,7 @@ hasErrors: a
}), e.promise;
});
}
-function P() {
+function k() {
var e = {
started: "Updating resources in project " + A(p.input.selectedProject),
success: "Updated resources in project " + A(p.input.selectedProject),
@@ -9672,7 +9674,7 @@ alerts: n
}), e.promise;
});
}
-var k;
+var P;
p.noProjectsCantCreate = !1;
var j = e("humanizeKind"), R = e("getErrorDetails");
d.clear(), p.$on("no-projects-cannot-create", function() {
@@ -9680,7 +9682,7 @@ p.noProjectsCantCreate = !0;
}), p.input = {
selectedProject: p.project
}, p.aceLoaded = function(e) {
-(k = e.getSession()).setOption("tabSize", 2), k.setOption("useSoftTabs", !0), e.setDragDelay = 0, e.$blockScrolling = 1 / 0;
+(P = e.getSession()).setOption("tabSize", 2), P.setOption("useSoftTabs", !0), e.setDragDelay = 0, e.$blockScrolling = 1 / 0;
};
var I = function(e) {
a.open({
@@ -11520,12 +11522,12 @@ delete m.alerts[t], U = 1, j();
function w() {
return !(m.metricsError || U > 1) && (m.pod && _.get(m, "options.selectedContainer"));
}
-function P(e, t, n) {
+function k(e, t, n) {
t.total = p(t.id), t.total && (m.hasLimits = !0);
var a = _.get(n, "usage.value");
isNaN(a) && (a = 0), e.convert && (a = e.convert(a)), t.used = d3.round(a, e.usagePrecision), t.total && (t.available = d3.round(t.total - a, e.usagePrecision)), e.totalUsed += t.used;
}
-function k(e, t) {
+function P(e, t) {
m.noData = !1;
var n = _.initial(t.data);
e.data ? e.data = _.chain(e.data).takeRight(D).concat(n).value() : e.data = n;
@@ -11540,12 +11542,12 @@ var o = b(n, r, e);
if (o) {
var i = l.get(o);
a.push(i), p(r.id) && t.push(l.getCurrentUsage(o).then(function(e) {
-P(n, r, e);
+k(n, r, e);
}));
}
}), t = t.concat(a), r.all(a).then(function(e) {
A || angular.forEach(e, function(e) {
-e && k(_.find(n.datasets, {
+e && P(_.find(n.datasets, {
id: e.metricID
}), e);
});
@@ -11691,7 +11693,7 @@ count: 0
return _.each(R[e.descriptor], function(e) {
_.each(e, function(e) {
var t = s(e);
-(!k || k < e.end) && (k = e.end), n(e) || (t.total += e.value, t.count = t.count + 1);
+(!P || P < e.end) && (P = e.end), n(e) || (t.total += e.value, t.count = t.count + 1);
});
}), _.each(a, function(t, n) {
var a;
@@ -11710,7 +11712,7 @@ var a = t + "-dates";
_.set(i, [ "xs", t ], a);
var s = [ a ], c = [ t ];
o.push(s), o.push(c), _.each(R[r.descriptor][t], function(e) {
-if (s.push(e.start), (!k || k < e.end) && (k = e.end), n(e)) c.push(e.value); else {
+if (s.push(e.start), (!P || P < e.end) && (P = e.end), n(e)) c.push(e.value); else {
var t = r.convert ? r.convert(e.value) : e.value;
c.push(t);
}
@@ -11720,7 +11722,7 @@ return e[0];
}), i);
}
function u(e) {
-P || (N = 0, t.showAverage = _.size(t.pods) > 5 || w, _.each(t.metrics, function(n) {
+k || (N = 0, t.showAverage = _.size(t.pods) > 5 || w, _.each(t.metrics, function(n) {
var a, r = o(e, n), i = n.descriptor;
w && n.compactCombineWith && (i = n.compactCombineWith, n.lastValue && (T[i].lastValue = (T[i].lastValue || 0) + n.lastValue)), C[i] ? (C[i].load(r), t.showAverage ? C[i].legend.hide() : C[i].legend.show()) : ((a = D(n)).data = r, C[i] = c3.generate(a));
}));
@@ -11742,11 +11744,11 @@ pods: t.pods,
namespace: e.metadata.namespace,
bucketDuration: p()
};
-return w || (n.containerName = t.options.selectedContainer.name), n.start = k || d(), n;
+return w || (n.containerName = t.options.selectedContainer.name), n.start = P || d(), n;
}
}
function g(e) {
-if (!P) if (N++, t.noData) t.metricsError = {
+if (!k) if (N++, t.noData) t.metricsError = {
status: _.get(e, "status", 0),
details: _.get(e, "data.errorMsg") || _.get(e, "statusText") || "Status code " + _.get(e, "status", 0)
}; else if (!(N < 2) && t.alerts) {
@@ -11784,9 +11786,9 @@ t.loaded = !0;
});
}
}
-var b, C = {}, S = 30, w = "compact" === t.profile, P = !1;
+var b, C = {}, S = 30, w = "compact" === t.profile, k = !1;
t.uniqueID = s.uniqueID();
-var k, j, R = {}, I = w, E = function(e) {
+var P, j, R = {}, I = w, E = function(e) {
return e >= 1024;
};
t.metrics = [ {
@@ -11857,7 +11859,7 @@ var n = s.getDefaultSparklineConfig(e.chartID, e.units, w);
return _.set(n, "legend.show", !w && !t.showAverage), n;
};
t.$watch("options", function() {
-R = {}, k = null, delete t.metricsError, y();
+R = {}, P = null, delete t.metricsError, y();
}, !0), b = e(y, s.getDefaultUpdateInterval(), !1), t.updateInView = function(e) {
I = !e, e && (!j || Date.now() > j + s.getDefaultUpdateInterval()) && y();
};
@@ -11867,7 +11869,7 @@ s.redraw(C);
t.$on("$destroy", function() {
b && (e.cancel(b), b = null), A && (A(), A = null), angular.forEach(C, function(e) {
e.destroy();
-}), C = null, P = !0;
+}), C = null, k = !0;
});
}
};
@@ -11910,17 +11912,17 @@ t.autoScrollActive = !1;
});
}, w = function() {
u ? $(u).on("scroll", S) : m.on("scroll", S);
-}, P = function() {
+}, k = function() {
t.fixedHeight || p.affix({
target: window,
offset: {
top: t.followAffixTop || 0
}
});
-}, k = function() {
+}, P = function() {
return $("#" + t.logViewerID + " .log-view-output");
}, j = function(e) {
-var n = k(), a = n.offset().top;
+var n = P(), a = n.offset().top;
if (!(a < 0)) {
var r = $(".ellipsis-pulser").outerHeight(!0), o = t.fixedHeight ? t.fixedHeight : Math.floor($(window).height() - a - r);
t.chromeless || t.fixedHeight || (o -= 40), e ? n.animate({
@@ -11935,7 +11937,7 @@ t.sized = !0;
});
}, n = 0;
y = setInterval(function() {
-n > 10 ? e() : (n++, k().is(":visible") && (j(), e()));
+n > 10 ? e() : (n++, P().is(":visible") && (j(), e()));
}, 100);
}
}, I = _.debounce(function() {
@@ -12019,7 +12021,7 @@ l = e;
}, this.cacheAffixable = function(e) {
p = $(e);
}, this.start = function() {
-w(), P();
+w(), k();
}, angular.extend(t, {
ready: !0,
loading: !0,
@@ -13115,12 +13117,12 @@ cancelButtonText: "Cancel"
}
}
}).result.then(C);
-}, w = {}, P = function() {
+}, w = {}, k = function() {
i.hideNotification("process-template-error"), _.each(w, function(e) {
!e.id || "error" !== e.type && "warning" !== e.type || i.hideNotification(e.id);
});
-}, k = function(e) {
-P(), w = u.getSecurityAlerts(b, v.selectedProject.metadata.name);
+}, P = function(e) {
+k(), w = u.getSecurityAlerts(b, v.selectedProject.metadata.name);
var t = e.quotaAlerts || [];
w = w.concat(t), _.filter(w, {
type: "error"
@@ -13137,7 +13139,7 @@ v.disableInputs = !0, j().then(function(e) {
v.selectedProject = e, g = {
namespace: v.selectedProject.metadata.name
}, v.template.labels = m.mapEntries(m.compactEntries(v.labels)), r.create("processedtemplates", null, v.template, g).then(function(e) {
-s.setTemplateData(e.parameters, v.template.parameters, e.message), b = e.objects, l.getLatestQuotaAlerts(b, g).then(k);
+s.setTemplateData(e.parameters, v.template.parameters, e.message), b = e.objects, l.getLatestQuotaAlerts(b, g).then(P);
}, function(e) {
v.disableInputs = !1;
var t;
@@ -13159,8 +13161,8 @@ details: t
});
});
}, v.cancel = function() {
-P(), o.toProjectOverview(v.project.metadata.name);
-}, n.$on("instantiateTemplate", v.createFromTemplate), n.$on("$destroy", P);
+k(), o.toProjectOverview(v.project.metadata.name);
+}, n.$on("instantiateTemplate", v.createFromTemplate), n.$on("$destroy", k);
var R = function() {
return !_.get(v.template, "labels.app") && !_.some(v.template.objects, "metadata.labels.app");
};
@@ -13377,11 +13379,11 @@ e.$broadcast("importFileFromYAMLOrJSON");
}, s.instantiateTemplate = function() {
e.$broadcast("instantiateTemplate");
}, e.$on("fileImportedFromYAMLOrJSON", function(e, n) {
-s.selectedProject = n.project, s.template = n.template, s.iconClass = o(), s.image = i(), s.vendor = c(n.template, "openshift.io/provider-display-name"), s.docUrl = c(s.template, "openshift.io/documentation-url"), s.supportUrl = c(s.template, "openshift.io/support-url"), s.name = "YAML / JSON", t(function() {
+s.selectedProject = n.project, s.template = n.template, s.iconClass = o(), s.image = i(), s.vendor = c(n.template, "openshift.io/provider-display-name"), s.docUrl = c(s.template, "openshift.io/documentation-url"), s.supportUrl = c(s.template, "openshift.io/support-url"), s.actionLabel = "imported", n.isList ? (s.name = "YAML / JSON", s.kind = null) : n.resource && (s.kind = n.resource.kind, s.name = n.resource.metadata.name), t(function() {
s.currentStep = s.template ? "Template Configuration" : "Results";
}, 0);
}), e.$on("templateInstantiated", function(e, t) {
-s.selectedProject = t.project, s.name = a("displayName")(s.template), s.currentStep = "Results";
+s.selectedProject = t.project, s.name = a("displayName")(s.template), s.actionLabel = null, s.kind = null, s.currentStep = "Results";
}), s.close = function() {
s.template = null;
var e = s.onDialogClosed();
@@ -13416,7 +13418,7 @@ e.hasErrors && t.push(e);
}), t;
}
var r = this;
-r.showParamsTable = !1;
+r.showParamsTable = !1, r.actionLabel = r.actionLabel || "created";
var o = e.getTemplateData();
r.parameters = o.params, r.templateMessage = o.message, e.clearTemplateData();
var i = function(e) {
@@ -13445,7 +13447,9 @@ fromSampleRepo: "<",
createdBuildConfig: "<",
onContinue: "<",
showProjectName: "<",
-name: "<"
+kind: " 24 ? e.substring(0, 24) : e;
-}, P = function() {
+}, k = function() {
var e = _.last(n.import.name.split("/"));
return e = C(e), e = b(e), e = w(e);
};
@@ -14045,7 +14049,7 @@ namespace: n.input.selectedProject.metadata.name
if (n.import = e, n.loading = !1, "Success" === _.get(e, "result.status")) {
n.forms.imageSelection.imageName.$setValidity("imageLoaded", !0);
var t = n.import.image;
-t && (n.app.name = P(), n.runsAsRoot = i.runsAsRoot(t), n.ports = r.parsePorts(t), n.volumes = i.getVolumes(t), n.createImageStream = !0);
+t && (n.app.name = k(), n.runsAsRoot = i.runsAsRoot(t), n.ports = r.parsePorts(t), n.volumes = i.getVolumes(t), n.createImageStream = !0);
} else n.import.error = _.get(e, "result.message", "An error occurred finding the image.");
}, function(t) {
n.import.error = e("getErrorDetails")(t) || "An error occurred finding the image.", n.loading = !1;
@@ -14109,7 +14113,7 @@ details: g(e)
}
} else n.mode = "istag";
});
-var k, j = e("displayName"), R = function() {
+var P, j = e("displayName"), R = function() {
var e = {
started: "Deploying image " + n.app.name + " to project " + j(n.input.selectedProject),
success: "Deployed image " + n.app.name + " to project " + j(n.input.selectedProject),
@@ -14117,7 +14121,7 @@ failure: "Failed to deploy image " + n.app.name + " to project " + j(n.input.sel
};
d.clear(), d.add(e, {}, n.input.selectedProject.metadata.name, function() {
var e = t.defer();
-return o.batch(k, {
+return o.batch(P, {
namespace: n.input.selectedProject.metadata.name
}).then(function(t) {
var a, r = !_.isEmpty(t.failure);
@@ -14172,8 +14176,8 @@ e.id = _.uniqueId("deploy-image-alert-"), c.addNotification(e);
};
n.create = function() {
n.disableInputs = !0, h(), y().then(function(e) {
-n.input.selectedProject = e, k = m();
-var t = r.ifResourcesDontExist(k, n.input.selectedProject.metadata.name), a = u.getLatestQuotaAlerts(k, {
+n.input.selectedProject = e, P = m();
+var t = r.ifResourcesDontExist(P, n.input.selectedProject.metadata.name), a = u.getLatestQuotaAlerts(P, {
namespace: n.input.selectedProject.metadata.name
}), o = function(e) {
return n.nameTaken = e.nameTaken, a;
@@ -14628,11 +14632,11 @@ notifications: n
};
}, w = function(e) {
return _.filter(e, "unread");
-}, P = function() {
+}, k = function() {
_.each(p.notificationGroups, function(e) {
e.totalUnread = w(e.notifications).length, e.hasUnread = !!e.totalUnread, o.$emit("NotificationDrawerWrapper.onUnreadNotifications", e.totalUnread);
});
-}, k = function(e) {
+}, P = function(e) {
_.each(p.notificationGroups, function(t) {
_.remove(t.notifications, {
uid: e.uid,
@@ -14640,7 +14644,7 @@ namespace: e.namespace
});
});
}, j = function(e) {
-v[r.project] && delete v[r.project][e.uid], g[r.project] && delete g[r.project][e.uid], k(e);
+v[r.project] && delete v[r.project][e.uid], g[r.project] && delete g[r.project][e.uid], P(e);
}, R = function() {
g[r.project] = {}, v[r.project] = {};
}, I = function(e) {
@@ -14667,7 +14671,7 @@ return _.assign({}, e[n], t[n]);
return _.orderBy(e, [ "event.lastTimestamp", "event.metadata.resourceVersion" ], [ "desc", "desc" ]);
}, D = function() {
o.$evalAsync(function() {
-p.notificationGroups = [ S(r.project, N(T(g, v))) ], P();
+p.notificationGroups = [ S(r.project, N(T(g, v))) ], k();
});
}, A = function() {
_.each(f, function(e) {
@@ -14744,7 +14748,7 @@ p.drawerHidden = !0;
onLinkClick: function(e) {
e.onClick(), p.drawerHidden = !0;
},
-countUnreadNotifications: P
+countUnreadNotifications: k
}
});
var V = function() {
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index 8a2a790c51..db97b35973 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -7222,7 +7222,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"
\n" +
"
\n" +
"\n" +
- "\n" +
+ "\n" +
"\n" +
"
\n" +
"
\n" +
@@ -7776,7 +7776,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"
Pending\n" +
"
\n" +
"
\n" +
- "{{$ctrl.name}} is being created in {{$ctrl.projectName}}.\n" +
+ "{{$ctrl.kind | humanizeKind | upperFirst}}\n" +
+ "{{$ctrl.name}} is being {{$ctrl.actionLabel}} in {{$ctrl.projectName}}.\n" +
"
\n" +
"\n" +
"