Merge pull request #860 from spadgett/secret-link

Merged by openshift-bot

Author: OpenShift Bot

app/views/_volumes.html

@@ -10,17 +10,24 @@ <h5>{{volume.name}}</h5>
       <dt>Type:</dt>
       <dd>
         secret
-        <span class="small text-muted">(populated by a Secret when the pod is created)</span>
+        <span class="small text-muted">(populated by a secret when the pod is created)</span>
+      </dd>
+      <dt>Secret:</dt>
+      <dd>
+        <span ng-if="'secrets' | canI : 'get'">
+          <a ng-href="{{volume.secret.secretName | navigateResourceURL : 'Secret' : namespace}}">{{volume.secret.secretName}}</a>
+        </span>
+        <span ng-if="!('secrets' | canI : 'get')">
+          {{volume.secret.secretName}}
+        </span>
       </dd>
-      <dt>Secret Name:</dt>
-      <dd>{{volume.secret.secretName}}</dd>
     </div>
     <div ng-if="volume.persistentVolumeClaim">
       <dt>Type:</dt>
       <dd>
-				persistent volume claim
-        <span class="small text-muted">(reference to a Persistent Volume Claim)</span>
-			</dd>
+        persistent volume claim
+        <span class="small text-muted">(reference to a persistent volume claim)</span>
+      </dd>
       <dt>Claim name:</dt>
       <dd><a ng-href="{{volume.persistentVolumeClaim.claimName | navigateResourceURL : 'PersistentVolumeClaim' : namespace}}">{{volume.persistentVolumeClaim.claimName}}</a></dd>
       <dt>Mode:</dt>
@@ -76,7 +83,7 @@ <h5>{{volume.name}}</h5>
       <dt>Type:</dt>
       <dd>
         config map
-        <span class="small text-muted">(populated by a Config Map)</span>
+        <span class="small text-muted">(populated by a config map)</span>
        </dd>
       <dt>Name:</dt>
       <dd>{{volume.configMap.name}}</dd>

dist/scripts/templates.js

@@ -766,16 +766,23 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<dt>Type:</dt>\n" +
     "<dd>\n" +
     "secret\n" +
-    "<span class=\"small text-muted\">(populated by a Secret when the pod is created)</span>\n" +
+    "<span class=\"small text-muted\">(populated by a secret when the pod is created)</span>\n" +
+    "</dd>\n" +
+    "<dt>Secret:</dt>\n" +
+    "<dd>\n" +
+    "<span ng-if=\"'secrets' | canI : 'get'\">\n" +
+    "<a ng-href=\"{{volume.secret.secretName | navigateResourceURL : 'Secret' : namespace}}\">{{volume.secret.secretName}}</a>\n" +
+    "</span>\n" +
+    "<span ng-if=\"!('secrets' | canI : 'get')\">\n" +
+    "{{volume.secret.secretName}}\n" +
+    "</span>\n" +
     "</dd>\n" +
-    "<dt>Secret Name:</dt>\n" +
-    "<dd>{{volume.secret.secretName}}</dd>\n" +
     "</div>\n" +
     "<div ng-if=\"volume.persistentVolumeClaim\">\n" +
     "<dt>Type:</dt>\n" +
     "<dd>\n" +
     "persistent volume claim\n" +
-    "<span class=\"small text-muted\">(reference to a Persistent Volume Claim)</span>\n" +
+    "<span class=\"small text-muted\">(reference to a persistent volume claim)</span>\n" +
     "</dd>\n" +
     "<dt>Claim name:</dt>\n" +
     "<dd><a ng-href=\"{{volume.persistentVolumeClaim.claimName | navigateResourceURL : 'PersistentVolumeClaim' : namespace}}\">{{volume.persistentVolumeClaim.claimName}}</a></dd>\n" +
@@ -832,7 +839,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<dt>Type:</dt>\n" +
     "<dd>\n" +
     "config map\n" +
-    "<span class=\"small text-muted\">(populated by a Config Map)</span>\n" +
+    "<span class=\"small text-muted\">(populated by a config map)</span>\n" +
     "</dd>\n" +
     "<dt>Name:</dt>\n" +
     "<dd>{{volume.configMap.name}}</dd>\n" +