From d422967891a68144e21673e43100cec527adb1fd Mon Sep 17 00:00:00 2001
From: Catherine Luse <catherine.luse@gmail.com>
Date: Mon, 12 Dec 2022 22:25:19 -0700
Subject: [PATCH] IP addresses render properly in Cluster Management

---
 shell/components/formatter/InternalExternalIP.vue |  8 ++++----
 shell/models/cluster.x-k8s.io.machine.js          | 10 ++++++----
 shell/models/management.cattle.io.node.js         |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/shell/components/formatter/InternalExternalIP.vue b/shell/components/formatter/InternalExternalIP.vue
index 9a390b5c91..398030b4ec 100644
--- a/shell/components/formatter/InternalExternalIP.vue
+++ b/shell/components/formatter/InternalExternalIP.vue
@@ -37,13 +37,13 @@ export default {
     <template v-else>
       -
     </template>
-
+    /
     <template>
-      <template v-if="isIp(row.internalIp) && internalSameAsExternal">
-        / {{ t('tableHeaders.internalIpSameAsExternal') }}
+      <template v-if="internalSameAsExternal && isIp(row.internalIp)">
+        {{ t('tableHeaders.internalIpSameAsExternal') }}
       </template>
       <template v-else-if="isIp(row.internalIp)">
-        /<CopyToClipboard
+        {{ row.internalIp }}<CopyToClipboard
           label-as="tooltip"
           :text="row.internalIp"
           class="icon-btn"
diff --git a/shell/models/cluster.x-k8s.io.machine.js b/shell/models/cluster.x-k8s.io.machine.js
index 5ce3f169d6..01fbc9b346 100644
--- a/shell/models/cluster.x-k8s.io.machine.js
+++ b/shell/models/cluster.x-k8s.io.machine.js
@@ -243,12 +243,14 @@ export default class CapiMachine extends SteveModel {
   }
 
   get internalIp() {
+    // This shows in the IP address column for RKE2 nodes in the
+    // list of nodes in the cluster detail page of Cluster Management.
     const internal = this.status?.addresses?.find(({ type }) => {
       return type === ADDRESSES.INTERNAL_IP;
-    });
+    })?.address;
 
     if (internal) {
-      return internal.address;
+      return internal;
     }
 
     return this.t('generic.none');
@@ -257,10 +259,10 @@ export default class CapiMachine extends SteveModel {
   get externalIp() {
     const external = this.status?.addresses?.find(({ type }) => {
       return type === ADDRESSES.EXTERNAL_IP;
-    });
+    })?.address;
 
     if (external) {
-      return external.address;
+      return external;
     }
 
     return this.t('generic.none');
diff --git a/shell/models/management.cattle.io.node.js b/shell/models/management.cattle.io.node.js
index a4ff295840..b287b6317a 100644
--- a/shell/models/management.cattle.io.node.js
+++ b/shell/models/management.cattle.io.node.js
@@ -126,8 +126,8 @@ export default class MgmtNode extends HybridModel {
   }
 
   get internalIp() {
-    // This shows in the IP address column for the list of
-    // nodes in the cluster detail page of Cluster Management.
+    // This shows in the IP address column for RKE1 nodes in the
+    // list of nodes in the cluster detail page of Cluster Management.
 
     const internal = this.status?.addresses?.find(({ type }) => {
       return type === ADDRESSES.INTERNAL_IP;