added 'resolve refs' checkbox for environment vars expander

matt-deboer · Nov 1, 2017 · c7ff7bc · c7ff7bc
1 parent 43e3b97
commit c7ff7bc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/pkg/ui/src/components/configuration-pane/ContainerPanel.css b/pkg/ui/src/components/configuration-pane/ContainerPanel.css
@@ -34,6 +34,9 @@ span.env-ref-type {
 span.env-ref-key {
   padding-left: 3px; }
 
+pre.quoted-string {
+  margin: 0px; }
+
 .quoted-string {
   color: #1e88e5; }
   .quoted-string:before {

diff --git a/pkg/ui/src/components/configuration-pane/ContainerPanel.scss b/pkg/ui/src/components/configuration-pane/ContainerPanel.scss
@@ -41,6 +41,10 @@ span.env-ref-key {
   padding-left: 3px;
 }
 
+pre.quoted-string {
+  margin: 0px;
+}
+
 .quoted-string {
   color: rgb(30, 136, 229);
   &:before {

diff --git a/pkg/ui/src/components/configuration-pane/EnvironmentExpander.js b/pkg/ui/src/components/configuration-pane/EnvironmentExpander.js
@@ -75,7 +75,7 @@ class StringArrayExpander extends React.PureComponent {
   constructor(props) {
     super(props)
     this.state = {
-      resolveRefs: true,
+      resolveRefs: false,
     }
   }
 
@@ -87,15 +87,16 @@ class StringArrayExpander extends React.PureComponent {
 
   renderEnvValue = (env, linkGenerator, resources, resolve) => {
     let { namespace } = this.props
+    var refKey, ref
     if ('value' in env) {
       return <span className="quoted-string">{env.value}</span>
     } else if ('valueFrom' in env) {
       let valueFrom = env.valueFrom
       if ('secretKeyRef' in valueFrom) {
-        let refKey = `Secret/${namespace}/${valueFrom.secretKeyRef.name}`
+        refKey = `Secret/${namespace}/${valueFrom.secretKeyRef.name}`
         if (resolve && !!resources[refKey]) {
-          let ref = resources[refKey]
-          return <span className="quoted-string">{ref.data.key}</span>
+          ref = resources[refKey]
+          return <pre className="quoted-string">{ref.data[valueFrom.secretKeyRef.key]}</pre>
         } else {
           return (
             <div>
@@ -107,10 +108,10 @@ class StringArrayExpander extends React.PureComponent {
           )
         }
       } else if ('configMapKeyRef' in valueFrom) {
-        let refKey = `ConfigMap/${namespace}/${valueFrom.configMapKeyRef.name}`
+        refKey = `ConfigMap/${namespace}/${valueFrom.configMapKeyRef.name}`
         if (resolve && !!resources[refKey]) {
-          let ref = resources[refKey]
-          return <span className="quoted-string">{ref.data.key}</span>
+          ref = resources[refKey]
+          return <pre className="quoted-string">{ref.data[valueFrom.configMapKeyRef.key]}</pre>
         } else {
           return (
             <div>