...
|
...
|
@@ -5575,18 +5575,18 @@ var b = angular.copy(_.get(a, "pod.spec.containers", []));
|
5575
|
5575
|
_.each(b, function(a) {
|
5576
|
5576
|
a.env = a.env || [], _.each(a.env, x);
|
5577
|
5577
|
}), a.containersEnv = b;
|
5578
|
|
-}, z = function(b, c) {
|
5579
|
|
-a.loaded = !0, a.pod = b, n(b), o(), y(), "DELETED" === c && (a.alerts.deleted = {
|
|
5578
|
+}, z = b("annotation"), A = function(b, c) {
|
|
5579
|
+a.loaded = !0, a.pod = b, a.dcName = z(b, "deploymentConfig"), a.rcName = z(b, "deployment"), a.deploymentVersion = z(b, "deploymentVersion"), n(b), o(), y(), "DELETED" === c && (a.alerts.deleted = {
|
5580
|
5580
|
type:"warning",
|
5581
|
5581
|
message:"This pod has been deleted."
|
5582
|
5582
|
});
|
5583
|
5583
|
};
|
5584
|
5584
|
k.get(c.project).then(_.spread(function(d, i) {
|
5585
|
5585
|
m = i, a.project = d, a.projectContext = i, g.get("pods", c.pod, i).then(function(b) {
|
5586
|
|
-z(b);
|
|
5586
|
+A(b);
|
5587
|
5587
|
var d = {};
|
5588
|
5588
|
d[b.metadata.name] = b, a.containerTerminals = u(), v(b), h.fetchReferencedImageStreamImages(d, a.imagesByDockerReference, a.imageStreamImageRefByDockerReference, m), l.push(g.watchObject("pods", c.pod, i, function(b, c) {
|
5589
|
|
-z(b, c), w(a.containerTerminals), v(b);
|
|
5589
|
+A(b, c), w(a.containerTerminals), v(b);
|
5590
|
5590
|
}));
|
5591
|
5591
|
}, function(c) {
|
5592
|
5592
|
a.loaded = !0, a.alerts.load = {
|
...
|
...
|
@@ -17313,6 +17313,15 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
|
17313
|
17313
|
"{{pod | podStatus | sentenceCase}}<span ng-if=\"pod | podCompletionTime\">, ran for {{(pod | podStartTime) | duration : (pod | podCompletionTime)}}</span>\n" +
|
17314
|
17314
|
"<span ng-if=\"pod.metadata.deletionTimestamp\">(expires {{pod.metadata.deletionTimestamp | date : 'medium'}})</span>\n" +
|
17315
|
17315
|
"</dd>\n" +
|
|
17316
|
+ "<dt ng-if-start=\"pod.status.message\">Message:</dt>\n" +
|
|
17317
|
+ "<dd ng-if-end>{{pod.status.message}}</dd>\n" +
|
|
17318
|
+ "<dt ng-if-start=\"dcName\">\n" +
|
|
17319
|
+ "Deployment:\n" +
|
|
17320
|
+ "</dt>\n" +
|
|
17321
|
+ "<dd ng-if-end>\n" +
|
|
17322
|
+ "<a ng-href=\"{{dcName | navigateResourceURL : 'DeploymentConfig' : pod.metadata.namespace}}\">{{dcName}}</a><span ng-if=\"rcName\">,\n" +
|
|
17323
|
+ "<a ng-href=\"{{rcName | navigateResourceURL : 'ReplicationController' : pod.metadata.namespace}}\"><span ng-if=\"deploymentVersion\">#{{deploymentVersion}}</span><span ng-if=\"!deploymentVersion\">{{rcName}}</span></a></span>\n" +
|
|
17324
|
+ "</dd>\n" +
|
17316
|
17325
|
"<dt ng-if-start=\"pod.metadata.deletionTimestamp && pod.spec.terminationGracePeriodSeconds\">Grace Period:</dt>\n" +
|
17317
|
17326
|
"<dd ng-if-end>\n" +
|
17318
|
17327
|
"\n" +
|
...
|
...
|
@@ -17323,8 +17332,6 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
|
17323
|
17323
|
"{{pod.spec.terminationGracePeriodSeconds | humanizeDurationValue : 'seconds'}}\n" +
|
17324
|
17324
|
"</span>\n" +
|
17325
|
17325
|
"</dd>\n" +
|
17326
|
|
- "<dt ng-if-start=\"pod.status.message\">Message:</dt>\n" +
|
17327
|
|
- "<dd ng-if-end>{{pod.status.message}}</dd>\n" +
|
17328
|
17326
|
"<dt>IP:</dt>\n" +
|
17329
|
17327
|
"<dd>{{pod.status.podIP || 'unknown'}}</dd>\n" +
|
17330
|
17328
|
"<dt>Node:</dt>\n" +
|
...
|
...
|
@@ -17373,10 +17380,10 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
|
17373
|
17373
|
"<h4>Volumes</h4>\n" +
|
17374
|
17374
|
"<volumes ng-if=\"pod.spec.volumes.length\" volumes=\"pod.spec.volumes\" namespace=\"project.metadata.name\"></volumes>\n" +
|
17375
|
17375
|
"<div ng-if=\"!pod.spec.volumes.length\">none</div>\n" +
|
17376
|
|
- "<p ng-if=\"(pod | annotation:'deploymentConfig') && ('deploymentconfigs' | canI : 'update')\">\n" +
|
17377
|
|
- "<a ng-href=\"project/{{project.metadata.name}}/attach-pvc?kind=DeploymentConfig&name={{pod | annotation:'deploymentConfig'}}\">Add Storage to {{pod | annotation : 'deploymentConfig'}}</a>\n" +
|
|
17376
|
+ "<p ng-if=\"dcName && ('deploymentconfigs' | canI : 'update')\">\n" +
|
|
17377
|
+ "<a ng-href=\"project/{{project.metadata.name}}/attach-pvc?kind=DeploymentConfig&name={{dcName}}\">Add Storage to {{dcName}}</a>\n" +
|
17378
|
17378
|
"<span class=\"action-divider\" aria-hidden=\"true\">|</span>\n" +
|
17379
|
|
- "<a ng-href=\"project/{{project.metadata.name}}/add-config-volume?kind=DeploymentConfig&name={{pod | annotation : 'deploymentConfig'}}\">Add Config Files to {{pod | annotation : 'deploymentConfig'}}</a>\n" +
|
|
17379
|
+ "<a ng-href=\"project/{{project.metadata.name}}/add-config-volume?kind=DeploymentConfig&name={{dcName}}\">Add Config Files to {{dcName}}</a>\n" +
|
17380
|
17380
|
"</p>\n" +
|
17381
|
17381
|
"</div>\n" +
|
17382
|
17382
|
"</div>\n" +
|