dashboard-shell-shell 3.0.5-test.43 → 3.0.5-test.45

package/assets/translations/zh-hans.yaml

@@ -1206,6 +1206,9 @@ compliance:
   testsToSkip: 要跳过的测试
 
 cluster:
+  jwtAuthentication:
+    banner: "使用 JWT 认证的服务账户访问可在集群创建后通过以下路径配置：<br>
+      <code>集群管理 > 高级 > JWT 认证</code>"
   addonChart:
     rancher-vsphere-cpi: vSphere CPI 配置
     rancher-vsphere-csi: vSphere CSI 配置
@@ -1457,6 +1460,25 @@ cluster:
   name:
     label: 集群名称
     placeholder: 请输入集群名称
+  directoryConfig:
+    title: 数据目录配置
+    banner: 集群创建后，数据目录配置将无法更改
+    radioInput:
+      defaultLabel: 使用默认数据目录配置
+      commonLabel: 为数据目录配置使用公共基础目录（子系统路径将使用子目录：system-agent、provisioning 和 distro）
+      customLabel: 使用自定义数据目录
+    common:
+      label: 数据目录基础路径
+      tooltip: 数据目录基础路径。我们将为每个目录附加相应的子目录（/agent、/provisioning 以及 /rke2 或 /k3s）
+    systemAgent:
+      label: 系统代理目录路径
+      tooltip: 用于存储系统代理连接信息和计划的数据目录
+    provisioning:
+      label: 供应目录路径
+      tooltip: 用于存储供应相关文件的数据目录
+    k8sDistro:
+      label: K8s 发行版目录路径
+      tooltip: 用于存储 K8s 发行版的数据目录
   machineConfig:
     banner:
       updateInfo: 创建一个池用来更新主机配置
@@ -1774,6 +1796,9 @@ cluster:
     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 个可用的节点。
     haveArgInfo: 所选 Kubernetes 版本的配置信息不可用。此屏幕中可用的选项将受到限制，你可能需要使用 YAML 编辑器。
+    cloudProviderAddConfig: '在 Kubernetes 1.27 或更高版本中，<b>Amazon</b> 云提供商需要额外配置。请参阅<a href="https://ranchermanager.docs.rancher.com/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon" target="_blank" rel="noopener noreferrer nofollow">文档</a>以了解更多信息。'
+    cloudProviderUnsupportedAzure: '在 Kubernetes 1.30 或更高版本中，<b>Azure</b> 云提供商已被移除。请参阅<a href="https://ranchermanager.docs.rancher.com/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/azure" target="_blank" rel="noopener noreferrer nofollow">文档</a>以了解更多信息。'
+    cloudProviderMigrateAzure: '在 Kubernetes 1.30 或更高版本中，<b>Azure</b> 云提供商已被移除。要升级 Kubernetes，应先将集群迁移到外部提供商。请参阅<a href="https://ranchermanager.docs.rancher.com/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/azure" target="_blank" rel="noopener noreferrer nofollow">文档</a>以了解更多信息。'
   rkeTemplateUpgrade: 模板修订版 {name} 可用于升级
 
   availabilityWarnings:
@@ -1978,7 +2003,19 @@ cluster:
     drain:
       label: 清空节点
       toolTip: 清空操作预先移除每个节点上的 Pod，使得升级中的节点上没有运行的工作负载。不清空的升级速度更快，造成的混乱更少，但是 Pod 仍可能根据进行中的升级进行重启。
-    deleteEmptyDir: "默认情况下，使用 emptyDir 卷的 pod 会在升级时被删除。在 pod 生命周期中依赖于 emptyDir 持久卷的操作可能会受到影响。"
+      deleteEmptyDir:
+        warning: "默认情况下，使用 emptyDir 卷的 Pod 将在升级时被删除。依赖 emptyDir 卷在 Pod 生命周期内持久化的操作可能会受到影响。"
+        label: 删除使用 emptyDir 卷的 Pod
+        tooltip: emptyDir 卷通常用于临时数据，但其中的数据将被永久删除。如果未设置此选项且存在使用 emptyDir 的 Pod，排水操作将失败。
+      force:
+        label: 删除独立 Pod
+        tooltip: 删除不受工作负载控制器（Deployment、Job 等）管理的独立 Pod。如果未设置此选项且存在独立 Pod，排水操作将失败。
+      gracePeriod:
+        checkboxLabel: 覆盖 Pod 终止宽限期
+        inputLabel: 宽限期
+      timeout:
+        checkboxLabel: 超时时间
+        inputLabel: 排水超时
     truncateHostnames: 将主机名截断为 15 个字符来兼容 NetBIOS。
     address:
       tooltip: 创建集群后无法更改集群网络值。
@@ -2427,7 +2464,12 @@ glance:
   eventsTable: 完整事件列表
 
 clusterBadge:
+  badgeAppearance: 集群徽章外观
+  clusterComment: "集群注释 - {text}"
+  customizeAppearance: 自定义外观
   addLabel: 添加集群徽章
+  setClusterAppearance: 集群外观设置
+  customize: 自定义
   editLabel: 编辑集群徽章
   modal:
     title: 自定义集群徽章

package/components/ClusterIconMenu.vue

@@ -168,7 +168,7 @@ export default {
     text-transform: uppercase;
 
     .custom-color-decoration {
-      height: 4px;
+      height: 0px;
       width: 100%;
       margin: 0 auto;
       position: absolute;

package/components/auth/Principal.vue

@@ -3,6 +3,10 @@ import { NORMAN } from '@shell/config/types';
 
 export default {
   props: {
+    userLogo: {
+      type:    Boolean,
+      default: false,
+    },
     value: {
       type:     String,
       required: true,
@@ -94,10 +98,10 @@ export default {
     </template>
 
     <template v-else-if="principal">
-      <div :style="userLogoSize === 79 ? { width: '287px' } : {}" class="avatar">
+      <div v-if="userLogo" :style="userLogoSize === 79 ? { width: '287px' } : {}" class="avatar">
         <img
-          :style="{ width: userLogoSize + 'px', height: userLogoSize + 'px' }"
-          :src="require('@shell/assets/images/user.png')"
+          :style="{ width: userLogoSize + 'px', height: userLogoSize + 'px', marginRight: '10px' }"
+          src="@shell/assets/images/user.png"
           :class="{'round': principal.roundAvatar}"
           :alt="t('principal.alt.avatar')"
         >
@@ -171,16 +175,15 @@ export default {
 </template>
 
 <style lang="scss" scoped>
-  $size: 20px;
+  $size: 24px;
 
   .principal {
     display: grid;
     grid-template-areas:
       "avatar name"
       "avatar description";
-    grid-template-columns: $size auto;
+    grid-template-columns: min-content auto;
     // grid-template-rows: auto math.div($size, 2);
-    column-gap: 10px;
 
     th {
       text-align: left;
@@ -236,13 +239,13 @@ export default {
 
     .name {
       grid-area: name;
-      line-height: math.div($size, 2);
+      line-height: 16px;
       overflow-wrap: anywhere;
     }
 
     .description {
       grid-area: description;
-      line-height: math.div($size, 2);
+      line-height: 16px;
     }
   }
 </style>

package/components/form/ClusterAppearance.vue

@@ -88,11 +88,12 @@ export default {
 <style lang="scss" scoped>
   .cluster-appearance {
     display: flex;
-    flex-direction: column;
-    margin: 3px 35px 0px 0px;
+    // flex-direction: column;
+    // align-items: center;
+    // margin: 3px 35px 0px 0px;
 
     label {
-      margin: 6px 0 0;
+      margin: 10px 10px 0 0;
     }
 
     &-preview {

package/components/form/Members/MembershipEditor.vue

@@ -170,7 +170,7 @@ export default {
   >
     <template #column-headers>
       <div class="box mb-0">
-        <div class="column-headers row" :style="{ width: (isCreate && i === 0) || isView ? '100%' : 'calc(100% - 100px)' }">
+        <div class="column-headers row" :style="{ width: isView ? '100%' : 'calc(100% - 100px)'}">
           <div class="col span-6">
             <label class="text-label">{{ t('membershipEditor.user') }}</label>
           </div>
@@ -206,7 +206,7 @@ export default {
       </button>
     </template>
     <template #remove-button="{remove, i}">
-      <span v-if="(isCreate && i === 0) || isView" />
+      <div style="width: 100px;" v-if="(isCreate && i === 0) || isView" />
       <button
         v-else
         type="button"

package/edit/provisioning.cattle.io.cluster/tabs/Basics.vue

@@ -704,6 +704,6 @@ export default {
 
 <style lang="scss" scoped>
   .patch-version {
-    margin-top: 5px;
+    margin-top: 10px;
   }
 </style>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard-shell-shell",
-  "version": "3.0.5-test.43",
+  "version": "3.0.5-test.45",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/pages/account/index.vue

@@ -164,6 +164,7 @@ export default {
       <h5 v-t="'accountAndKeys.account.title'" />
       <div class="account">
         <Principal
+          :userLogo="true"
           :userLogoSize="79"
           :value="principal.id"
           :use-muted="false"

package/plugins/dashboard-store/actions.js

@@ -41,26 +41,6 @@ export async function handleSpoofedRequest(rootGetters, schemaStore, opt, produc
   }
 }
 
-export function normalizeSchemaMethods(schema) {
-  if (!schema) return schema;
-  
-  const HTTP_METHODS = ["get", "post", "put", "patch", "delete"];
-
-  if (Array.isArray(schema.resourceMethods)) {
-    schema.resourceMethods = schema.resourceMethods.map(m =>
-      HTTP_METHODS.includes(m.toLowerCase()) ? m.toUpperCase() : m
-    );
-  }
-
-  if (Array.isArray(schema.collectionMethods)) {
-    schema.collectionMethods = schema.collectionMethods.map(m =>
-      HTTP_METHODS.includes(m.toLowerCase()) ? m.toUpperCase() : m
-    );
-  }
-
-  return schema;
-}
-
 export async function loadSchemas(ctx, watch = true) {
   const {
     getters, dispatch, commit, rootGetters
@@ -76,9 +56,6 @@ export async function loadSchemas(ctx, watch = true) {
 
   res.data.forEach(addSchemaIndexFields);
   
-  // ✅ 统一处理 HTTP 方法
-  res.data.forEach(normalizeSchemaMethods);
-
   commit('loadAll', {
     ctx,
     type:     SCHEMA,

package/scripts/build-pkg.sh

@@ -2,7 +2,6 @@
 
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 BASE_DIR="$( cd $SCRIPT_DIR && cd ../.. & pwd)"
-SHELL_DIR=$BASE_DIR/shell/
 EXIT_CODE=0
 FORMATS="umd-min"
 
@@ -19,12 +18,18 @@ done
 
 shift $((OPTIND-1))
 
-# Use shell folder in node modules when we have @rancher/shell installed as a node module
-# rather than the use-case of the mono-repo with the shell folder at the top-level
-if [ ! -d ${SHELL_DIR} ]; then
-  SHELL_DIR=$BASE_DIR/node_modules/@rancher/shell/
-  SHELL_DIR=$(cd -P ${SHELL_DIR} && pwd)
+# ---- 修改这里 ----
+# 优先使用顶级 shell 文件夹，如果不存在则使用 node_modules/dashboard-shell-shell
+SHELL_DIR=$BASE_DIR/shell/
+if [ ! -d "${SHELL_DIR}" ]; then
+  SHELL_DIR=$BASE_DIR/node_modules/dashboard-shell-shell/
+  if [ ! -d "${SHELL_DIR}" ]; then
+    echo "Error: dashboard-shell-shell not found in node_modules"
+    exit 1
+  fi
 fi
+# 转为绝对路径，防止符号链接循环
+SHELL_DIR=$(cd -P "${SHELL_DIR}" && pwd)
 
 CREATE_TARBALL=${2}
 
@@ -46,18 +51,14 @@ if [ -d "${BASE_DIR}/pkg/${1}" ]; then
 
   pushd pkg/${1}
 
-  # Check that the .shell link exists and points to the correct place
-  if [ -e ".shell" ]; then
-    LINK=$(readlink .shell)
-    if [ "${LINK}" != "${SHELL_DIR}" ]; then
-      echo ".shell symlink exists but does not point to expected location - please check and fix"
-      popd
-      exit -1
-    fi
-  else
-    ln -s ${SHELL_DIR} .shell
+  # 删除旧的 .shell，防止循环
+  if [ -L ".shell" ] || [ -e ".shell" ]; then
+    rm -rf .shell
   fi
 
+  # 创建新的符号链接
+  ln -s "${SHELL_DIR}" .shell
+
   FILE=index.js
   if [ -f ./index.ts ]; then
     FILE=index.ts
@@ -72,7 +73,7 @@ if [ -d "${BASE_DIR}/pkg/${1}" ]; then
   cp -f ./package.json ${PKG_DIST}/package.json
   node ${SCRIPT_DIR}/pkgfile.js ${PKG_DIST}/package.json
   rm -rf ${PKG_DIST}/*.bak
-  rm .shell
+  rm -rf .shell
 
   popd  
 fi
@@ -81,22 +82,16 @@ if [ $EXIT_CODE -ne 0 ]; then
   exit $EXIT_CODE
 fi
 
-
 if [ -n "${CREATE_TARBALL}" ]; then
   echo $COMMIT $COMMIT_BRANCH > ${PKG_DIST}/version-commit.txt
 
   TARBALL=${NAME}.tar.gz
 
   pushd ${PKG_DIST}
-
   rm -f ../$TARBALL
-
   echo "Compressing to ${TARBALL}..."
-
   tar -czf ../${TARBALL} .
-
   popd
-
 fi
 
 exit $EXIT_CODE

package/scripts/publish-shell.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # 执行命令示例：
-# TAG=shell-pkg-v3.0.5-test.43 ./shell/scripts/publish-shell.sh
+# TAG=shell-pkg-v3.0.5-test.45 ./shell/scripts/publish-shell.sh
 
 set -euo pipefail
 

package/types/shell/index.d.ts

@@ -2687,7 +2687,6 @@ export default class Ingress {
 
 declare module '@shell/plugins/dashboard-store/actions' {
 export function handleSpoofedRequest(rootGetters: any, schemaStore: any, opt: any, product: any): Promise<any>;
-export function normalizeSchemaMethods(schema: any): any;
 export function loadSchemas(ctx: any, watch?: boolean): Promise<any>;
 export const _ALL: "all";
 export const _MERGE: "merge";

package/utils/error.js

@@ -51,8 +51,6 @@ export class ApiError extends Error {
 
 export function stringify(err) {
   
-  console.log(err, ' err-------------------------------------------------1')
-
   let str;
   if ( typeof err === 'string' ) {
     str = err;
@@ -96,8 +94,6 @@ export function exceptionToErrorsArray(err) {
   if ( err?.response?.data ) {
     const body = err.response.data;
 
-    console.log(err, ' err-------------------------------------------------1')
-
     if ( body && body.message ) {
       return [translateError(body.message)];
     } else {
@@ -152,6 +148,21 @@ export function translateError(error) {
   }).replace('internal error occurred: ', "");
   console.log('00044', error);
 
+    // 1. 资源配额错误（最高优先级）
+  if (originError.includes('exceeded quota')) {
+    return '资源配额超限：请求的资源超过了命名空间的配额限制';
+  }
+
+  // 2. 权限不足错误
+  const permissionDeniedPatterns = [
+    /"\S+" is forbidden:.*cannot.*(patch|update|create|delete|get|list|watch).*resource/i,
+    /is forbidden:.*user.*cannot.*(patch|update|create|delete|get|list|watch)/i
+  ];
+  
+  if (permissionDeniedPatterns.some(pattern => pattern.test(originError))) {
+    return "权限不足";
+  }
+
 
   if (error.includes("a lowercase rfc 1123 label must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character")) {
     error =  "无效的名称不符合 RFC 1123 命名规则。名称只能包含小写字母、数字或 '-'，并且必须以字母或数字开头和结尾（例如 'my-name' 或 '123-abc'）。"

package/utils/errorTranslate.json

@@ -1,45 +1,5 @@
 {
   "translations": [
-    {
-      "pattern": "storageclasses.storage.k8sio \"(\\S+)\" is forbidden: User \"(\\S+)\" cannot patch resource \"(\\S+)\" in APl group \"(\\S+)\" at the cluster scope",
-      "replacement": "权限不足",
-      "flags": "gi"
-    },
-    {
-      "pattern": "virtualmachineimages.harvesterhciio \"(\\S+)\" is forbidden: User \"(\\S+)\" cannot patch resource \"(\\S+)\" in Apl group \"(\\S+)\" in the namespace \"(\\S+)\"",
-      "replacement": "权限不足",
-      "flags": "gi"
-    },
-    {
-      "pattern": "Method POST not supported",
-      "replacement": "权限不足",
-      "flags": "gi"
-    },
-    {
-      "pattern": "Method GET not supported",
-      "replacement": "权限不足",
-      "flags": "gi"
-    },
-    {
-      "pattern": "Method CREATE not supported",
-      "replacement": "权限不足",
-      "flags": "gi"
-    },
-    {
-      "pattern": "Method GET not supported",
-      "replacement": "权限不足",
-      "flags": "gi"
-    },
-    {
-      "pattern": "Method DELETE not supported",
-      "replacement": "权限不足",
-      "flags": "gi"
-    },
-    {
-      "pattern": "Method PUT not supported",
-      "replacement": "权限不足",
-      "flags": "gi"
-    },
     {
       "pattern": "failure while starting vmi:  arm64 not support this disk bus type, please use virtio or scsi",
       "replacement": "启动虚拟机实例失败：ARM64 架构不支持此磁盘总线类型，请使用 virtio 或 scsi",

package/utils/errorTranslateNew.json

@@ -1,12 +1,7 @@
 {
   "translations": [
-    {
-      "pattern": "virtualmachineimages\\.harvesterhci\\.io.*forbidden.*user.*cannot.*(patch|update|create|delete).*resource.*virtualmachineimages.*harvesterhci\\.io.*namespace",
-      "replacement": "权限不足",
-      "flags": "gi"
-    },
-    {
-      "pattern": "storageclasses\\.storage\\.k8s\\.io.*forbidden.*user.*cannot.*(patch|update|create|delete).*resource.*storageclasses.*storage\\.k8s\\.io.*cluster scope",
+        {
+      "pattern": "Method (POST|GET|CREATE|DELETE|PUT|PATCH|OPTIONS|HEAD|TRACE|CONNECT) not supported",
       "replacement": "权限不足",
       "flags": "gi"
     },