@rancher/shell 3.0.12-rc.2 → 3.0.12-rc.4

package/assets/translations/en-us.yaml

@@ -40,6 +40,7 @@ generic:
   descending: descending
   disabled: Disabled
   done: Done
+  download: Download
   enabled: Enabled
   error: Error
   here: here
@@ -54,6 +55,7 @@ generic:
   labels: Labels
   labelsAndAnnotations: Labels & Annotations
   podSecurityAdmission: Pod Security Admission
+  learnMoreAbout: 'Learn more about '
   links: Links
   loading: Loading…
   members: Members
@@ -500,7 +502,7 @@ authConfig:
     unrestricted: Allow any valid user
   allowedPrincipalIds:
     title: Authorized Users & Groups
-  associatedWarning: 'The {provider} account that is used to enable the external provider will be granted admin permissions. If you use a test account or non-admin account, that account will still be granted admin-level permissions. See <a href="{docsBase}/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config#external-authentication-configuration-and-principal-users" target="_blank" rel="noopener noreferrer nofollow">External Authentication Configuration and Principal Users</a> to understand why.'
+  associatedWarning: 'The {provider} account that is used to enable the external provider will be granted permissions equal to the currently logged in Rancher user. See <a href="{docsBase}/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config#external-authentication-configuration-and-principal-users" target="_blank" rel="noopener noreferrer nofollow">External Authentication Configuration and Principal Users</a> to understand why.'
   githubapp:
     clientId:
       label: Client ID
@@ -734,6 +736,9 @@ authConfig:
       label: Token Endpoint
     authEndpoint:
       label: Auth Endpoint
+    endSessionEndpoint:
+      title: End Session Endpoint
+      tooltip: "{name} URL used for logging a user out of their session (e.g. https://login.microsoftonline.com/{tenantId}/oauth2/v2.0/logout)"
     groupMembershipFilter:
       label: Group Membership Filter
       enable: Limit users by group membership
@@ -794,6 +799,7 @@ authConfig:
       label: Scopes
       placeholder: openid
       protip: The <code>openid</code>, <code>profile</code>, and <code>email</code> scopes are required and cannot be removed.
+      missingRequired: "The required {count, plural, =1 {scope is} other {scopes are}} missing: {scopes}"
     pkce:
       label: Enable PKCE (S256)
       tooltip: Enable Proof Key for Code Exchange (PKCE) using the S256 code challenge method. When enabled, this client must use PKCE with S256 for authorization requests.
@@ -1156,6 +1162,9 @@ catalog:
     deprecatedWarning: '{chartName} has been marked as deprecated. Use caution when installing this helm chart as it might be removed in the future.'
     experimentalWarning: '{chartName} has been marked as experimental. Use caution when installing this helm chart as it might not function as expected.'
     deprecatedAndExperimentalWarning: '{chartName} has been marked as deprecated and experimental. Use caution when installing this helm chart as it might be removed in the future and might not function as expected.'
+    viewReadmeSeparately:
+      label: View separately
+      tooltip: Open the readme in a new tab
     installedAppsSelector:
       ariaLabel: Select installed app instance
     chartButton:
@@ -1219,6 +1228,7 @@ catalog:
       lastUpdatedDesc: Last updated
       alphaAscending: Chart name, A → Z
       alphaDescending: Chart name, Z → A
+    loadingMore: Loading more…
     refreshButton:
       label: Refresh all repositories
     findSimilar:
@@ -1371,6 +1381,8 @@ catalog:
     version: Version
     versions:
       current: '{ver} (Current)'
+      current_linux: '{ver} (Current, Linux-only)'
+      current_windows: '{ver} (Current, Windows-only)'
       linux: '{ver} (Linux-only)'
       windows: '{ver} (Windows-only)'
   delete:
@@ -1420,7 +1432,7 @@ catalog:
     oci:
       urlLabel: OCI Repository Host URL
       placeholder: 'e.g. oci://<registry-host>/<namespace>/<chart-name>:<tag>'
-      warning: OCI URLs must ONLY target helm chart/s.
+      warning: OCI URLs must ONLY target helm charts.
       info: For large repositories containing many charts consider targeting a specific namespace or chart to improve performance, for example with oci://<registry-host>/<namespace> or oci://<registry-host>/<namespace>/<chart-name>.
       skipTlsVerifications: Skip TLS Verifications
       insecurePlainHttp: Insecure Plain Http
@@ -1437,7 +1449,11 @@ catalog:
           placeholder: 'default: 5'
     refreshInterval:
       label: Refresh Interval
-      placeholder: 'default: {hours}'
+      placeholder: 'default: {value}{unit}'
+      unitLabel: Unit
+      enableLabel: Enable Refresh Interval
+    downloaded:
+      label: Downloaded
     error:
       refresh: Error refreshing repository
   tools:
@@ -1511,9 +1527,12 @@ compliance:
       =1 { Any scheduled scans using this profile will no longer work. }
       other { Any scheduled scans using either of these profiles will no longer work. }
     }
-  downloadAllReports: Download All Saved Reports
-  downloadLatestReport: Download Latest Report
-  downloadReport: Download Report
+  downloadAllReports: Download All Saved Reports (CSV)
+  downloadAllReportsXCCDF: Download All Saved Reports (XCCDF)
+  downloadLatestReport: Download Latest Report (CSV)
+  downloadLatestReportXCCDF: Download Latest Report (XCCDF)
+  downloadReport: Download Report (CSV)
+  downloadReportXCCDF: Download Report (XCCDF)
   maxKubernetesVersion: Maximum allowed Kubernetes version
   minKubernetesVersion: Minimum required Kubernetes version
   noProfiles: There are no valid ClusterScanProfiles for this cluster type to select.
@@ -1522,6 +1541,8 @@ compliance:
   reports: Reports
   retention: Retention Count
   scan:
+    errorNoParsedNodes: No nodes were parsed from the scan results, so no report can be generated.
+    errorDownload: Error downloading file
     description: Description
     fail: Fail
     lastScanTime: Last Scan Time
@@ -2338,7 +2359,9 @@ cluster:
       etcdControlPlaneWarning: We don't recommend using Autoscaler with machine pools that have the etcd or Control Plane roles. You can modify the yaml if you want to override the current value.
     name:
       label: Pool Name
+      notNamed: (Not Named)
       placeholder: A random one will be generated by default
+      unique: Pool names should be unique
     nodeTotals:
       label:
         controlPlane: '{count} Control Plane'
@@ -2391,7 +2414,7 @@ cluster:
       label: Auto Replace
       toolTip: If greater than 0, nodes that are unreachable for this duration will be automatically deleted and replaced.
       unit: "Seconds"
-  managementTimeout: The cluster to become available. It's possible the cluster was created. We suggest checking the clusters page before trying to create another.
+  managementTimeout: The {type} {name} to become available. It's possible the cluster was created. We suggest checking the clusters page before trying to create another.
   memberRoles:
     removeMessage: 'Note: Removing a user will not remove their project permissions'
     addClusterMember:
@@ -2482,6 +2505,7 @@ cluster:
     create-rke2: Provision new nodes and create a cluster using RKE2/K3s
     create-template: Use a Catalog Template to create a cluster
     register-custom: Import any Kubernetes cluster
+    create-capi: Create a cluster using Cluster API
   rke2:
     banner:
       psaChange: PSACT is now set to Rancher default automatically
@@ -2719,6 +2743,7 @@ cluster:
     registry: Registries
     upgrade: Upgrade Strategy
     registration: Registration
+    nodePools: Node Pools
   rotateCertificates:
     label: Rotate Certificates
     modalTitle: Rotate Cluster Certificates
@@ -2833,6 +2858,8 @@ cruResource:
   reviewYaml: "Keep editing YAML"
   previewYaml: Edit as YAML
   showYaml: View as YAML
+  tableOfContents:
+    jumpTo: Jump to...
 
 providers:
   hosted: 
@@ -3128,19 +3155,27 @@ fleet:
       waitApplied: Wait Applied
   clusterTargets:
     advancedConfigs: Advanced target configurations are defined, check the YAML file for further details.
+    targetMode:
+      local: local cluster
+      all: All Clusters in the workspace
+      allCompact: 'All Clusters in the <b>{namespace}</b> workspace ({count})'
+      none: No clusters
+      clusters: Manually selected clusters
     clusters:
-      title: Clusters
+      title: Cluster selection
       byName:
+        title: Select by cluster name
         placeholder: Select Multiple Clusters
-        label: Select by cluster name
+        label: Cluster names
       byLabel:
         title: Select by labels
         addSelector: Add cluster selector
+        removeSelector: Remove cluster selector
         labelKey: Label
     clusterGroups:
-      title: Cluster Groups
+      title: Select by cluster groups
       byName:
-        label: Select by cluster group name
+        label: Cluster groups
         placeholder: Select Multiple Cluster Groups
     rules:
       matching:
@@ -3150,6 +3185,7 @@ fleet:
             =1 {1 cluster selected}
             other {{n, number} clusters selected}
             }
+        selectedClusters: Selected clusters
         placeholder: Select clusters by name, labels or groups
         empty: No clusters in the workspace
         plusMore: |-
@@ -3171,6 +3207,9 @@ fleet:
         description: GitRepo describes a git repository that is watched by Fleet. The resource contains the necessary information to deploy the repo, or parts of it, to target clusters.
       fleet.cattle.io.helmop:
         description: HelmOp is a simplified way of creating bundles by directly pointing to a Helm repository or to an OCI registry, without needing to set up a git repository.
+      suse-application-collection:
+        label: SUSE Application Collection
+        description: Explore our maintained and secure Application Collection, select a Helm chart and deploy it to your clusters.
     warningTooltip:
       clusterGroup: There are no clusters in this Cluster Group
       cluster: There are no clusters available
@@ -3318,6 +3357,24 @@ fleet:
       label: Workspace
       addWorkspace: Create a workspace
     helmRepoURLRegex: Helm Repos (URL Regex)
+  appCo:
+    credentials:
+      title: Create an App Bundle from SUSE Application Collection
+      subtitle: Set up your credentials
+      infoText: An Application Collection access token is required to connect to the Helm Charts catalog.
+      accessTokensLink: SUSE Application Collection access tokens
+      accessTokenLabel: Access token
+      editCredentials: Edit credentials
+      addNewToken: Add a new access token...
+      noTokensYet: "You haven't added an access token yet."
+      chooseExisting: 'Choose an existing token:'
+      username: Username
+      usernamePlaceholder: user@domain.org
+      accessTokenField: Access Token
+      accessTokenPlaceholder: Your SUSE Application Collection access token
+    chart:
+      title: Charts
+      loadError: Chart not found or has no available versions.
   helmOp:
     intro:
       add: Create Helm Op
@@ -3370,6 +3427,35 @@ fleet:
           subtext: 'Define advanced settings'
           description: Fleet will use the authentication settings and polling to synchronise the resources contained in it.
           info: These settings are for advanced usage and optional. You can skip them and finish the creation process.
+        selection:
+          searchPlaceholder: Search the catalog...
+          authBanner: 'Two different resources will be created: a Continuous Delivery secret, and an imagePullSecret that will be copied into every downstream cluster selected in the next step.'
+          emptyState:
+            connectionError:
+              title: Connection error
+              descriptionPre: 'There was an error fetching SUSE Application Collection catalog.'
+              please: 'Please, '
+              tryAgain: try again
+              descriptionPost: ' or contact your system administrator.'
+            noMatch:
+              title: No charts to show
+              descriptionPre: 'Tips: use a different search criteria or '
+              clearSearch: clear the search bar
+              descriptionPost: ' and explore the catalog.'
+          repoLoading:
+            title: Creating SUSE Application Collection repository...
+            description: Please, wait while the repository is created
+          repoError:
+            description: 'Please, check your credentials or the repository in the upstream cluster:'
+            link: SUSE App Collection
+    appCoConfig:
+      chartVersion: Chart version
+      name: App Bundle name
+      advanced: Advanced
+    appCoView:
+      chartConfig: Chart config
+      targetDetails: Target details
+      advanced: Advanced
     source:
       title: Source
       selectLabel: Type
@@ -3398,10 +3484,13 @@ fleet:
         title: Release
         label: Name
         placeholder: The Helm release name
+        fullLabel: Release Name
     values:
       title: Values
       selectLabel: Values
       description: Configure Values used by Helm that help define the App.
+      descriptionCompact: Values defined in this section will be applied to the chart in every selected cluster.
+      appCoDescription: The predefined global imagePullSecret should not be modified, otherwise the connection with SUSE Application Collection will fail.
       types:
         values: Values
         valuesFiles: Values Files
@@ -3428,17 +3517,25 @@ fleet:
     serviceAccount:
       label: Service Account Name
       placeholder: "Optional: Use a service account in the target clusters"
+      compactPlaceholder: "Use a service account in the selected clusters"
+      compactDescription: "When provided, this ServiceAccount will be used to perform the deployment."
     targetNamespace:
       label: Target Namespace
       placeholder: "Optional: Require all resources to be in this namespace"
+      compactPlaceholder: "Require all resources to be in this namespace"
+      compactDescription: "This will assign all resources to the specified namespace. If any cluster scoped resource exists, the deployment will fail."
     target:
       selectLabel: Target
       advanced: Advanced
       cluster: Cluster
       clusterGroup: Cluster Group
       label: Deploy To
+      title: Deploy chart to
       labelLocal: Deploy With
       additionalOptions: Additional Options
+      clusterDeploymentSettings: Cluster deployment settings
+      clusterDeploymentDescription: "Here you can set a ServiceAccount or force a target Namespace for the deployments."
+      clusterDeploymentLink: Bundle Deployment Options
     targetDisplay:
       advanced: Advanced
       clusters: Clusters
@@ -3447,10 +3544,17 @@ fleet:
       local: Local
     resources:
       label: 'Resources'
+      lockedSecretBanner: The previously selected Image Pull Secret is required to connect with SUSE Application Collection.
       keepResources: Always keep resources
       keepResourcesTooltip: When enabled, resources will be kept when deleting a HelmOp or Bundle - only Helm release secrets will be deleted.
       correctDrift: Enable self-healing
       correctDriftTooltip: When enabled, Fleet will ensure that the cluster resources are kept in sync with the HelmOp. All resource changes made on the cluster will be lost.
+    appCoResources:
+      helmChartSettings: Helm chart resources settings
+      additionalResources: Additional resources to sync
+      additionalResourcesDescription: You can add Secrets and ConfigMaps to copy those resources to each targeted downstream cluster before deploying the Helm chart.
+      additionalResourcesLinkDescription: Learn more about
+      additionalResourcesLink: Automated propagation of resources to downstream clusters
     polling:
       label: Polling
       enable: Enable Polling
@@ -3465,6 +3569,7 @@ fleet:
       title: Authentication
       label: Authentication
       helm: Helm Authentication
+      appco: SUSE App Collection Authentication
     caBundle:
       label: Certificates
       placeholder: "Paste in one or more certificates, starting with -----BEGIN CERTIFICATE----"
@@ -4125,8 +4230,8 @@ landing:
     docs: Docs
     forums: Forums
   commercial:
-    title: Commercial Support
-    body: Learn about commercial support
+    title: Rancher Prime
+    body: Learn about Rancher Prime
   landingPrefs:
     body: "You can change where you land when you login"
     ariaLabelTakeMeToCluster: Select which cluster to take me to after login
@@ -5609,7 +5714,7 @@ plugins:
     banner: There are new extensions repositories available. To enable these repositories, click the button on the right.
     bannerBtn: Add repositories
     title: Add Extensions repositories
-    prompt: You can install multiple Rancher extension repositories to increase your extensions catalog
+    prompt: Enable additional repositories to access more extensions
   setup:
     installed: Already installed
     uninstalled: Already uninstalled
@@ -5625,7 +5730,7 @@ plugins:
       prompt: This will lead you to the page where you can enable the Feature Flag needed to enable Extension support.
       featuresButton: Go to Feature Flags
       airgap: Air-gapped installations should NOT enable this feature
-      addRancherRepo: Add Official Rancher Extensions Repository
+      addRancherRepo: Add Rancher Prime Extensions Repository
       addPartnersRancherRepo: Add Partners Extensions Repository
     remove:
       label: Disable Extension Support
@@ -6169,6 +6274,8 @@ resourceList:
   nsFiltering: "Please select one or more namespaces or projects using the filter above."
   nsFilteringGeneric: "Please select a valid namespace or project option using the filter above."
   nsFilterToolTip: "Filtering is restricted to projects and namespaces"
+  stateFilterApplied: "State filter applied:"
+  clearStateFilter: "Clear filter"
 resourceLoadingIndicator:
   loading: Loading
 
@@ -6182,6 +6289,7 @@ resourceTable:
     cluster: Group by Cluster
     device: Group by Device
     pool: Group by Pool
+    workspace: Group by Workspace
   groupLabel:
     cluster: "<span>Cluster:</span> {name}"
     notInACluster: Not in a Cluster
@@ -6497,11 +6605,7 @@ setup:
   currentPassword: Bootstrap Password
   confirmPassword: Confirm New Password
   defaultPassword:
-    intro: It looks like this is your first time visiting {vendor}; if you pre-set your own bootstrap password, enter it here.  Otherwise a random one has been generated for you.  To find it:<br/><br/>
-    dockerPrefix: 'For a "docker run" installation:'
-    dockerPs: 'Find your container ID with <code>docker ps</code>, then run:'
-    dockerSuffix: ""
-    helmPrefix: 'For a Helm installation, run:'
+    intro: It looks like this is your first time visiting {vendor}; if you pre-set your own bootstrap password, enter it here.  Otherwise a random one has been generated for you.  To find it, run:<br/><br/>
     helmSuffix: ""
   eula: By checking the box, you accept the <a href="https://www.suse.com/licensing/eula/download/suse_end_user_license_agreement_june_2024.pdf" target="_blank" rel="noopener noreferrer nofollow">End User License Agreement & Terms & Conditions</a>
   newPassword: New Password
@@ -7419,6 +7523,36 @@ wm:
   kubectlShell:
     title: "Kubectl: {name}"
 
+workloadDashboard:
+  title: Workloads Overview
+  subtitle:
+    allNamespaces: "For all namespaces"
+    userNamespaces: "Only for user namespaces"
+    systemNamespaces: "Only for system namespaces"
+    namespacedOnly: "Only for namespaced resources"
+    clusterOnly: "Only for cluster resources"
+    project: "For the namespaces of Project {name}"
+    namespace: "For the namespace {name}"
+    multipleSelected: "For {selected} items selected"
+  workloadCount: |-
+    ({count, plural,
+      =0 {No workload}
+      =1 {{count} workload}
+      other {{count} workloads}
+    })
+  sections:
+    byState: By State
+    byType: By Type
+    byNamespace: By Namespace
+  errors:
+    noAccess: "No access to {type}"
+    fetchType: "Failed to fetch {type}"
+    fetchAll: Failed to fetch workload summaries
+  empty:
+    title: No workloads to show
+    message: "Tips: Update the namespace filter above or <resetLink>reset the namespaces filter</resetLink>."
+    docsMessage: "Want to learn more about Workloads? Read our <docsLink>documentation</docsLink>."
+
 workload:
   scaleWorkloads: Scale workloads
   healthWorkloads: Jobs/Pods health status
@@ -7974,6 +8108,7 @@ model:
       genericoidc: OIDC provider
       cognito: Amazon Cognito
     name:
+      azuread: Microsoft Entra ID
       keycloak: Keycloak (SAML)
       keycloakoidc: Keycloak (OIDC)
     provider:
@@ -8037,7 +8172,6 @@ typeDescription:
   #       target="_blank" rel="noopener noreferrer nofollow"
   jwt.authentication: Enable this feature on a cluster to add support for JWT authenticating downstream service accounts.
   branding: "Branding allows administrators to globally re-brand the UI by customizing the Rancher product name, logos and color scheme."
-  chart: "All charts have at least one version that is installable on clusters with Linux and Windows nodes unless otherwise indicated."
   compliance.cattle.io.clusterscanbenchmark: A benchmark version is the name of benchmark to run using kube-bench as well as the valid configuration parameters for that benchmark.
   compliance.cattle.io.clusterscanprofile: A profile is the configuration for the compliance scan, which is the benchmark versions to use and any specific tests to skip in that benchmark.
   compliance.cattle.io.clusterscan: A scan is created to trigger a compliance scan on the cluster based on the defined profile. A report is created after the scan is completed.
@@ -8646,6 +8780,11 @@ typeLabel:
       one { Cluster Registration Token }
       other { Cluster Registration Tokens }
     }
+  turtles-capi.cattle.io.capiprovider: |-
+    {count, plural,
+      one { Cluster API Provider }
+      other { Cluster API Providers }
+    }
 
 oidcclient:
   a11y:
@@ -8786,6 +8925,9 @@ registryConfig:
   toolTip: 'When an image needs to be pulled from the given registry hostname, this information will be used to verify the identity of the registry and authenticate to it.'
   addLabel: Add Registry
   description: "Define the TLS and credential configuration for each registry hostname and mirror."
+  caBundle:
+    tooltip: Accepts a CA PEM certificate or a base64 encoded CA PEM.
+    validationError: Invalid CA cert bundle. Must be a CA PEM certificate or a base64 encoded CA PEM.
 
 ##############################
 ### Advanced Settings
@@ -8824,9 +8966,8 @@ advancedSettings:
     'ingress-ip-domain': 'Wildcard DNS domain to use for automatically generated Ingress hostnames. <ingress-name>.<namespace-name>.<ip address of ingress controller> will be added to the domain.'
     'server-url': 'Default {appName} install url. Must be HTTPS. All nodes in your cluster must be able to reach this.'
     'system-default-registry': 'Private registry to be used for all Rancher System Container Images. If no value is specified, the default registry for the container runtime is used. For Docker and containerd, the default is `docker.io`.'
-    'ui-index': 'HTML index location for the Cluster Manager UI.'
     'ui-dashboard-index': 'HTML index location for the {appName} UI.'
-    'ui-offline-preferred': 'Controls whether UI assets are served locally by the server container or from the remote URL defined in the ui-index and ui-dashboard-index settings. The `Dynamic` option will use local assets in production builds of {appName}.'
+    'ui-offline-preferred': 'Controls whether UI assets are served locally by the server container or from the remote URL defined in the ui-dashboard-index setting. The `Dynamic` option will use local assets in production builds of {appName}.'
     'ui-pl': 'Private-Label company name.'
     'auth-user-info-max-age-seconds': 'The maximum age of a users auth tokens before an auth provider group membership sync will be performed.'
     'auth-user-info-resync-cron': 'Default cron schedule for resyncing auth provider group memberships.'
@@ -9133,31 +9274,10 @@ customLinks:
     slack:      Slack
     issues:     File an Issue
     getStarted: Get Started
-    commercialSupport: Commercial Support
+    commercialSupport: Rancher Prime
     appCo: SUSE Application Collection
 
-##############################
-### Support Page
-##############################
-
-support:
-  bannerImage: Support page banner image
-  community:
-    title: SUSE Rancher provides world-class support
-    linksTitle: Community Support
-    learnMore: Find out more about SUSE Rancher Support
-    pricing: Contact us for pricing
-  subscription:
-    haveSupport: Already have support?
-    addSubscription: Add a Subscription ID
-    removeSubscription: Remove your Subscription ID
-    addTitle: Add your SUSE Subscription ID
-    addLabel: "Please enter a valid Subscription ID:"
-    removeTitle: Remove your ID?
-    removeBody: "Note: This will not affect your subscription."
-
   suse:
-    title: "Great News - You're covered"
     editBrand: Customize UI Theme
     access:
       title: Get Support

package/assets/translations/zh-hans.yaml

@@ -4947,10 +4947,6 @@ setup:
   confirmPassword: 确认新密码
   defaultPassword:
     intro: 这是你第一次访问 {vendor}。如果你预先设置了 Bootstrap 密码，请在此处输入。否则我们会为你生成一个随机密码。找到它：<br/><br/>
-    dockerPrefix: '"docker run" 安装：'
-    dockerPs: '运行<code>docker ps</code>找到你的容器 ID，然后运行：'
-    dockerSuffix: ""
-    helmPrefix: 'Helm 安装，运行：'
     helmSuffix: ""
   eula: 选中此框，即表示你接受<a href="https://www.suse.com/licensing/eula/download/suse_end_user_license_agreement_june_2024.pdf" target="_blank" rel="noopener noreferrer nofollow">最终用户许可协议及条款和条件</a>
   newPassword: 新密码
@@ -6321,7 +6317,6 @@ typeDescription:
   #       If you link to anything external, it MUST have
   #       target="_blank" rel="noopener noreferrer nofollow"
   branding: "管理员可以修改 Rancher 产品名称、Logo 和配色方案来全局自定义 UI 界面。"
-  chart: "除非另有说明，否则所有 Chart 都至少有一个可以安装在具有 Linux 和 Windows 节点的集群上的版本。"
   cis.cattle.io.clusterscanbenchmark: Benchmark 版本是指使用 kube-bench 运行的 Benchmark 名称，以及该 Benchmark 的有效配置参数。
   cis.cattle.io.clusterscanprofile: 配置文件指定 CIS 扫描的配置，也就是要使用的 Benchmark 版本和该 Benchmark 中要跳过的特定测试。
   cis.cattle.io.clusterscan: 扫描是用来根据定义的配置文件，在集群上触发 CIS 扫描的。扫描完成后会创建一份报告。
@@ -6998,9 +6993,8 @@ advancedSettings:
     'ingress-ip-domain': '用于自动生成 Ingress 主机名的通配符 DNS 域。<ingress-name>.<namespace-name>.<ip address of ingress controller> 会被添加到该域。'
     'server-url': '默认 {appName} 安装地址。必须使用 HTTPS。你集群中的所有节点都必须能够访问此地址。'
     'system-default-registry': '用于所有 Rancher System 容器镜像的私有镜像仓库。如果未指定任何值，则使用容器运行时的默认镜像仓库。对于 Docker 和 containerd，默认为 `docker.io`。'
-    'ui-index': 'Cluster Manager UI 的 HTML 索引位置。'
     'ui-dashboard-index': '{appName} UI 的 HTML 索引位置。'
-    'ui-offline-preferred': '控制 UI 资产是由服务器容器在本地提供，还是从 ui-index 和 ui-dashboard-index 设置中定义的远程 URL 提供。`动态` 选项将在 {appName} 的生产版本中使用本地资产。'
+    'ui-offline-preferred': '控制 UI 资产是由服务器容器在本地提供，还是从 ui-dashboard-index 设置中定义的远程 URL 提供。`动态` 选项将在 {appName} 的生产版本中使用本地资产。'
     'ui-pl': '自有品牌公司名称。'
     'auth-user-info-max-age-seconds': '在同步验证提供程序组成员之前，用户验证 Token 的最长存活时间。'
     'auth-user-info-resync-cron': '重新同步验证提供程序组成员的默认 cron 调度。'

package/chart/monitoring/ClusterSelector.vue

@@ -61,12 +61,6 @@ const CLUSTER_TYPES = [
     label:      'cluster.provider.other',
     configKeys: OTHER_CONFIG_KEYS,
   },
-  {
-    group:      'rke',
-    id:         'rke',
-    label:      'cluster.provider.rke',
-    configKeys: ['rkeControllerManager', 'rkeScheduler', 'rkeProxy', 'rkeEtcd'],
-  },
   {
     group:      'rke',
     id:         'rke2', // rke federal
@@ -78,12 +72,6 @@ const CLUSTER_TYPES = [
       'rke2Etcd',
     ],
   },
-  {
-    group:      'rke',
-    id:         'rke.windows',
-    label:      'cluster.provider.rkeWindows',
-    configKeys: ['rkeControllerManager', 'rkeScheduler', 'rkeProxy', 'rkeEtcd'],
-  },
 ];
 
 export default {
@@ -165,15 +153,6 @@ export default {
         this.value.prometheus.prometheusSpec.resources.requests['memory'] = '1750Mi';
       }
 
-      if (clusterType.id === 'rke.windows') {
-        if (!this.value.global.cattle.windows) {
-          this.value.global.cattle['windows'] = { enabled: true };
-        } else {
-          this.value.global.cattle.windows.enabled = true;
-        }
-      } else if (oldClusterType && oldClusterType.id === 'rke.windows') {
-        delete this.value.global.cattle.windows;
-      }
       this.$emit('onClusterTypeChanged', clusterType);
     },
   },

package/chart/monitoring/index.vue

@@ -17,6 +17,7 @@ import Tabbed from '@shell/components/Tabbed';
 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';
+import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
 
 export default {
   emits: ['register-before-hook', 'input'],
@@ -50,6 +51,12 @@ export default {
         return {};
       },
     },
+
+    // The selected chart version object, passed from install.vue
+    version: {
+      type:    Object,
+      default: null,
+    },
   },
 
   async fetch() {
@@ -92,7 +99,9 @@ export default {
 
     const hash = await allHash(hashPromises);
 
-    this.targetNamespace = hash.namespaces[this.chart.targetNamespace] || false;
+    const ns = this.version?.annotations?.[CATALOG_ANNOTATIONS.NAMESPACE] || this.chart.targetNamespace;
+
+    this.targetNamespace = hash.namespaces[ns] || false;
 
     if (!isEmpty(hash.storageClasses)) {
       this.storageClasses = hash.storageClasses;

package/chart/monitoring/prometheus/index.vue

@@ -12,6 +12,7 @@ import { RadioGroup } from '@components/Form/Radio';
 import { set } from '@shell/utils/object';
 import { simplify, convert } from '@shell/utils/selector';
 import { POD } from '@shell/config/types';
+import { RcButton } from '@components/RcButton';
 
 export default {
   components: {
@@ -22,6 +23,7 @@ export default {
     MatchExpressions,
     RadioGroup,
     StorageClassSelector,
+    RcButton,
   },
 
   props: {
@@ -190,12 +192,13 @@ export default {
           :key="i"
           class="mt-10"
         >
-          <router-link
+          <rc-button
+            size="large"
+            variant="tertiary"
             :to="wl.link"
-            class="btn role-tertiary"
           >
             {{ wl.label }}
-          </router-link>
+          </rc-button>
         </div>
       </template>
     </Banner>

package/components/ActionDropdownShell.vue

@@ -35,6 +35,7 @@ const setBulkActionOfInterest = (act: HiddenAction | null, event: 'mouseover' |
   >
     <rc-dropdown-trigger
       class="bulk-actions-dropdown"
+      size="large"
       :disabled="disabled"
     >
       <template #before>
@@ -42,7 +43,7 @@ const setBulkActionOfInterest = (act: HiddenAction | null, event: 'mouseover' |
       </template>
       <span>{{ t('sortableTable.bulkActions.collapsed.label') }}</span>
       <template #after>
-        <i class="ml-10 icon icon-chevron-down" />
+        <i class="icon icon-chevron-down" />
       </template>
     </rc-dropdown-trigger>
     <template #dropdownCollection>