@rancher/shell 0.3.16 → 0.3.17

package/assets/translations/en-us.yaml

@@ -197,6 +197,12 @@ nav:
     accountAndKeys: Account & API Keys
     logOut: Log Out
   failWhale:
+    authMiddleware: Auth Middleware
+    clusterNotFound: Cluster { clusterId } not found
+    productNotFound: Product { productNotFound } not found
+    resourceNotFound: Resource type { resource } not found
+    resourceListNotFound: Resource type { resource } not found, unable to display list
+    resourceIdNotFound: Resource { resource } with id { fqid } not found, unable to display resource details
     reload: Reload
     separator: or
 
@@ -588,6 +594,10 @@ asyncButton:
     action: Apply
     success: Applied
     waiting: Applying…
+  add:
+    action: Add
+    success: Added
+    waiting: Adding…
   continue:
     action: Continue
     success: Saved
@@ -1332,7 +1342,6 @@ cluster:
     deprecated: (deprecated)
     deprecatedPatches: Show deprecated Kubernetes patch versions
     deprecatedPatchWarning: We recommend using the latest patch version for each minor Kubernetes version. Deprecated patch versions can be useful for migration purposes.
-  toolsTip: Use the new Cluster Tools to manage and install Monitoring, Logging and other tools
   legacyWarning: The legacy feature flag is enabled and not all legacy features are supported in Kubernetes 1.21+.
   log:
     connecting: Connecting…
@@ -2150,8 +2159,10 @@ fleet:
       protocolBanner: Enter a valid HTTPS or SSH URL to a git repository.
     resources:
       label: 'Resource Handling'
-      keepResources: Keep resources after deletion
-      resourceBanner: When enabled above, resources will be kept when deleting a GitRepo or Bundle - only Helm release secrets will be deleted.
+      keepResources: Always Keep Resources
+      keepResourcesBanner: When enabled above, resources will be kept when deleting a GitRepo or Bundle - only Helm release secrets will be deleted.
+      correctDrift: Enable Self-Healing
+      correctDriftBanner: When enabled, Fleet will ensure that the cluster resources are kept in sync with the git repository. All resource changes made on th ecluster will be lost.
     add:
       steps:
         repoInfo:
@@ -2390,11 +2401,32 @@ hpa:
     name:
       label: Referent Name
       placeholder: e.g. php-apache
+  scaleDownRules:
+    label: Scale down behavior
+    enable: Configure scale down behavior
+  scaleUpRules:
+    label: Scale up behavior
+    enable: Configure scale up behavior
+  scalingRule:
+    policyHeader: Policies
+    addPolicy: Add policy
+    selectPolicy: Select policy
+    selectPolicyTooltip: Select the policy with the maximum value, minimum value or disable scaling.
+    stabilizationWindowSeconds: Stabilization window seconds
+    stabilizationWindowSecondsTooltip: Number of seconds for which past recommendations should be considered while scaling up or scaling down.
+    policy:
+      type: Type
+      typeTooltip: Set policy based on the amount of Pods to scale or the percentage of current replicas to scale.
+      value: Value
+      valueTooltip: The amount of change which is permitted by the policy.
+      periodSeconds: Period seconds
+      periodSecondsTooltip: The window of time for which the policy should hold true.
   tabs:
     labels: Labels
     metrics: Metrics
     target: Target
     workload: Workload
+    behavior: Behavior
   types:
     cpu: CPU
     memory: Memory
@@ -3021,6 +3053,9 @@ login:
   remember:
     label: Remember Username
 
+logout:
+  message: Logging Out...
+
 managementNode:
   customName: Custom Name
 
@@ -3989,7 +4024,9 @@ inactivity:
 
 # Rancher Extensions
 plugins:
-  incompatibleDisclaimer: "The latest version of this extension ({ version }) is not compatible with the current Rancher version ({ rancherVersion })."
+  incompatibleRancherVersion: "The latest version of this extension ({ version }) is not compatible with the current Rancher version ({ rancherVersion })."
+  incompatibleKubeVersion: "The latest version of this extension ({ version }) is not compatible with the current Kube version ({ kubeVersion })."
+  currentInstalledVersionBlockedByKubeVersion: "This version is not compatible with the current Kubernetes version ({ kubeVersion }  Vs  { kubeVersionToCheck })."
   labels:
     builtin: Built-in
     experimental: Experimental
@@ -4026,7 +4063,8 @@ plugins:
     detail: Detail
     versions: Versions
     versionError: Could not load version information
-    requiresVersion: "Requires Rancher {version}"
+    requiresRancherVersion: "Requires Rancher {version}"
+    requiresKubeVersion: "Requires Kube version {version}"
   empty:
     all: Extensions are neither installed nor available
     available: No Extensions available
@@ -4036,6 +4074,7 @@ plugins:
   loadError: An error occurred loading the code for this extension
   helmError: "An error occurred installing the extension via Helm"
   manageRepos: Manage Repositories
+  addRancherRepos: Add Rancher Repositories
   manageCharts: Manage Extension Charts
   manageCatalog:
     label: Manage Extension Catalogs
@@ -4107,23 +4146,39 @@ plugins:
   safeMode:
     title: Extensions Safe Mode
     message: Extensions were not loaded
+  addRepos:
+    banner: There are new extensions repositories available. To enable them, click the menu button at the top right of this page and select “Add Rancher Repositories”.
+    bannerBtn: Add repositories
+    title: Add Extensions repositories
+    prompt: You can install multiple Rancher extension repositories to increase your extensions catalog
   setup:
+    installed: Already installed
+    uninstalled: Already uninstalled
     title: Extension support is not enabled
     prompt:
       cant: Automatic installation is not available - required Helm Charts could not be found
       can: You need to install the Extension Operator
+      official: The Official Rancher Extensions Repository provides extensions published by Rancher
+      partners: The Partners Extensions Repository provides extensions published by Rancher Partners
+      community: The Community Extensions Repository provides extensions published by Rancher Community
     install:
       title: Enable Extension Support?
-      prompt: This will install the Helm charts to enable Extension support
-      airgap: The Rancher Extensions Repository provides extensions published by Rancher. Un-check if your Rancher installation is air-gapped
-      addRancherRepo: Add the Rancher Extension Repository
+      prompt: This will install the Helm charts needed to enable Extension support
+      airgap: Air-gapped installations should NOT enable this feature
+      addRancherRepo: Add Official Rancher Extensions Repository
+      addPartnersRancherRepo: Add Partners Extensions Repository
+      addCommunityRancherRepo: Add Community Extension sRepository
     remove:
       label: Disable Extension Support
       title: Disable Extension Support?
       prompt: This will un-install the Helm charts that enable Extension support
       registry:
-        title: Remove the Rancher Extensions Repository
-        prompt: The Rancher Extensions Repository provides extensions published by Rancher
+        official:
+          title: Remove the Official Rancher Extensions Repository
+        partners:
+          title: Remove the Partners Extensions Repository
+        community:
+          title: Remove the Community Extensions Repository
       crd:
         title: Remove the Rancher Extensions Custom Resource Definition
         prompt: There are one or more extensions installed - removing the CRD will require you to manually reinstall these extensions if you subsequently re-enable extensions support.
@@ -7356,7 +7411,7 @@ gitPicker:
     repo:
       label: Repository
       inputLabel: Repository
-      tooltip: Branch to deploy from
+      tooltip: Repository to deploy from
     commits:
       label: Commits
       tooltip: Commits to deploy from
@@ -7367,7 +7422,7 @@ gitPicker:
       label: Commit Message
     errors:
       noAccount: No GitHub account or Organization found. Please review your query and try again.
-      noBranch: No branch found. Please review your query and try again."
+      noBranch: No branch found. Please review your query and try again.
   gitlab:
     label: GitLab
     tableHeaders:
@@ -7393,7 +7448,7 @@ gitPicker:
     repo:
       label: Repository
       inputLabel: Repository
-      tooltip: Branch to deploy from
+      tooltip: Repository to deploy from
     commits:
       label: Commits
       tooltip: Commits to deploy from
@@ -7404,7 +7459,7 @@ gitPicker:
       label: Commit Message
     errors:
       noAccount: No GitLab account or Organization found. Please review your query and try again.
-      noBranch: No branch found. Please review your query and try again."
+      noBranch: No branch found. Please review your query and try again.
 
 networkAttachmentDefinition:
   tabs:

package/assets/translations/zh-hans.yaml

@@ -73,6 +73,7 @@ generic:
   techPreview: 技术预览
   type: 类型
   unknown: 未知
+  upload: 上传
   provisioning: '—'
   key: 键
   value: 值
@@ -1339,7 +1340,6 @@ cluster:
     deprecated: （已弃用）
     deprecatedPatches: 显示已弃用的 Kubernetes 补丁版本
     deprecatedPatchWarning: 建议为每个 Kubernetes 次要版本使用最新的补丁版本，已弃用的补丁版本可能对迁移有用。
-  toolsTip: 使用新集群工具来管理和安装 Monitoring、Logging 等工具。
   legacyWarning: 旧版功能开关已开启，但是不是所有旧版功能都在 Kubernetes 1.21+ 中支持。
   log:
     connecting: 正在连接
@@ -2239,6 +2239,7 @@ fleet:
     addLabel: 添加
     banner: "{count, plural, =0 { 在这里添加命名空间会创建一个 GitRepoRestriction。} other { 只有 Git Repo Restriction 的 <code>allowedTargetNamespaces</code> 在此处管理，你可以对 Git Repo Restriction 进行其他更改。} }"
 footer:
+  cnforums: 中文社区
   docs: Rancher 官方文档
   download: 下载 CLI
   forums: 论坛
@@ -2246,7 +2247,8 @@ footer:
   slack: Slack 讨论群
   wechat:
     title: 微信
-    modalText: 扫码关注 Rancher 中国微信技术群
+    modalText: 扫描二维码添加 Rancher 小助手
+    modalText2: 加入 Rancher 官方微信群
 
 gatekeeperConstraint:
   downloadViolations: 下载违规
@@ -3996,7 +3998,7 @@ inactivity:
 
 # Rancher Extensions
 plugins:
-  incompatibleDisclaimer: "此扩展的最新版本 ({ version }) 与当前的 Rancher 版本 ({ rancherVersion }) 不兼容。"
+  incompatibleRancherVersion: "此扩展的最新版本 ({ version }) 与当前的 Rancher 版本 ({ rancherVersion }) 不兼容。"
   labels:
     builtin: 内置角色
     experimental: 实验功能
@@ -4017,6 +4019,7 @@ plugins:
     host: 此扩展与此应用程序不兼容
     version: 此扩展与此 Rancher 版本不兼容
     load: 加载此扩展的代码时出错
+    developerPkg: 此扩展已在内部加载，因此我们不会加载外部版本
   success:
     title: 已加载扩展 {name}
     message: 扩展加载成功
@@ -4032,7 +4035,7 @@ plugins:
     detail: 详情
     versions: 版本
     versionError: 无法加载版本信息
-    requiresVersion: "需要 Rancher {version}"
+    requiresRancherVersion: "需要 Rancher {version}"
   empty:
     all: 扩展未安装或不可用
     available: 没有可用的扩展
@@ -4446,7 +4449,6 @@ rbac:
   members:
     label: 成员
   roletemplate:
-    label: 角色
     newUserDefault:
       no: 否
       tooltip: 不影响已有角色的绑定。
@@ -5593,8 +5595,8 @@ validation:
       tooLongPrefix: '"{key}" 前缀的长度不能超过 {max} 个字符'
   minLength: '"{key}" 必须多于 {min} 个字符'
   maxLength: '"{key}" 必须少于 {max} 个字符'
-  minValue: '"{key}" 必须多于 {min}'
-  maxValue: '"{key}" 必须小于 {max}'
+  minValue: '"{key}" 必须等于或多于 {min}'
+  maxValue: '"{key}" 必须等于或少于 {max}'
   betweenLengths: '"{key}" 必须包含 {min} 到 {max} 个字符'
   betweenValues: '"{key}" 必须介于 {min} 和 {max} 之间'
   noSchema: 没有找到可以验证的 schema
@@ -7237,6 +7239,7 @@ customLinks:
     valueLabel: URL
     showLabel: 显示
   defaults:
+    cnforums:   中文社区
     docs:       Rancher 官方文档
     forums:     论坛
     slack:      Slack
@@ -7340,6 +7343,7 @@ manager:
     label: 节点模板
 
 auth:
+  roleTemplate: 角色模板
   config:
     label: 认证
 vncConsole:
@@ -7591,6 +7595,82 @@ charts:
       label: 7 层负载均衡主机名
       description: "7 层负载均衡主机名"
 
+gitPicker:
+  github:
+    label: GitHub
+    tableHeaders:
+      choose:
+        label: 选择
+      sha:
+        label: SHA
+      author:
+        label: 作者
+        unknown: 未知
+      message:
+        label: 消息
+      date:
+        label: 日期
+    username:
+      label: 用户名/组织
+      inputLabel: 用户名/组织
+      tooltip: Git 仓库的用户名/组织
+    branch:
+      label: 分支
+      inputLabel: 分支
+      tooltip: 要部署的分支
+    repo:
+      label: 仓库
+      inputLabel: 仓库
+      tooltip: 要部署的仓库
+    commits:
+      label: Commit
+      tooltip: 要部署的 Commit
+    commit:
+      label: Commit
+      inputLabel: Commit
+    commitMessage:
+      label: Commit Message
+    errors:
+      noAccount: 未找到 GitHub 帐户或组织。请检查你的查询并重试。
+      noBranch: 未找到分支。请检查你的查询并重试。
+  gitlab:
+    label: GitLab
+    tableHeaders:
+      choose:
+        label: 选择
+      sha:
+        label: SHA
+      author:
+        label: 作者
+        unknown: 未知
+      message:
+        label: 消息
+      date:
+        label: 日期
+    username:
+      label: 用户名/组织
+      inputLabel: 用户名/组织
+      tooltip: Git 仓库的用户名/组织
+    branch:
+      label: 分支
+      inputLabel: 分支
+      tooltip: 要部署的分支
+    repo:
+      label: 仓库
+      inputLabel: 仓库
+      tooltip: 要部署的仓库
+    commits:
+      label: Commit
+      tooltip: 要部署的 Commit
+    commit:
+      label: Commit
+      inputLabel: Commit
+    commitMessage:
+      label: Commit Message
+    errors:
+      noAccount: 未找到 GitLab 帐户或组织。请检查你的查询并重试。
+      noBranch: 未找到分支。请检查你的查询并重试。
+
 networkAttachmentDefinition:
   tabs:
     config: 配置

package/chart/__tests__/S3.test.ts

@@ -0,0 +1,50 @@
+/* eslint-disable jest/no-hooks */
+import { mount, createLocalVue } from '@vue/test-utils';
+
+import S3 from '@shell/chart/rancher-backup/S3';
+import Vuex from 'vuex';
+
+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 } });
+
+  it('should emit invalid when form is not filled', () => {
+    expect(wrapper.emitted('valid')).toHaveLength(1);
+    expect(wrapper.emitted('valid')![0][0]).toBeFalsy();
+  });
+
+  it('should emit valid when required fields are filled', async() => {
+    const bucketName = wrapper.find('[data-testid="S3-bucketName"]').find('input');
+    const endpoint = wrapper.find('[data-testid="S3-endpoint"]').find('input');
+    const testCases = [
+      {
+        bucketNameInput: 'val',
+        endpointInput:   '',
+        result:          false
+      },
+      {
+        bucketNameInput: '',
+        endpointInput:   'val',
+        result:          false
+      }
+    ];
+
+    for (const testCase of testCases) {
+      bucketName.setValue(testCase.bucketNameInput);
+      endpoint.setValue(testCase.endpointInput);
+      await wrapper.vm.$nextTick();
+      expect(wrapper.emitted('valid')).toHaveLength(1);
+      expect(wrapper.emitted('valid')![0][0]).toBe(false);
+    }
+
+    bucketName.setValue('val1');
+    endpoint.setValue('val2');
+    await wrapper.vm.$nextTick();
+    expect(wrapper.emitted('valid')).toHaveLength(2);
+    expect(wrapper.emitted('valid')![1][0]).toBe(true);
+  });
+});

package/chart/rancher-backup/S3.vue

@@ -4,6 +4,7 @@ import { Checkbox } from '@components/Form/Checkbox';
 import FileSelector from '@shell/components/form/FileSelector';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { mapGetters } from 'vuex';
+
 export default {
   components: {
     LabeledInput,
@@ -30,6 +31,19 @@ export default {
     }
   },
 
+  mounted() {
+    this.$emit('valid', this.valid);
+  },
+
+  beforeDestroy() {
+    this.$emit('valid', true);
+  },
+
+  watch: {
+    valid() {
+      this.$emit('valid', this.valid);
+    }
+  },
   computed: {
     credentialSecret: {
       get() {
@@ -45,6 +59,9 @@ export default {
         this.$set(this.value, 'credentialSecretNamespace', namespace);
       }
     },
+    valid() {
+      return !!this.value.endpoint && !!this.value.bucketName;
+    },
     ...mapGetters({ t: 'i18n/t' })
   },
 
@@ -87,8 +104,10 @@ export default {
       <div class="col span-6">
         <LabeledInput
           v-model="value.bucketName"
+          data-testid="S3-bucketName"
           :mode="mode"
           :label="t('backupRestoreOperator.s3.bucketName')"
+          required
         />
       </div>
     </div>
@@ -114,6 +133,8 @@ export default {
           v-model="value.endpoint"
           :mode="mode"
           :label="t('backupRestoreOperator.s3.endpoint')"
+          data-testid="S3-endpoint"
+          required
         />
         <Checkbox
           v-model="value.insecureTLSSkipVerify"

package/chart/rancher-backup/index.vue

@@ -154,6 +154,9 @@ export default {
       }
 
       return 'none';
+    },
+    updatePageValid(update) {
+      this.$emit('valid', update);
     }
   },
   get
@@ -189,6 +192,7 @@ export default {
         :value="value.s3"
         :secrets="secrets"
         :mode="mode"
+        @valid="updatePageValid($event)"
       />
       <template v-else>
         <div class="row">

package/components/CommunityLinks.vue

@@ -138,6 +138,7 @@ export default {
     >
       <div class="wechat-modal">
         <h1>{{ t('footer.wechat.modalText') }}</h1>
+        <h1>{{ t('footer.wechat.modalText2') }}</h1>
         <div class="qr-img" />
         <div>
           <button