@rancher/shell 0.5.3 → 1.2.1

package/assets/translations/zh-hans.yaml

@@ -845,6 +845,9 @@ catalog:
       keywords: 关键词
     errors:
       clusterToolExists: 此 Chart 含有固定的命名空间和名称。找到一个匹配的 <a href="{url}">应用</a>，任何修改都将应用于此应用。
+    banner:
+      legacy: 'PSP 删除：在将集群升级到 Kubernetes 1.25+ 之前，请确保你针对 PSP 检查了 Helm 应用程序并相应进行更新'
+    enablePSP: 启用 Pod 安全策略
     global: 全局
   charts:
     all: 全部
@@ -884,7 +887,7 @@ catalog:
       requiresFound: '在安装这个 Chart 前，你需要安装<a href="{url}">{name}</a>。'
       requiresMissing: '这个 Chart 另一个提供 {name} 的 Chart，但我们找不到这个Chart。'
       insufficientCpu: '这个 Chart 需要 {need, number} 个 CPU 核，但集群只有 {have, number} 个可用。'
-      insufficientMemory: '这个 Chart 需要 {need} 内存，但集群只有 {have} 可用。'
+      insufficientMemory: '这个 Cchart 需要 {need} 内存，但集群只有 {have} 可用。'
       legacy:
         label: 这是个 {legacyType} 应用，无法在这里修改。
         enableLegacy:
@@ -1670,7 +1673,10 @@ cluster:
     os: '你正在将 {newOS} worker 节点添加到具有一个或多个 {existingOS} worker 节点的集群。你可能需要升级或删除某些已安装的应用。'
     rke2-k3-reprovisioning: '更改集群配置可能导致节点重新配置。详情请参见 <a target="blank" href="{docsBase}/cluster-provisioning/rke-clusters/behavior-differences-between-rke1-and-rke2/" target="_blank" rel="noopener nofollow">文档</a>。'
     desiredNodeGroupWarning: 没有可用于运行 Cluster Agent 的节点。要让集群变为 Active 状态，至少需要有 1 个可用的节点。
+    invalidPsps: 你在此集群中有一个或多个 PSP 资源。Pod 安全策略在 Kubernetes v1.25 中不可用并将自动删除。
     haveArgInfo: 所选 Kubernetes 版本的配置信息不可用。此屏幕中可用的选项将受到限制，你可能需要使用 YAML 编辑器。
+    deprecatedPsp: Pod 安全策略自 Kubernetes v1.21 起已弃用，并已在 Kubernetes v1.25 中删除。
+    removedPsp: Pod 安全策略已在 Kubernetes v1.25 中删除，请改用 Pod Security Admission。
   rkeTemplateUpgrade: 模板修订版 {name} 可用于升级
 
   availabilityWarnings:
@@ -1829,6 +1835,10 @@ cluster:
       psaChange: PSACT 现在自动设置为 Rancher 默认值
       cisOverride: 更改此设置可能会影响集群安全，因为它会覆盖默认的 CIS 设置
       cisUnsupported: 所选 Kubernetes 版本不再支持 CIS 配置文件 “{cisProfile}”，请选择支持的配置文件。建议你查看<a href="https://docs.rke2.io/security/hardening_guide" target="_blank" rel="noopener noreferrer nofollow">文档</a>评估更改 CIS 配置文件的影响。
+    modal:
+      pspChange:
+        title: 弃用 Pod 安全策略
+        body: <p>从 v1.25 版开始，Kubernetes 已经取消了对 Pod 安全策略 (PSP) 的支持。如果你的集群通过集群 YAML 中的 “kube-apiserver-arg.enable-admission-plugins” 启用了 PodSecurityPolicy 准入控制器，你必须在继续升级之前<i>手动</i>删除它。此外，集群中存在的任何 PSP 将不再可用或强制执行。是否继续操作？</p>
     snapshots:
       suffix: 每个节点的快照
     systemService:
@@ -2080,7 +2090,7 @@ drainNode:
 etcdInfoBanner:
   hasLeader: "ETCD 有一个 Leader："
   leaderChanges: "Leader 变化的次数："
-  failedProposals: "失败的 proposal 数量："
+  failedProposals: "失败的 proposal 数量"
 
 fleet:
   dashboard:
@@ -2313,7 +2323,6 @@ glance:
   version: Kubernetes 版本
   monitoringDashboard: 监控仪表板
   installMonitoring: 安装 Monitoring
-  v1MonitoringInstalled: 已安装 Monitoring V1
   clusterInfo: 集群信息
   eventsTable: 完整事件列表
 
@@ -2728,6 +2737,8 @@ landing:
   whatsNewLink: "2.8 的新功能"
   learnMore: 了解更多
   support: 支持
+  psps: PSP
+  deprecatedPsp: Pod 安全策略自 Kubernetes v1.21 起已弃用，并已在 Kubernetes v1.25 中删除。你在此集群中有一个或多个 PSP 资源。
   community:
     title: 社区支持
     docs: Rancher 官方文档
@@ -3290,15 +3301,6 @@ monitoring:
       bearerTokenSecret: 持有者令牌密文
       basicAuthUsername: 具有基本认证用户名的密文
       basicAuthPassword: 具有基本认证密码的密文
-  installSteps:
-    uninstallV1:
-      stepTitle: 卸载 V1
-      stepSubtext: 卸载旧版 Monitoring
-      warning1: 已部署 Monitoring V1。你需要先卸载 Monitoring V1 才能安装 Monitoring V2。
-      warning2: <a target="blank" href="{docsBase}/monitoring-alerting/guides/migrating/" target='_blank' rel='noopener nofollow'>了解迁移到 Monitoring V2 的步骤</a>。
-      promptDescription: <div class="mt-20 mb-20">你正在尝试卸载 Monitoring V1。请确保你已阅读迁移步骤。</div>
-      success1:  Monitoring V1 已成功卸载。
-      success2: 点击下一步继续
   tabs:
     alerting: 告警
     general: 通用
@@ -4302,6 +4304,10 @@ project:
   vmDefaultResourceLimit: 虚拟机默认资源限制
   resourceQuotas: 资源配额
   haveOneOwner: 至少有一名成员需要具有所有者角色。
+  psp:
+    default: 集群默认
+    label: Pod 安全策略
+    current: "{value} (Current)"
 
 
 projectMembers:
@@ -4606,6 +4612,9 @@ rbac:
       nodetemplates-manage:
         label: 管理节点模板
         description: 允许用户定义、编辑和移除节点模板。
+      podsecuritypolicytemplates-manage:
+        label: 管理 Pod 安全策略（PSP）
+        description: 允许用户定义、编辑和移除 Pod 安全策略。
       roles-manage:
         label: 管理角色
         description: 允许用户定义、编辑和移除角色定义。
@@ -7339,17 +7348,6 @@ embedding:
   retry: 重试
   unavailable: Cluster Manager UI 不可用
 
-v1ClusterTools:
-  monitoring:
-    label: Monitoring（旧版）
-    description: '旧版 Monitoring V1。自 Rancher 2.5.0 起，我们已弃用 Monitoring V1。了解<a target="blank" href="{docsBase}/monitoring-alerting/guides/migrating/">迁移到 Monitoring V2 的步骤</a>。'
-  logging:
-    label: Logging（旧版）
-    description: '旧版 Logging V1。自 Rancher 2.5.0 起，我们已弃用 Logging V1。了解<a target="blank" href="{docsBase}/logging/migrating/">迁移到 Logging V2 的步骤</a>。'
-  istio:
-    label: Istio（旧版）
-    description: '旧版 Istio V1。自 Rancher 2.5.0 起，我们已弃用 Istio V1.5。了解<a target="blank" href="{docsBase}/istio/#migrate-from-previous-istio-version">迁移到最新版本</a> 的更多信息。'
-
 legacy:
   alerts: 告警
   apps: 应用
@@ -7360,6 +7358,7 @@ legacy:
   globalDnsProviders: 全局 DNS 提供商
   notifiers: Notifiers
   monitoring: 监控
+  psps: Pod 安全策略模板
   secrets: 密文
 
   project:
@@ -7440,6 +7439,9 @@ charts:
     service.ui.type:
       label: Longhorn UI 服务
       description: 定义 Longhorn UI 服务类型
+    enablePSP:
+      label: Pod 安全策略
+      description: 为 Longhorn 工作负载设置 Pod 安全策略
     csi.kubeletRootDir:
       label: Kubelet 根目录
       description: 指定 kubelet root-dir。如留空，则自动检测。

package/babel.config.js

@@ -10,13 +10,7 @@ module.exports = function(api) {
       { targets: { node: 'current' } }
     ]
   ];
-  const env = {
-    test: {
-      presets: [[
-        '@babel/env', { targets: { node: 'current' } }
-      ]]
-    }
-  };
+  const env = { test: { presets: [['@babel/env', { targets: { node: 'current' } }]] } };
 
   const plugins = [];
 

package/chart/gatekeeper.vue

@@ -1,11 +1,14 @@
 <script>
 import UnitInput from '@shell/components/form/UnitInput';
+import ChartPsp from '@shell/components/ChartPsp';
 import { Checkbox } from '@components/Form/Checkbox';
 import { mapGetters } from 'vuex';
 
 export default {
-  components: { UnitInput, Checkbox },
-  props:      {
+  components: {
+    UnitInput, ChartPsp, Checkbox
+  },
+  props: {
     value: {
       type:    Object,
       default: () => {
@@ -57,6 +60,12 @@ export default {
       </div>
     </div>
 
+    <!-- Conditionally display PSP checkbox -->
+    <ChartPsp
+      :value="value"
+      :cluster="currentCluster"
+    />
+
     <template v-if="crdValues">
       <!-- gatekeeper versions <1.0.2 do not have this option -->
       <Checkbox

package/chart/istio.vue

@@ -6,6 +6,7 @@ import YamlEditor from '@shell/components/YamlEditor';
 import { mapGetters } from 'vuex';
 import FileSelector from '@shell/components/form/FileSelector';
 import { Banner } from '@components/Banner';
+import ChartPsp from '@shell/components/ChartPsp';
 
 const defaultOverlayFile = `#apiVersion: install.istio.io/v1alpha1
 #kind: IstioOperator
@@ -53,7 +54,8 @@ export default {
     Checkbox,
     FileSelector,
     YamlEditor,
-    Banner
+    Banner,
+    ChartPsp
   },
 
   props: {
@@ -138,6 +140,13 @@ export default {
 
 <template>
   <div>
+    <!-- Conditionally display PSP checkbox -->
+    <ChartPsp
+      :value="value"
+      :title="t('catalog.chart.global')"
+      :cluster="currentCluster"
+    />
+
     <h3>
       {{ t('istio.titles.components') }}
     </h3>

package/chart/logging/index.vue

@@ -2,10 +2,13 @@
 import { mapGetters } from 'vuex';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import { Checkbox } from '@components/Form/Checkbox';
+import ChartPsp from '@shell/components/ChartPsp';
 
 export default {
-  components: { Checkbox, LabeledInput },
-  props:      {
+  components: {
+    Checkbox, LabeledInput, ChartPsp
+  },
+  props: {
     value: {
       type:    Object,
       default: () => {
@@ -80,5 +83,11 @@ export default {
         />
       </div>
     </div>
+
+    <!-- Conditionally display PSP checkbox -->
+    <ChartPsp
+      :value="value"
+      :cluster="currentCluster"
+    />
   </div>
 </template>

package/chart/monitoring/alerting/index.vue

@@ -5,6 +5,8 @@ import { Checkbox } from '@components/Form/Checkbox';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { RadioGroup } from '@components/Form/Radio';
 
+const DEFAULT_MONITORING_NAMESPACE = 'cattle-monitoring-system';
+
 export default {
   components: {
     Checkbox,
@@ -18,7 +20,7 @@ export default {
       default: 'create',
     },
 
-    monitoringSecrets: {
+    secrets: {
       type:    Array,
       default: () => [],
     },
@@ -41,7 +43,12 @@ export default {
 
   computed: {
     allSecrets() {
-      return this.monitoringSecrets
+      const { secrets } = this;
+
+      return secrets
+        .filter(
+          (sec) => sec.metadata.namespace === DEFAULT_MONITORING_NAMESPACE
+        )
         .map((sec) => ({ label: sec.metadata.name, value: sec.metadata.name }));
     },
 
@@ -55,15 +62,22 @@ export default {
     },
 
     existingSecret() {
-      return this.monitoringSecrets
-        .find((sec) => sec?.metadata?.name === 'alertmanager-rancher-monitoring-alertmanager');
+      return this.secrets.find(
+        (sec) => sec?.metadata?.name ===
+            'alertmanager-rancher-monitoring-alertmanager' &&
+          sec?.metadata?.namespace === DEFAULT_MONITORING_NAMESPACE
+      );
     },
 
     filteredSecrets() {
+      const { secrets } = this;
       const filtered = [];
 
-      this.monitoringSecrets.forEach((secret) => {
-        if ( secret.metadata.name ) {
+      secrets.forEach((secret) => {
+        if (
+          secret.metadata.name &&
+          secret.metadata.namespace === DEFAULT_MONITORING_NAMESPACE
+        ) {
           filtered.push(secret.metadata.name);
         }
       });
@@ -79,7 +93,7 @@ export default {
   },
 
   watch: {
-    filteredSecrets(newValue) {
+    filteredSecrets(newValue, oldValue) {
       if (isEmpty(newValue)) {
         this.$set(
           this.value.alertmanager.alertmanagerSpec,

package/chart/monitoring/grafana/index.vue

@@ -87,9 +87,6 @@ export default {
 
       return (storageClasses || []).length >= 1;
     },
-    showGrafanaResourceConfig() {
-      return this.value?.grafana?.resources?.requests && this.value?.grafana?.resources?.limits;
-    }
   },
   watch: {
     persistentStorageType(newType, oldType) {
@@ -139,7 +136,7 @@ export default {
         newValsOut = {
           accessModes:      null,
           storageClassName: null,
-          size:             '10Gi',
+          size:             null,
           subPath:          null,
           type:             'pvc',
           annotations:      null,
@@ -151,7 +148,7 @@ export default {
         newValsOut = {
           accessModes:      null,
           storageClassName: null,
-          size:             '10Gi',
+          size:             null,
           subPath:          null,
           type:             'statefulset',
           enabled:          true,
@@ -175,58 +172,6 @@ export default {
       <h3>{{ t('monitoring.grafana.title') }}</h3>
     </div>
     <div class="grafana-config">
-      <!-- Request and Limits -->
-      <!-- Note, we use the same labels for resource config as Prometheus since they are generic -->
-      <div
-        v-if="showGrafanaResourceConfig"
-        class="row"
-      >
-        <div class="col span-12 mt-5">
-          <h4 class="mb-0">
-            {{ t('monitoring.prometheus.config.resourceLimits') }}
-          </h4>
-        </div>
-      </div>
-      <div
-        v-if="showGrafanaResourceConfig"
-        class="row"
-      >
-        <div class="col span-6">
-          <LabeledInput
-            v-model="value.grafana.resources.requests.cpu"
-            data-testid="input-grafana-requests-cpu"
-            :label="t('monitoring.prometheus.config.requests.cpu')"
-            :mode="mode"
-          />
-        </div>
-        <div class="col span-6">
-          <LabeledInput
-            v-model="value.grafana.resources.requests.memory"
-            data-testid="input-grafana-requests-memory"
-            :label="t('monitoring.prometheus.config.requests.memory')"
-            :mode="mode"
-          />
-        </div>
-      </div>
-      <div class="row">
-        <div class="col span-6">
-          <LabeledInput
-            v-model="value.grafana.resources.limits.cpu"
-            data-testid="input-grafana-limits-cpu"
-            :label="t('monitoring.prometheus.config.limits.cpu')"
-            :mode="mode"
-          />
-        </div>
-        <div class="col span-6">
-          <LabeledInput
-            v-model="value.grafana.resources.limits.memory"
-            data-testid="input-grafana-limits-memory"
-            :label="t('monitoring.prometheus.config.limits.memory')"
-            :mode="mode"
-          />
-        </div>
-      </div>
-
       <div class="row pt-10 pb-10">
         <div class="col span-12 persistent-storage-config">
           <RadioGroup

package/chart/monitoring/index.vue

@@ -12,10 +12,10 @@ import { LabeledInput } from '@components/Form/LabeledInput';
 import Loading from '@shell/components/Loading';
 import Prometheus from '@shell/chart/monitoring/prometheus';
 import Tab from '@shell/components/Tabbed/Tab';
+import ChartPsp from '@shell/components/ChartPsp';
 
 import { allHash } from '@shell/utils/promise';
 import { STORAGE_CLASS, PVC, SECRET, WORKLOAD_TYPES } from '@shell/config/types';
-import { CATTLE_MONITORING_NAMESPACE } from '@shell/utils/monitoring';
 
 export default {
   components: {
@@ -26,7 +26,8 @@ export default {
     LabeledInput,
     Loading,
     Prometheus,
-    Tab
+    Tab,
+    ChartPsp
   },
 
   hasTabs: true,
@@ -53,40 +54,17 @@ export default {
   async fetch() {
     const { $store } = this;
 
-    // Fetch all the resources required for all the tabs asyncronously up front
-    const hashPromises = {
-      namespaces:        $store.getters['namespaces'](),
-      pvcs:              $store.dispatch('cluster/findAll', { type: PVC }),
-      // Used in Alerting tab
-      monitoringSecrets: $store.dispatch('cluster/findAll', {
-        type: SECRET,
-        opt:  { namespaced: CATTLE_MONITORING_NAMESPACE }
-      }),
+    const hash = await allHash({
+      namespaces:     $store.getters['namespaces'](),
+      pvcs:           $store.dispatch('cluster/findAll', { type: PVC }),
+      secrets:        $store.dispatch('cluster/findAll', { type: SECRET }),
       storageClasses: $store.dispatch('cluster/findAll', { type: STORAGE_CLASS }),
-    };
-
-    // Are we editing an existing chart?
-    // (ported from shell/chart/monitoring/prometheus/index.vue)
-    const { existing = false } = this.$attrs;
-
-    // If needed, fetch all the workloads that have prometheus operator like containers
-    this.workloadTypes = !existing ? Object.values(WORKLOAD_TYPES) : [];
-
-    this.workloadTypes.forEach((type) => {
-      // We'll use a filter to fetch the results. Atm there's no neat way to differentiate between ALL results and JUST filtered
-      // So to avoid calls to all getting these filtered (and vice-versa) forget type before and after
-      $store.dispatch('cluster/forgetType', type);
-      hashPromises[type] = $store.dispatch('cluster/findAll', {
-        type,
-        opt: {
-          watch:  false,
-          // We're only interested in images with operator like names (note: these will match partial strings)
-          filter: { 'spec.template.spec.containers.image': ['quay.io/coreos/prometheus-operator', 'rancher/coreos-prometheus-operator'] }
-        }
-      });
     });
 
-    const hash = await allHash(hashPromises);
+    await Promise.all(
+      Object.values(WORKLOAD_TYPES).map((type) => this.$store.dispatch('cluster/findAll', { type })
+      )
+    );
 
     this.targetNamespace = hash.namespaces[this.chart.targetNamespace] || false;
 
@@ -98,21 +76,9 @@ export default {
       this.pvcs = hash.pvcs;
     }
 
-    if (!isEmpty(hash.monitoringSecrets)) {
-      this.monitoringSecrets = hash.monitoringSecrets;
+    if (!isEmpty(hash.secrets)) {
+      this.secrets = hash.secrets;
     }
-
-    this.workloadTypes.forEach((type) => {
-      if (hash[type]) {
-        this.filteredWorkloads.push(...hash[type]);
-      }
-    });
-  },
-
-  beforeDestroy() {
-    this.workloadTypes.forEach((type) => {
-      this.$store.dispatch('cluster/forgetType', type);
-    });
   },
 
   data() {
@@ -135,11 +101,9 @@ export default {
       disableAggregateRoles: false,
       prometheusResources:   [],
       pvcs:                  [],
-      monitoringSecrets:     [],
+      secrets:               [],
       storageClasses:        [],
       targetNamespace:       null,
-      filteredWorkloads:     [],
-      workloadTypes:         []
     };
   },
 
@@ -148,6 +112,10 @@ export default {
     provider() {
       return this.currentCluster.status.provider.toLowerCase();
     },
+    workloads() {
+      return Object.values(WORKLOAD_TYPES).flatMap((type) => this.$store.getters['cluster/all'](type)
+      );
+    },
   },
 
   watch: {
@@ -297,6 +265,12 @@ export default {
             />
           </div>
         </div>
+
+        <!-- Conditionally display PSP checkbox -->
+        <ChartPsp
+          :value="value"
+          :cluster="currentCluster"
+        />
       </div>
     </Tab>
     <Tab
@@ -312,7 +286,7 @@ export default {
           :mode="mode"
           :storage-classes="storageClasses"
           :prometheus-pods="prometheusResources"
-          :filteredWorkloads="filteredWorkloads"
+          :workloads="workloads"
         />
       </div>
     </Tab>
@@ -325,7 +299,7 @@ export default {
         <Alerting
           v-model="value"
           :mode="mode"
-          :monitoringSecrets="monitoringSecrets"
+          :secrets="secrets"
         />
       </div>
     </Tab>

package/chart/monitoring/prometheus/index.vue

@@ -1,4 +1,5 @@
 <script>
+import isEmpty from 'lodash/isEmpty';
 import { mapGetters } from 'vuex';
 
 import { Banner } from '@components/Banner';
@@ -50,19 +51,21 @@ export default {
       default: () => ({}),
     },
 
-    filteredWorkloads: {
+    workloads: {
       type:    Array,
       default: () => ([]),
     },
   },
 
   data() {
-    return { enablePersistentStorage: !!this.value?.prometheus?.prometheusSpec?.storageSpec?.volumeClaimTemplate?.spec };
+    return {
+      enablePersistentStorage: !!this.value?.prometheus?.prometheusSpec?.storageSpec?.volumeClaimTemplate?.spec,
+      warnUser:                false,
+    };
   },
 
   computed: {
     ...mapGetters(['currentCluster']),
-
     matchExpressions: {
       get() {
         const selector = this.value?.prometheus?.prometheusSpec?.storageSpec?.volumeClaimTemplate?.spec?.selector;
@@ -77,21 +80,42 @@ export default {
         }
       }
     },
+    filteredWorkloads() {
+      let { workloads } = this;
+      const { existing = false } = this.$attrs;
 
-    mappedFilteredWorkloads() {
-      return this.filteredWorkloads.map((wl) => ({
-        label: wl.id,
-        link:  {
-          name:   'c-cluster-product-resource-namespace-id',
-          params: {
-            cluster:   this.currentCluster.id,
-            product:   'explorer',
-            resource:  wl.type,
-            namespace: wl.metadata.namespace,
-            id:        wl.metadata.name
-          },
-        }
-      }));
+      if (!existing) {
+        workloads = workloads.filter((workload) => {
+          if (
+            !isEmpty(workload?.spec?.template?.spec?.containers) &&
+            (workload.spec.template.spec.containers.find((c) => c.image.includes('quay.io/coreos/prometheus-operator') ||
+              c.image.includes('rancher/coreos-prometheus-operator'))
+            )
+          ) {
+            if (!this.warnUser) {
+              this.warnUser = true;
+            }
+
+            return workload;
+          }
+        });
+      }
+
+      return workloads.map((wl) => {
+        return {
+          label: wl.id,
+          link:  {
+            name:   'c-cluster-product-resource-namespace-id',
+            params: {
+              cluster:   this.currentCluster.id,
+              product:   'explorer',
+              resource:  wl.type,
+              namespace: wl.metadata.namespace,
+              id:        wl.metadata.name
+            },
+          }
+        };
+      });
     },
 
     podsAndNamespaces() {
@@ -155,23 +179,6 @@ export default {
 
       this.$set(storageSpec.selector, 'matchLabels', matchLabels);
       this.$set(storageSpec.selector, 'matchExpressions', matchExpressions);
-
-      // Remove an empty selector object if present
-      // User can add a selector and then remove the selector - this will leave an empty structure as above
-      // We want to ensure we remove .selector.matchExpressions, .selector.matchLabels, and .selector if empty
-      // See: https://github.com/rancher/dashboard/issues/10016
-
-      if (storageSpec.selector.matchExpressions?.length === 0) {
-        delete storageSpec.selector.matchExpressions;
-      }
-
-      if (storageSpec.selector.matchLabels && Object.keys(storageSpec.selector.matchLabels).length === 0) {
-        delete storageSpec.selector.matchLabels;
-      }
-
-      if (Object.keys(storageSpec.selector).length === 0) {
-        delete storageSpec.selector;
-      }
     },
   },
 };
@@ -182,9 +189,8 @@ export default {
     <div class="title">
       <h3>{{ t('monitoring.prometheus.title') }}</h3>
     </div>
-    <!-- https://github.com/rancher/dashboard/issues/1167 -->
     <Banner
-      v-if="mappedFilteredWorkloads.length"
+      v-if="filteredWorkloads && warnUser"
       color="warning"
     >
       <template #default>
@@ -193,7 +199,7 @@ export default {
           :raw="true"
         />
         <div
-          v-for="wl in mappedFilteredWorkloads"
+          v-for="wl in filteredWorkloads"
           :key="wl.id"
           class="mt-10"
         >