From 83af50577f9754dd6e227912d162d35e97b83856 Mon Sep 17 00:00:00 2001 From: Westly Wright Date: Fri, 29 Jan 2021 08:41:12 -0700 Subject: [PATCH] fix undefined check on eks v2 rancher/rancher#31048 --- .../addon/components/cluster-driver/driver-eks/component.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/shared/addon/components/cluster-driver/driver-eks/component.js b/lib/shared/addon/components/cluster-driver/driver-eks/component.js index a74221d3d..674b0decd 100644 --- a/lib/shared/addon/components/cluster-driver/driver-eks/component.js +++ b/lib/shared/addon/components/cluster-driver/driver-eks/component.js @@ -392,8 +392,8 @@ export default Component.extend(ClusterDriver, { importedClusterIsPending: computed('clusterIsPending', 'model.originalCluster', function() { const { clusterIsPending } = this; const originalCluster = get(this, 'model.originalCluster'); - const ourClusterSpec = get(originalCluster, 'eksConfig'); - const upstreamSpec = get(originalCluster, 'eksStatus.upstreamSpec'); + const ourClusterSpec = get(( originalCluster ?? {} ), 'eksConfig'); + const upstreamSpec = get(( originalCluster ?? {} ), 'eksStatus.upstreamSpec'); return clusterIsPending && get(ourClusterSpec, 'imported') && !isEmpty(upstreamSpec); }),