@rancher/shell 1.2.3 → 2.0.1

package/assets/translations/zh-hans.yaml

@@ -366,7 +366,6 @@ authConfig:
     unrestricted: 允许所有用户访问
   allowedPrincipalIds:
     title: 授权的用户和用户组
-  associatedWarning: '注意：你认证的 {provider} 用户将作为你当前登录的 {vendor} 用户（<code>{username}</code>）的替代登录方式。此 {vendor} 用户的所有全局权限、项目和集群角色绑定也将应用到 {provider} 用户。'
   github:
     clientId:
       label: 客户端 ID
@@ -845,9 +844,6 @@ catalog:
       keywords: 关键词
     errors:
       clusterToolExists: 此 Chart 含有固定的命名空间和名称。找到一个匹配的 <a href="{url}">应用</a>，任何修改都将应用于此应用。
-    banner:
-      legacy: 'PSP 删除：在将集群升级到 Kubernetes 1.25+ 之前，请确保你针对 PSP 检查了 Helm 应用程序并相应进行更新'
-    enablePSP: 启用 Pod 安全策略
     global: 全局
   charts:
     all: 全部
@@ -887,7 +883,7 @@ catalog:
       requiresFound: '在安装这个 Chart 前，你需要安装<a href="{url}">{name}</a>。'
       requiresMissing: '这个 Chart 另一个提供 {name} 的 Chart，但我们找不到这个Chart。'
       insufficientCpu: '这个 Chart 需要 {need, number} 个 CPU 核，但集群只有 {have, number} 个可用。'
-      insufficientMemory: '这个 Cchart 需要 {need} 内存，但集群只有 {have} 可用。'
+      insufficientMemory: '这个 Chart 需要 {need} 内存，但集群只有 {have} 可用。'
       legacy:
         label: 这是个 {legacyType} 应用，无法在这里修改。
         enableLegacy:
@@ -1671,12 +1667,9 @@ cluster:
   banner:
     warning: '此集群包含此表单不完全支持的 machineSelectorConfig。使用 YAML 编辑器管理完整配置。'
     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>。'
+    rke2-k3-reprovisioning: '更改集群配置可能导致节点重新配置。详情请参见 <a target="blank" href="{docsBase}/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/rke1-vs-rke2-differences#cluster-api" 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:
@@ -1835,10 +1828,6 @@ 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:
@@ -2090,7 +2079,7 @@ drainNode:
 etcdInfoBanner:
   hasLeader: "ETCD 有一个 Leader："
   leaderChanges: "Leader 变化的次数："
-  failedProposals: "失败的 proposal 数量"
+  failedProposals: "失败的 proposal 数量："
 
 fleet:
   dashboard:
@@ -2737,8 +2726,6 @@ landing:
   whatsNewLink: "2.8 的新功能"
   learnMore: 了解更多
   support: 支持
-  psps: PSP
-  deprecatedPsp: Pod 安全策略自 Kubernetes v1.21 起已弃用，并已在 Kubernetes v1.25 中删除。你在此集群中有一个或多个 PSP 资源。
   community:
     title: 社区支持
     docs: Rancher 官方文档
@@ -2804,7 +2791,7 @@ logging:
     dockerRootDirectory: Docker 根目录
     systemdLogPath: systemd 日志路径
     tooltip: '某些 Kubernetes 发行版在 <code>journald</code>中记录日志。你需要定义<code>systemdLogPath</code> 以收集日志。默认路径是<code>/run/log/journal</code>，但某些 Linux 发行版不默认使用该路径。'
-    url: '<a href="https://ranchermanager.docs.rancher.com/v2.8/integrations-in-rancher/logging/logging-helm-chart-options" target="_blank" rel="noopener nofollow noreferrer">了解更多</a>'
+    url: '<a href="{docsBase}/integrations-in-rancher/logging/logging-helm-chart-options" target="_blank" rel="noopener nofollow noreferrer">了解更多</a>'
     default: /run/log/journal
   elasticsearch:
     host: 主机
@@ -3073,7 +3060,7 @@ members:
   clusterMembers: 集群成员
   clusterAndProject: 集群和项目成员
   createActionLabel: 添加
-  clusterMemebership: 集群成员
+  clusterMembership: 集群成员
   projectMembership: 项目成员
   clusterPermissions:
     noDescription: 已创建用户 - 没有描述
@@ -4304,10 +4291,6 @@ project:
   vmDefaultResourceLimit: 虚拟机默认资源限制
   resourceQuotas: 资源配额
   haveOneOwner: 至少有一名成员需要具有所有者角色。
-  psp:
-    default: 集群默认
-    label: Pod 安全策略
-    current: "{value} (Current)"
 
 
 projectMembers:
@@ -4612,9 +4595,6 @@ rbac:
       nodetemplates-manage:
         label: 管理节点模板
         description: 允许用户定义、编辑和移除节点模板。
-      podsecuritypolicytemplates-manage:
-        label: 管理 Pod 安全策略（PSP）
-        description: 允许用户定义、编辑和移除 Pod 安全策略。
       roles-manage:
         label: 管理角色
         description: 允许用户定义、编辑和移除角色定义。
@@ -6973,7 +6953,7 @@ podAffinity:
 keyValue:
   keyPlaceholder: 例如：foo
   valuePlaceholder: 例如：bar
-  protip: '把多行 <em>key=value</em> 或 <em>key: value</em> 键值对复制到各字段中，以便批量输入'
+  protip: '把多行 <em>key=value</em> 或 <em>key:value</em> 键值对复制到各字段中，以便批量输入'
 
 registryMirror:
   header: Mirror
@@ -7124,7 +7104,7 @@ performance:
     checkboxLabel: 禁用 WebSocket 通知
   gc:
     label: 资源垃圾回收
-    description: UI 将在本地缓存 kuberentes 资源，避免这些资源被重新抓取。在某些情况下，这可能会导致浏览器中存储了大量数据。你可以启用此设置进行定期删除。
+    description: UI 将在本地缓存 Kubernetes 资源，避免这些资源被重新抓取。在某些情况下，这可能会导致浏览器中存储了大量数据。你可以启用此设置进行定期删除。
     checkboxLabel: 启用垃圾回收
     whenRun:
       description: 垃圾回收运行的时候更新
@@ -7358,7 +7338,6 @@ legacy:
   globalDnsProviders: 全局 DNS 提供商
   notifiers: Notifiers
   monitoring: 监控
-  psps: Pod 安全策略模板
   secrets: 密文
 
   project:
@@ -7439,9 +7418,6 @@ 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,9 +10,15 @@ 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 = [];
+  const plugins = ['@babel/plugin-transform-nullish-coalescing-operator'];
 
   if (process.env.NODE_ENV === 'test') {
     plugins.push('transform-require-context');

package/chart/__tests__/S3.test.ts

@@ -9,8 +9,15 @@ const localVue = createLocalVue();
 localVue.use(Vuex);
 
 describe('rancher-backup: S3', () => {
-  const mockStore = { getters: { 'i18n/t': (text: string) => text, t: (text: string) => text } };
-  const wrapper = mount(S3, { mocks: { $store: mockStore } });
+  const mockStore = {
+    getters: {
+      'i18n/t':                    (text: string) => text,
+      t:                           (text: string) => text,
+      'cluster/all':               () => [],
+      'cluster/paginationEnabled': () => false
+    }
+  };
+  const wrapper = mount(S3, { mocks: { $store: mockStore, $fetchState: { pending: false } } });
 
   it('should emit invalid when form is not filled', () => {
     expect(wrapper.emitted('valid')).toHaveLength(1);

package/chart/gatekeeper.vue

@@ -1,14 +1,11 @@
 <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, ChartPsp, Checkbox
-  },
-  props: {
+  components: { UnitInput, Checkbox },
+  props:      {
     value: {
       type:    Object,
       default: () => {
@@ -60,12 +57,6 @@ 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,7 +6,6 @@ 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
@@ -54,8 +53,7 @@ export default {
     Checkbox,
     FileSelector,
     YamlEditor,
-    Banner,
-    ChartPsp
+    Banner
   },
 
   props: {
@@ -140,13 +138,6 @@ 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,13 +2,10 @@
 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, ChartPsp
-  },
-  props: {
+  components: { Checkbox, LabeledInput },
+  props:      {
     value: {
       type:    Object,
       default: () => {
@@ -83,11 +80,5 @@ export default {
         />
       </div>
     </div>
-
-    <!-- Conditionally display PSP checkbox -->
-    <ChartPsp
-      :value="value"
-      :cluster="currentCluster"
-    />
   </div>
 </template>

package/chart/monitoring/alerting/index.vue

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

package/chart/monitoring/grafana/index.vue

@@ -5,6 +5,7 @@ import LabeledSelect from '@shell/components/form/LabeledSelect';
 import KeyValue from '@shell/components/form/KeyValue';
 import ArrayList from '@shell/components/form/ArrayList';
 import StorageClassSelector from '@shell/chart/monitoring/StorageClassSelector';
+import { DEFAULT_GRAFANA_STORAGE_SIZE } from '@shell/config/types';
 
 export default {
   components: {
@@ -87,6 +88,9 @@ export default {
 
       return (storageClasses || []).length >= 1;
     },
+    showGrafanaResourceConfig() {
+      return this.value?.grafana?.resources?.requests && this.value?.grafana?.resources?.limits;
+    }
   },
   watch: {
     persistentStorageType(newType, oldType) {
@@ -136,7 +140,7 @@ export default {
         newValsOut = {
           accessModes:      null,
           storageClassName: null,
-          size:             null,
+          size:             DEFAULT_GRAFANA_STORAGE_SIZE,
           subPath:          null,
           type:             'pvc',
           annotations:      null,
@@ -148,7 +152,7 @@ export default {
         newValsOut = {
           accessModes:      null,
           storageClassName: null,
-          size:             null,
+          size:             DEFAULT_GRAFANA_STORAGE_SIZE,
           subPath:          null,
           type:             'statefulset',
           enabled:          true,
@@ -172,6 +176,58 @@ 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
@@ -181,6 +237,7 @@ export default {
             :labels="persistentStorageTypeLabels"
             :mode="mode"
             :options="persistentStorageTypes"
+            data-testid="radio-group-input-grafana-storage"
           />
         </div>
       </div>
@@ -204,6 +261,7 @@ export default {
               v-model="value.grafana.persistence.size"
               :label="t('monitoring.grafana.storage.size')"
               :mode="mode"
+              data-testid="grafana-storage-pvc-size"
             />
           </div>
           <div class="col span-6">
@@ -270,6 +328,7 @@ export default {
               v-model="value.grafana.persistence.size"
               :label="t('monitoring.grafana.storage.size')"
               :mode="mode"
+              data-testid="grafana-storage-statefulset-size"
             />
           </div>
           <div class="col span-6">

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,8 +26,7 @@ export default {
     LabeledInput,
     Loading,
     Prometheus,
-    Tab,
-    ChartPsp
+    Tab
   },
 
   hasTabs: true,
@@ -54,17 +53,40 @@ export default {
   async fetch() {
     const { $store } = this;
 
-    const hash = await allHash({
-      namespaces:     $store.getters['namespaces'](),
-      pvcs:           $store.dispatch('cluster/findAll', { type: PVC }),
-      secrets:        $store.dispatch('cluster/findAll', { type: SECRET }),
+    // 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 }
+      }),
       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'] }
+        }
+      });
     });
 
-    await Promise.all(
-      Object.values(WORKLOAD_TYPES).map((type) => this.$store.dispatch('cluster/findAll', { type })
-      )
-    );
+    const hash = await allHash(hashPromises);
 
     this.targetNamespace = hash.namespaces[this.chart.targetNamespace] || false;
 
@@ -76,9 +98,21 @@ export default {
       this.pvcs = hash.pvcs;
     }
 
-    if (!isEmpty(hash.secrets)) {
-      this.secrets = hash.secrets;
+    if (!isEmpty(hash.monitoringSecrets)) {
+      this.monitoringSecrets = hash.monitoringSecrets;
     }
+
+    this.workloadTypes.forEach((type) => {
+      if (hash[type]) {
+        this.filteredWorkloads.push(...hash[type]);
+      }
+    });
+  },
+
+  beforeDestroy() {
+    this.workloadTypes.forEach((type) => {
+      this.$store.dispatch('cluster/forgetType', type);
+    });
   },
 
   data() {
@@ -101,9 +135,11 @@ export default {
       disableAggregateRoles: false,
       prometheusResources:   [],
       pvcs:                  [],
-      secrets:               [],
+      monitoringSecrets:     [],
       storageClasses:        [],
       targetNamespace:       null,
+      filteredWorkloads:     [],
+      workloadTypes:         []
     };
   },
 
@@ -112,10 +148,6 @@ export default {
     provider() {
       return this.currentCluster.status.provider.toLowerCase();
     },
-    workloads() {
-      return Object.values(WORKLOAD_TYPES).flatMap((type) => this.$store.getters['cluster/all'](type)
-      );
-    },
   },
 
   watch: {
@@ -265,12 +297,6 @@ export default {
             />
           </div>
         </div>
-
-        <!-- Conditionally display PSP checkbox -->
-        <ChartPsp
-          :value="value"
-          :cluster="currentCluster"
-        />
       </div>
     </Tab>
     <Tab
@@ -286,7 +312,7 @@ export default {
           :mode="mode"
           :storage-classes="storageClasses"
           :prometheus-pods="prometheusResources"
-          :workloads="workloads"
+          :filteredWorkloads="filteredWorkloads"
         />
       </div>
     </Tab>
@@ -299,7 +325,7 @@ export default {
         <Alerting
           v-model="value"
           :mode="mode"
-          :secrets="secrets"
+          :monitoringSecrets="monitoringSecrets"
         />
       </div>
     </Tab>