Merge pull request #5459 from jwforres/update_obj_describer_1.1.1

Merged by openshift-bot
openshift · Oct 30, 2015 · 0aae762 · 0aae762
2 parents 27fae22 + 5202faa
commit 0aae762
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/assets/bower.json b/assets/bower.json
@@ -29,7 +29,7 @@
     "kubernetes-label-selector": "0.0.16",
     "kubernetes-topology-graph": "0.0.19",
     "kubernetes-container-terminal": "0.0.7",
-    "openshift-object-describer": "1.1.0",
+    "openshift-object-describer": "1.1.1",
     "layout.attrs": "1.1.2",
     "bootstrap-hover-dropdown": "~2.1.3"
   },

diff --git a/hack/install-assets.sh b/hack/install-assets.sh
@@ -58,7 +58,7 @@ pushd ${OS_ROOT}/assets > /dev/null
 
   # In case upstream components change things without incrementing versions
   cmd "bower cache clean --allow-root"
-  cmd "bower install --allow-root"
+  cmd "bower update --allow-root"
 
   cmd "rm -rf openshift-jvm"
   cmd "mkdir -p openshift-jvm"

diff --git a/pkg/assets/bindata.go b/pkg/assets/bindata.go
@@ -43521,7 +43521,7 @@ a.put("views/container-statuses.html", '<div ng-if="!containerStatuses"><em>none
 a.put("views/default-describer.html", '<div>\n  <kubernetes-object-describe-header resource="resource" kind="kind"></kubernetes-object-describe-header>\n  <kubernetes-object-describe-metadata resource="resource"></kubernetes-object-describe-metadata>\n  <kubernetes-object-describe-footer resource="resource"></kubernetes-object-describe-footer>\n</div>'), a.put("views/footer.html", '<div style="margin-top: 10px;">\n  <a ng-if="moreDetailsLink" href="{{moreDetailsLink}}">More details...</a>  \n</div>'), a.put("views/header.html", "<h3>{{kind || resource.kind || 'Resource'}}</h3>"), a.put("views/labels.html", '<h3>Labels</h3>\n<span ng-if="!resource.metadata.labels"><em>none</em></span>\n<dl class="dl-horizontal" ng-if="resource.metadata.labels">\n  <dt ng-repeat-start="(labelKey, labelValue) in resource.metadata.labels" title="{{labelKey}}">{{labelKey}}</dt>\n  <dd ng-repeat-end>{{labelValue}}</dd>\n</dl>'), a.put("views/metadata.html", '<dl class="dl-horizontal">\n  <dt>Name</dt>\n  <dd>{{resource.metadata.name}}</dd>\n  <dt ng-if="resource.metadata.namespace">Namespace</dt>\n  <dd ng-if="resource.metadata.namespace">{{resource.metadata.namespace}}</dd>\n  <dt>Created</dt>\n  <dd>{{resource.metadata.creationTimestamp | date:\'medium\'}}</dd>    \n</dl>\n<kubernetes-object-describe-labels resource="resource"></kubernetes-object-describe-labels>\n<kubernetes-object-describe-annotations resource="resource"></kubernetes-object-describe-annotations>\n'), 
 a.put("views/pod-template.html", '<h3>Pod Template</h3>\n<dl class="dl-horizontal">\n  <dt>Restart policy</dt>\n  <dd>{{template.restartPolicy}}</dd>\n  <dt>DNS policy</dt>\n  <dd>{{template.dnsPolicy}}</dd>\n  <dt ng-if="template.serviceAccountName">Service account</dt>\n  <dd ng-if="template.serviceAccountName">{{template.serviceAccountName}}</dd>\n</dl>  \n<h4>Containers</h4>\n<kubernetes-object-describe-containers containers="template.containers"></kubernetes-object-describe-containers>\n<h4>Volumes</h4>\n<kubernetes-object-describe-volumes volumes="template.volumes"></kubernetes-object-describe-volumes> \n'), a.put("views/pod.html", '<div>\n  <kubernetes-object-describe-header resource="resource" kind="kind"></kubernetes-object-describe-header>\n  <dl class="dl-horizontal">\n    <dt>Name</dt>\n    <dd>{{resource.metadata.name}}</dd>\n    <dt>Namespace</dt>\n    <dd>{{resource.metadata.namespace}}</dd>\n    <dt>Created</dt>\n    <dd>{{resource.metadata.creationTimestamp | date:\'medium\'}}</dd>\n    <dt>Restart policy</dt>\n    <dd>{{resource.spec.restartPolicy || \'Always\'}}</dd>\n    <dt ng-if="resource.spec.serviceAccountName">Service account</dt>\n    <dd ng-if="resource.spec.serviceAccountName">{{resource.spec.serviceAccountName}}</dd>\n  </dl>\n  <h3>Status</h3>\n  <dl class="dl-horizontal">\n    <dt>Phase</dt>\n    <dd>{{resource.status.phase}}</dd>\n    <dt>Node</dt>\n    <dd>{{resource.spec.nodeName || \'unknown\'}}\n      <span ng-if="resource.status.hostIP && resource.spec.nodeName != resource.status.hostIP">({{resource.status.hostIP}})</span></dd>\n    <dt>IP on node</dt>\n    <dd>\n      {{resource.status.podIP}}\n      <span ng-if="!resource.status.podIP"><em>none</em></span>\n    </dd>\n  </dl>\n  <h3>Container Statuses</h3>\n  <kubernetes-object-describe-container-statuses container-statuses="resource.status.containerStatuses"></kubernetes-object-describe-container-statuses>\n  <h3>Containers</h3>\n  <kubernetes-object-describe-containers containers="resource.spec.containers"></kubernetes-object-describe-containers>\n  <h3>Volumes</h3>\n  <kubernetes-object-describe-volumes volumes="resource.spec.volumes"></kubernetes-object-describe-volumes>\n  <kubernetes-object-describe-labels resource="resource"></kubernetes-object-describe-labels>\n  <kubernetes-object-describe-annotations resource="resource"></kubernetes-object-describe-annotations>\n  <kubernetes-object-describe-footer resource="resource"></kubernetes-object-describe-footer>\n</div>\n'), 
 a.put("views/replication-controller.html", '<div>\n  <kubernetes-object-describe-header resource="resource" kind="kind"></kubernetes-object-describe-header>\n  <dl class="dl-horizontal">\n    <dt>Name</dt>\n    <dd>{{resource.metadata.name}}</dd>\n    <dt>Namespace</dt>\n    <dd>{{resource.metadata.namespace}}</dd>\n    <dt>Created</dt>\n    <dd>{{resource.metadata.creationTimestamp | date:\'medium\'}}</dd>\n    <dt>Replicas</dt>\n    <dd>{{(resource.spec.replicas === undefined) ? 1 : resource.spec.replicas}}</dd>\n  </dl>\n  <h3>Selector</h3>\n  <dl class="dl-horizontal">\n    <dt ng-repeat-start="(selectorKey, selectorValue) in resource.spec.selector" title="{{selectorKey}}">{{selectorKey}}</dt>\n    <dd ng-repeat-end>{{selectorValue}}</dd>\n  </dl>\n  <kubernetes-object-describe-pod-template template="resource.spec.template.spec"></kubernetes-object-describe-pod-template>\n  <kubernetes-object-describe-labels resource="resource"></kubernetes-object-describe-labels>\n  <kubernetes-object-describe-annotations resource="resource"></kubernetes-object-describe-annotations>\n  <kubernetes-object-describe-footer resource="resource"></kubernetes-object-describe-footer>\n</div>\n'), 
-a.put("views/service.html", '<div>\n  <kubernetes-object-describe-header resource="resource" kind="kind"></kubernetes-object-describe-header>\n  <dl class="dl-horizontal">\n    <dt>Name</dt>\n    <dd>{{resource.metadata.name}}</dd>\n    <dt>Namespace</dt>\n    <dd>{{resource.metadata.namespace}}</dd>\n    <dt>Created</dt>\n    <dd>{{resource.metadata.creationTimestamp | date:\'medium\'}}</dd>\n    <dt>Type</dt>\n    <dd>{{resource.spec.type}}</dd>\n    <dt>IP</dt>\n    <dd>{{resource.spec.clusterIP}}</dd>\n    <dt>Ports</dt>\n    <dd>\n      <div ng-if="!resource.spec.ports.length">None</div>\n      <div ng-repeat="portMapping in resource.spec.ports | orderBy:\'port\'">\n        {{portMapping.port}} &#8594; {{portMapping.targetPort}} ({{portMapping.protocol}})\n      </div>\n    </dd>\n    <dt>Session affinity</dt>\n    <dd>{{resource.spec.sessionAffinity}}</dd>    \n    <dt ng-if="resource.status.loadBalancer.ingress.length">Ingress points</dt>\n    <dd ng-if="resource.status.loadBalancer.ingress.length">\n      <span ng-repeat="ingress in resource.status.loadBalancer.ingress"\n        >{{ingress.ip}}<span ng-if="!$last">, </span></span>\n    </dd>\n  </dl>\n  <h3>Selector</h3>\n  <dl class="dl-horizontal">\n    <dt ng-repeat-start="(selectorKey, selectorValue) in resource.spec.selector">{{selectorKey}}</dt>\n    <dd ng-repeat-end>{{selectorValue}}</dd>\n  </dl>\n  <kubernetes-object-describe-labels resource="resource"></kubernetes-object-describe-labels>\n  <kubernetes-object-describe-annotations resource="resource"></kubernetes-object-describe-annotations>\n  <kubernetes-object-describe-footer resource="resource"></kubernetes-object-describe-footer>\n</div>\n'), 
+a.put("views/service.html", '<div>\n  <kubernetes-object-describe-header resource="resource" kind="kind"></kubernetes-object-describe-header>\n  <dl class="dl-horizontal">\n    <dt>Name</dt>\n    <dd>{{resource.metadata.name}}</dd>\n    <dt>Namespace</dt>\n    <dd>{{resource.metadata.namespace}}</dd>\n    <dt>Created</dt>\n    <dd>{{resource.metadata.creationTimestamp | date:\'medium\'}}</dd>\n    <dt>Type</dt>\n    <dd>{{resource.spec.type}}</dd>\n    <dt>IP</dt>\n    <dd>{{resource.spec.clusterIP}}</dd>\n    <dt>Ports</dt>\n    <dd>\n      <div ng-if="!resource.spec.ports.length">None</div>\n      <div ng-repeat="portMapping in resource.spec.ports | orderBy:\'port\'">\n        {{portMapping.port}}/{{portMapping.protocol}} &#8594; {{portMapping.targetPort}}\n      </div>\n    </dd>\n    <dt>Session affinity</dt>\n    <dd>{{resource.spec.sessionAffinity}}</dd>    \n    <dt ng-if="resource.status.loadBalancer.ingress.length">Ingress points</dt>\n    <dd ng-if="resource.status.loadBalancer.ingress.length">\n      <span ng-repeat="ingress in resource.status.loadBalancer.ingress"\n        >{{ingress.ip}}<span ng-if="!$last">, </span></span>\n    </dd>\n  </dl>\n  <h3>Selector</h3>\n  <dl class="dl-horizontal">\n    <dt ng-repeat-start="(selectorKey, selectorValue) in resource.spec.selector">{{selectorKey}}</dt>\n    <dd ng-repeat-end>{{selectorValue}}</dd>\n  </dl>\n  <kubernetes-object-describe-labels resource="resource"></kubernetes-object-describe-labels>\n  <kubernetes-object-describe-annotations resource="resource"></kubernetes-object-describe-annotations>\n  <kubernetes-object-describe-footer resource="resource"></kubernetes-object-describe-footer>\n</div>\n'), 
 a.put("views/volumes.html", '<div ng-if="!volumes.length"><em>none</em></div>\n<dl class="dl-horizontal" ng-repeat="volume in volumes">\n<dt>Name</dt>\n<dd>{{volume.name}}</dd>\n<!-- Type = host path -->\n<dt ng-if-start="volume.hostPath">Type</dt>\n<dd>host path</dd>\n<dt>Path</dt>\n<dd ng-if-end>{{volume.hostPath.path}}</dd>\n<!-- Type = empty dir -->\n<dt ng-if-start="volume.emptyDir">Type</dt>\n<dd ng-if-end>empty directory</dd>\n<!-- Type = GCE persistent disk - TODO fill out details -->\n<dt ng-if-start="volume.gcePersistentDisk">Type</dt>\n<dd ng-if-end>GCE persistent disk</dd>\n<!-- Type = git repo -->\n<dt ng-if-start="volume.gitRepo">Type</dt>\n<dd>Git repository</dd>\n<dt>Repository</dt>\n<dd>{{volume.gitRepo.repository}}</dd>\n<dt>Revision</dt>\n<dd ng-if-end>\n  <span ng-if="volume.gitRepo.revision">{{volume.gitRepo.revision}}</span>\n  <span ng-if="!volume.gitRepo.revision"><em>not specified</em></span>\n</dd>\n</dl>');
 } ]);