Merge pull request #11094 from rak-phillip/chore/rebase/release-2.7.p…

…atch1 Rebase `release-2.7.patch1` on top of `release-2.7`
rancher · May 22, 2024 · e79f950 · e79f950
2 parents e8c7a73 + ae31667
commit e79f950
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/shell/list/fleet.cattle.io.cluster.vue b/shell/list/fleet.cattle.io.cluster.vue
@@ -1,7 +1,7 @@
 <script>
 import FleetClusters from '@shell/components/fleet/FleetClusters';
 import { FLEET, MANAGEMENT } from '@shell/config/types';
-import { isHarvesterCluster } from '@shell/utils/cluster';
+import { filterOnlyKubernetesClusters } from '@shell/utils/cluster';
 import { Banner } from '@components/Banner';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 
@@ -56,7 +56,7 @@ export default {
     },
 
     filteredRows() {
-      return this.fleetClusters.filter((c) => !isHarvesterCluster(c));
+      return filterOnlyKubernetesClusters(this.fleetClusters, this.$store);
     },
 
     fleetClusters() {

diff --git a/shell/utils/cluster.js b/shell/utils/cluster.js
@@ -8,7 +8,7 @@ export function filterOnlyKubernetesClusters(mgmtClusters, store) {
   const openHarvesterContainerWorkload = store.getters['features/get']('harvester-baremetal-container-workload');
 
   return mgmtClusters.filter((c) => {
-    return openHarvesterContainerWorkload ? true : !c.isHarvester;
+    return openHarvesterContainerWorkload ? true : !isHarvesterCluster(c);
   });
 }