Merge pull request #1009 from codyrancher/node-ip-fixes

Cleaning up some internal/external ip address problems

assets/translations/en-us.yaml

@@ -502,7 +502,9 @@ node:
       memoryPressure: Memory Pressure
       pidPressure: PID Pressure
     tab:
-      address: Address
+      address: 
+        label: Address
+        externalIp: ExternalIP
       conditions: Conditions
       images: images
       info: Info
@@ -719,7 +721,7 @@ tableHeaders:
   image: Image
   imageSize: Size
   ingressTarget: Target
-  internalExternalIp: Internal/External IP
+  internalExternalIp: External/Internal IP
   key: Key
   keys: Data
   lastHeartbeatTime: Last update

config/table-headers.js

@@ -118,7 +118,7 @@ export const RAM = {
   sort:      'ram',
   value:     'ramUsagePercentage',
   formatter: 'PercentageBar',
-  width:     102,
+  width:     120,
 };
 
 export const PODS = {

detail/node.vue

@@ -112,7 +112,16 @@ export default {
     },
 
     addressTableRows() {
-      return this.value.status.addresses;
+      const addresses = [...this.value.status.addresses];
+
+      if (this.value.externalIp) {
+        addresses.push({
+          type:    this.t('node.detail.tab.address.externalIp'),
+          address: this.value.externalIp
+        });
+      }
+
+      return addresses;
     },
 
     imageTableRows() {
@@ -197,7 +206,7 @@ export default {
             :search="false"
           />
         </Tab>
-        <Tab name="address" :label="t('node.detail.tab.address')">
+        <Tab name="address" :label="t('node.detail.tab.address.label')">
           <SortableTable
             key-field="_key"
             :headers="addressTableHeaders"

models/node.js

@@ -222,7 +222,7 @@ export default {
     return [{
       label:     this.t('node.detail.detailTop.ipAddress'),
       formatter: 'CopyToClipboardText',
-      content:   this.internalIp
+      content:   this.externalIp || this.internalIp
     },
     {
       label:    this.t('node.detail.detailTop.version'),