@rancher/shell 0.2.5 → 0.3.1

package/content/docs/zh-hans/whats-new.md

@@ -1,56 +1,18 @@
 ---
-title: 2.6版的新内容
+title: 2.7 的新功能
 ---
-## 重新设计的Rancher用户体验
 
-重现设计用户界面的外观和感觉，使初学者和高级Kubernetes用户易于使用。
+## 2.7.0 的新功能
 
-- 集群资源管理器的导航已经更新，用户现在可以看到用简单术语表达的最常用的Kubernetes资源的折叠子集。任何Kubernetes资源都可以通过Explorer进行管理，并通过资源搜索功能快速找到。用户现在可以管理他们的项目。像监控和日志这样的集群工具被聚集在一个容易发现的**集群工具**菜单下。启用监控时，集群仪表板现在包括实时指标。
-- 全局导航经过重新设计，使用户和管理员更容易在集群和顶级应用之间快速切换。
-- 集群管理列出了用户的所有集群，并增强了它自己的左侧导航菜单，将所有集群生命周期工具集中到一个地方。
+### K3s 配置已 GA（仅限 x86）
 
-## 增强品牌和定制选项
+- 在 x86 集群上配置 K3s 集群已正式 GA！该 Kubernetes 发行版完全兼容、已经过简化、使用安全而且小于 60 MB，非常适合 Edge。
 
-- 管理员现在可以通过一个品牌管理页面管理Rancher中的标识和颜色。
-- 用户可以在集群资源管理器导航中添加自己的应用程序的链接。
+### Rancher 扩展
 
-## 增强的AKS生命周期管理
+- Rancher Extensions 可用于扩展 Rancher Manager UI 的功能。Rancher 将使用它来提供新的功能。扩展以 Helm Chart 的形式提供。新的顶层“扩展”UI 允许管理员启用扩展支持并自行安装和管理扩展。
 
-- 对AKS集群的配置进行了更新，以支持私有AKS端点、多节点池、自动缩放和利用Rancher云凭证进行认证。
-- 现有的AKS集群可以被注册，从而能够管理Kubernetes版本和配置设置。
+### OCI 对 Helm Fleet 的支持
 
-## 增强的GKE生命周期管理
+- 现在支持对基于 OCI 的镜像仓库进行身份验证。请注意，fleet.yaml 的结构是相同的，并且凭证作为 Kubernetes Secret 提供（Repo Structure 文档的 Private Helm Repo 框中已进行了描述）。
 
-- 对GKE集群的配置进行了更新，以支持共享VPC、多节点池、自动缩放和网络标签。
-- 现有的GKE集群可以被注册，从而能够管理Kubernetes版本和配置设置。
-- Rancher的项目网络隔离可以为通过Rancher配置或注册的GKE集群启用。
-
-## 技术预览 - RKE2集群配置
-
-- 为了支持RKE2集群的配置，我们引入了一个建立在集群API之上的新的配置框架。
-- RKE2集群可以通过Rancher在不同的云基础设施供应商（如AWS、Azure、vSphere、Linode和DigitalOcean）配置虚拟机。
-- RKE2集群也可以在现有的虚拟或裸机服务器上进行配置。
-
-## 技术预览 - RKE2支持Windows工作节点
-
-- Windows工作节点可以被添加到任何使用默认Calico CNI的RKE2自定义集群中。
-
-## 技术预览 - 集群模板
-
-- 集群模板提供了控制哪些参数可以被定制的能力，以配置集群。
-
-集群可以定义的例子有。
-
-- etcd、control和worker的节点池。
-- 用于配置节点的云凭证。
-
-## 使用OIDC的Keycloak
-
-- Keycloak现在可以使用OIDC进行认证。
-
-## 安全性增强
-
-- 管理员现在可以通过Rancher和Kubernetes审计日志中的用户名和身份提供者（IdP）来追踪用户。
-- 管理员可以启用Rancher API令牌的单向哈希。
-
-阅读完整的[发布说明](https://github.com/rancher/rancher/releases/tag/v2.6.0)以了解更多细节。

package/creators/app/app.package.json

@@ -5,5 +5,8 @@
   "engines": {
     "node": ">=12"
   },
-  "dependencies": {}
+  "dependencies": {},
+  "resolutions": {
+    "**/webpack": "4"
+  }  
 }

package/creators/app/{tsconfig.json → files/tsconfig.json}

@@ -33,7 +33,8 @@
       "@types/node",
       "@nuxt/types",
       "cypress",
-      "rancher"
+      "rancher",
+      "shell"
     ]
   },
   "exclude": [

package/creators/app/init

@@ -1,13 +1,12 @@
 #!/usr/bin/env node
 
-const fs = require('fs-extra');
 const path = require('path');
-const exec = require('child_process').exec;
+const fs = require('fs-extra');
 
 const targets = {
-  'dev': './node_modules/.bin/nuxt dev',
-  'nuxt': './node_modules/.bin/nuxt',
-  'build': './node_modules/.bin/nuxt build'
+  dev:   './node_modules/.bin/nuxt dev',
+  nuxt:  './node_modules/.bin/nuxt',
+  build: './node_modules/.bin/nuxt build'
 };
 
 const files = [
@@ -30,8 +29,8 @@ if (args.length == 3) {
   const folder = path.resolve('.');
 
   appFolder = path.join(folder, name);
-  console.log(`  Creating application folder: ${ appFolder}`);
-  fs.ensureDirSync(appFolder);  
+  console.log(`  Creating application folder: ${ appFolder }`);
+  fs.ensureDirSync(appFolder);
 }
 
 // Check that there is a package file
@@ -71,18 +70,23 @@ const creatorPkgData = fs.readFileSync(path.join(__dirname, 'package.json'));
 const creatorPkg = JSON.parse(creatorPkgData);
 
 pkg.dependencies['@rancher/shell'] = `^${ creatorPkg.version }`;
-pkg.dependencies['core-js'] = '^3.20.3';
-pkg.dependencies['css-loader'] = '4.3.0';
+
+// Rest of dependencies are in the _pkgs property of package.json - copy then across
+if (creatorPkg._pkgs) {
+  Object.keys(creatorPkg._pkgs).forEach((pkgName) => {
+    pkg.dependencies[pkgName] = creatorPkg._pkgs[pkgName];
+  });
+}
 
 fs.writeFileSync(path.join(appFolder, 'package.json'), JSON.stringify(pkg, null, 2));
 
 // Copy base files
 files.forEach((file) => {
-  const src = path.join(__dirname, file);
+  const src = path.join(__dirname, 'files', file);
   const dest = path.join(appFolder, file);
 
   if (!fs.existsSync(dest)) {
-    console.log('  Adding file: ' + file);
+    console.log(`  Adding file: ${ file }`);
 
     const folder = path.dirname(file);
 
@@ -93,9 +97,4 @@ files.forEach((file) => {
   }
 });
 
-// require("child_process").spawn('yarn', ['install'], {
-//   cwd: process.cwd(),
-//   stdio: "inherit"
-// });
-
-console.log('');
+console.log('');

package/creators/app/package.json

@@ -7,12 +7,18 @@
   "private": false,
   "bin": "./init",
   "files": [
-    "*.*",
+    "**/*.*",
     "init"
   ],
   "engines": {
     "node": ">=12"
   },
+  "_requires": [
+    "core-js",
+    "css-loader",
+    "@types/lodash",
+    "@rancher/components"
+  ],
   "dependencies": {
     "fs-extra": "^10.0.0"
   }

package/creators/pkg/{tsconfig.json → files/tsconfig.json}

@@ -16,12 +16,16 @@
     "typeRoots": [
       "../../node_modules",
       "../../node_modules/@rancher/shell/types"
-    ],
+    ],    
     "types": [
       "node",
       "webpack-env",
+      "@types/node",
+      "@types/jest",
+      "@types/lodash",
       "@nuxt/types",
-      "rancher"
+      "rancher",
+      "shell"
     ],
     "lib": [
       "esnext",
@@ -30,24 +34,21 @@
       "scripthost"
     ],
     "paths": {
-      "@shell/core/*": [
-        "../../node_modules/@rancher/shell/core/*"
-      ],
-      "@shell/config/*": [
-        "../../node_modules/@rancher/shell/config/*"
+      "@shell/*": [
+        "../../node_modules/@rancher/shell/*"
       ],
-      "@shell/store/*": [
-        "../../node_modules/@rancher/shell/store/*"
+      "@components/*": [
+        "@rancher/components/*"
       ]
     }
   },
   "include": [
     "**/*.ts",
+    "**/*.d.ts",
     "**/*.tsx",
-    "**/*.vue",
-    "../../node_modules/@rancher/shell/core/types.ts"
+    "**/*.vue"
   ],
   "exclude": [
-    "node_modules"
+    "../../node_modules"
   ]
 }

package/creators/pkg/init

@@ -95,7 +95,7 @@ if (addTypeFolders) {
 
 // Copy base files
 files.forEach((file) => {
-  const src = path.join(__dirname, file);
+  const src = path.join(__dirname, 'files', file);
   const dest = path.join(path.join(pkgFolder, file));
 
   if (!fs.existsSync(dest)) {

package/creators/pkg/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@rancher/create-pkg",
   "description": "Rancher UI Package generator",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "license": "Apache-2.0",
   "author": "SUSE",
   "private": false,
   "bin": "./init",
   "files": [
-    "*.*",
+    "**/*.*",
     "init"
   ],
   "engines": {

package/creators/update/init

@@ -0,0 +1,56 @@
+#!/usr/bin/env node
+
+const path = require('path');
+const fs = require('fs-extra');
+const { spawnSync } = require('child_process');
+
+const scriptFolder = __dirname;
+const dest = path.resolve('.');
+
+// Remove first two args
+let args = process.argv;
+args.splice(0, 2);
+
+const res = spawnSync(`${__dirname}/upgrade`, args, {
+  cwd: dest,
+  shell: false,
+  stdio: [ 'ignore', process.stdout, process.stderr ],
+});
+
+if (res.status !== 0) {
+  process.exit(res.status);
+}
+
+// Read the existing package.json
+let rawdata = fs.readFileSync(path.join(dest, 'package.json'));
+const appPackage = JSON.parse(rawdata);
+
+// Read the package.json from the app creator
+rawdata = fs.readFileSync(path.join(scriptFolder, 'app', 'package.json'));
+const latestPackage = JSON.parse(rawdata);
+
+// Read the package.json from the upgrade creator
+rawdata = fs.readFileSync(path.join(scriptFolder, 'package.json'));
+const upgradePackage = JSON.parse(rawdata);
+
+// Update dependency versions to match the latest from the creator
+Object.keys(latestPackage._pkgs).forEach((key) => {
+  appPackage.dependencies[key] = latestPackage._pkgs[key];
+});
+
+// Add in the weback resolution
+appPackage.resolutions = appPackage.resolutions || {};
+appPackage.resolutions['**/webpack'] = '4';
+
+// Update the version of @rancher/shell
+const shellVersion = upgradePackage.version;
+
+appPackage.dependencies['@rancher/shell'] = shellVersion;
+
+fs.writeFileSync(path.join(dest, 'package.json'), JSON.stringify(appPackage, null, 2) + '\n');
+
+spawnSync(`yarn`, ['install'], {
+  cwd: dest,
+  shell: false,
+  stdio: [ 'ignore', process.stdout, process.stderr ],
+});

package/creators/update/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "@rancher/create-update",
+  "description": "Rancher UI Update helper",
+  "version": "0.0.0",
+  "license": "Apache-2.0",
+  "author": "SUSE",
+  "private": false,
+  "bin": "./init",
+  "files": [
+    "**/*.*",
+    "init",
+    "upgrade"
+  ],
+  "engines": {
+    "node": ">=12"
+  },
+  "dependencies": {
+    "fs-extra": "^10.0.0"
+  }
+}

package/creators/update/upgrade

@@ -0,0 +1,56 @@
+#!/usr/bin/env sh
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+echo "Upgrading Rancher Shell"
+
+# Get the version number from the package.json file
+VERSION=$(node -p -e "require('${SCRIPT_DIR}/package.json').version")
+
+echo "Updating to version: ${VERSION}"
+echo ""
+
+FORCE="false"
+
+if [ "$1" == "-f" ]; then
+  FORCE="true"
+fi
+
+# Check for a clean git repository
+if [ ! -d ".git" ] && [ "${FORCE}" == "false" ]; then
+  echo "Not runnning in a git repository. Re-run with -f to ignore this check"
+  echo "Note: This action will update yuor files - running in a git repsository will ensure you have visibility over changes made"
+  exit 1 
+fi
+
+if [[ $(git diff --stat) != '' ]] && [ "${FORCE}" == "false" ]; then
+  echo "Git repository is not clean. Re-run with -f to ignore this check"
+  echo "Note: This action will update yuor files - running in a clean git repsository will ensure you have visibility over changes made"
+  exit 1 
+fi
+
+# Check this is a Rancher Extension
+if [ ! -f "./package.json" ]; then
+  echo "Can't find package.json - check you're running from the correct folder"
+  exit 1 
+fi
+
+HAS_SHELL=$(grep "\"@rancher/shell\"" package.json -c )
+if [ "${HAS_SHELL}" != "1" ]; then
+  echo "package.json does not reference @rancher/shell - check you're running from the correct folder"
+  exit 1 
+fi
+
+# Copy files for the top-level folder (from the app creator)
+rsync --exclude nuxt.config.js ${SCRIPT_DIR}/app/files/* .
+
+# Go through each folder in the pkg folder and update their files
+for pkg in ./pkg/*
+do
+  if [ -d "${pkg}" ]; then
+    pkgName=$(basename $pkg)
+    echo "Updating package ${pkgName}"
+
+    cp ${SCRIPT_DIR}/pkg/files/* ${pkg}
+  fi
+done

package/detail/catalog.cattle.io.app.vue

@@ -30,7 +30,7 @@ export default {
   },
 
   async fetch() {
-    await this.$store.dispatch('catalog/load');
+    await this.$store.dispatch('catalog/load', { force: true, reset: true });
 
     this.allOperations = await this.$store.dispatch('cluster/findAll', { type: CATALOG.OPERATION });
   },

package/detail/cis.cattle.io.clusterscan.vue

@@ -165,14 +165,14 @@ export default {
           sort:          'testStateSort'
         },
         {
-          name:      'node',
-          label:     this.t('tableHeaders.name'),
-          value:     'name',
+          name:  'node',
+          label: this.t('tableHeaders.name'),
+          value: 'name',
         },
         {
-          name:      'type',
-          label:     this.t('tableHeaders.type'),
-          value:     'type',
+          name:  'type',
+          label: this.t('tableHeaders.type'),
+          value: 'type',
         },
       ];
     },

package/detail/configmap.vue

@@ -20,7 +20,7 @@ export default {
     }
   },
 
-  computed:   {
+  computed: {
     parsedRows() {
       const rows = [];
       const { data = {}, binaryData = {} } = this.value;

package/detail/constraints.gatekeeper.sh.constraint.vue

@@ -13,7 +13,7 @@ export default {
         CONSTRAINT_VIOLATION_RESOURCE_LINK,
         CONSTRAINT_VIOLATION_MESSAGE
       ],
-      violations:  this.value.violations
+      violations: this.value.violations
         .map((violation, i) => ({ ...violation, id: i }))
     };
   }

package/detail/fleet.cattle.io.bundle.vue

@@ -10,7 +10,7 @@ export default {
     FleetBundleResources,
     SortableTable,
   },
-  props:      {
+  props: {
     value: {
       type:     Object,
       required: true,
@@ -55,10 +55,10 @@ export default {
     resourceHeaders() {
       return [
         {
-          name:      'name',
-          value:     'name',
-          sort:      ['name'],
-          labelKey:  'tableHeaders.name',
+          name:     'name',
+          value:    'name',
+          sort:     ['name'],
+          labelKey: 'tableHeaders.name',
         },
       ];
     },

package/detail/fleet.cattle.io.gitrepo.vue

@@ -31,8 +31,8 @@ export default {
 
   data() {
     return {
-      allFleet:      [],
-      allBundles:    []
+      allFleet:   [],
+      allBundles: []
     };
   },
 
@@ -77,9 +77,9 @@ export default {
     const { $store } = this;
 
     const allDispatches = await allHash({
-      allBundles:     $store.dispatch('management/findAll', { type: FLEET.BUNDLE }),
-      allFleet:       $store.dispatch('management/findAll', { type: FLEET.CLUSTER }),
-      clusterGroups:  $store.dispatch('management/findAll', { type: FLEET.CLUSTER_GROUP }),
+      allBundles:    $store.dispatch('management/findAll', { type: FLEET.BUNDLE }),
+      allFleet:      $store.dispatch('management/findAll', { type: FLEET.CLUSTER }),
+      clusterGroups: $store.dispatch('management/findAll', { type: FLEET.CLUSTER_GROUP }),
     });
 
     this.allBundles = allDispatches.allBundles;

package/detail/helm.cattle.io.projecthelmchart.vue

@@ -39,7 +39,7 @@ export default {
       return {
         alertmanagerURL: this.makeRelativeURL(alertmanagerURL),
         grafanaURL:      this.makeRelativeURL(grafanaURL),
-        prometheusURL:      this.makeRelativeURL(prometheusURL)
+        prometheusURL:   this.makeRelativeURL(prometheusURL)
       };
     },
     monitoringNamespace() {

package/detail/management.cattle.io.user.vue

@@ -14,7 +14,7 @@ export default {
     SortableTable,
     Loading
   },
-  mixins:     [
+  mixins: [
     CreateEditView
   ],
   async fetch() {
@@ -69,8 +69,8 @@ export default {
           NAME,
           {
             ...since,
-            value:     'bound',
-            sort:      'bound',
+            value: 'bound',
+            sort:  'bound',
           }
         ],
         cr: [

package/detail/namespace.vue

@@ -67,9 +67,9 @@ export default {
         formatter: 'Number'
       },
       {
-        name:      'active',
-        label:     this.t('namespace.resourceStates.success'),
-        sort:      'byState.success:desc',
+        name:  'active',
+        label: this.t('namespace.resourceStates.success'),
+        sort:  'byState.success:desc',
         value: 'byState.success',
       },
       {
@@ -80,22 +80,22 @@ export default {
         formatter: 'Number'
       },
       {
-        name:      'total',
-        label:     this.t('namespace.total'),
-        sort:      'totalCount:desc',
-        value:     'totalCount',
+        name:  'total',
+        label: this.t('namespace.total'),
+        sort:  'totalCount:desc',
+        value: 'totalCount',
       },
     ];
 
     return {
       allWorkloads: {
         default: () => ([]),
-        type:     Array,
+        type:    Array,
       },
-      resourceTypes:    [],
-      summaryStates:    ['success', 'info', 'warning', 'error', 'unknown'],
+      resourceTypes:  [],
+      summaryStates:  ['success', 'info', 'warning', 'error', 'unknown'],
       headers,
-      workloadSchema:        WORKLOAD_SCHEMA
+      workloadSchema: WORKLOAD_SCHEMA
     };
   },
 
@@ -121,8 +121,8 @@ export default {
 
         namespaced.push({
           type,
-          byState:     this.reduceStates(inNamespace.states || {}, inNamespace.count),
-          totalCount:    inNamespace.count,
+          byState:    this.reduceStates(inNamespace.states || {}, inNamespace.count),
+          totalCount: inNamespace.count,
           schema:     this.schemaFor(type)
         });
 

package/detail/node.vue

@@ -167,8 +167,8 @@ export default {
   methods: {
     memoryFormatter(value) {
       const formatOptions = {
-        addSuffix:  false,
-        increment:  1024,
+        addSuffix: false,
+        increment: 1024,
       };
 
       return formatSi(value, formatOptions);

package/detail/pod.vue

@@ -54,7 +54,7 @@ export default {
     };
   },
 
-  computed:   {
+  computed: {
     ...mapGetters(['currentCluster']),
     containers() {
       const containers = this.allContainers;
@@ -98,7 +98,7 @@ export default {
           stateDisplay:     status ? this.value.containerStateDisplay(status) : undefined,
           stateBackground:  status ? this.value.containerStateColor(status).replace('text', 'bg') : undefined,
           nameSort:         sortableNumericSuffix(container.name).toLowerCase(),
-          readyIcon:        status?.ready ? 'icon-checkmark icon-2x text-success ml-5' : 'icon-x icon-2x text-error ml-5',
+          readyIcon:        status?.ready ? 'icon-checkmark text-success ml-5' : 'icon-x text-error ml-5',
           availableActions: this.value.containerActions,
           stateObj:         status, // Required if there's a description
           stateDescription: descriptions.join(' | '), // Required to display the description