@rancher/shell 0.3.4 → 0.3.6

package/config/table-headers.js

@@ -481,6 +481,14 @@ export const REASON = {
   value:    'reason',
   sort:     ['reason']
 };
+export const OBJECT = {
+  name:          'object',
+  labelKey:      'tableHeaders.object',
+  value:         'involvedObject',
+  sort:          ['involvedObject.kind', 'involvedObject.name'],
+  canBeVariable: true,
+  formatter:     'InvolvedObjectLink',
+};
 export const RECLAIM_POLICY = {
   name:     'reclaimPolicy',
   labelKey: 'tableHeaders.reclaimPolicy',
@@ -710,7 +718,7 @@ export const APP_SUMMARY = {
 
 export const CONSTRAINT_VIOLATION_CONSTRAINT_LINK = {
   name:          'Constraint',
-  label:         'Constraint',
+  labelKey:      'tableHeaders.constraint',
   value:         'constraintLink',
   sort:          `constraintLink.text`,
   formatter:     'Link',
@@ -719,30 +727,39 @@ export const CONSTRAINT_VIOLATION_CONSTRAINT_LINK = {
 
 export const CONSTRAINT_VIOLATION_RESOURCE_LINK = {
   name:          'Name',
-  label:         'Name',
+  labelKey:      'tableHeaders.name',
   value:         'resourceLink',
   sort:          `resourceLink.text`,
+  search:        `resourceLink.text`,
   formatter:     'Link',
   formatterOpts: { options: { internal: true } },
 };
 
 export const CONSTRAINT_VIOLATION_TYPE = {
-  name:  'Type',
-  label: 'Type',
-  value: `constraint.kind`,
-  sort:  `constraint.kind`
+  name:     'Type',
+  labelKey: 'tableHeaders.type',
+  value:    `kind`,
+  sort:     `kind`
+};
+
+export const CONSTRAINT_VIOLATION_NAMESPACE = {
+  name:     'Namespace',
+  labelKey: 'tableHeaders.namespace',
+  value:    `namespace`,
+  sort:     `namespace`,
+  search:   `namespace`,
 };
 
 export const CONSTRAINT_VIOLATION_MESSAGE = {
-  name:  'Message',
-  label: 'Message',
-  value: `message`,
-  sort:  `message`
+  name:     'Message',
+  labelKey: 'tableHeaders.message',
+  value:    `message`,
+  sort:     `message`
 };
 
 export const CONSTRAINT_VIOLATION_TEMPLATE_LINK = {
   name:          'TemplateLink',
-  label:         'Template',
+  labelKey:      'tableHeaders.template',
   value:         `templateLink`,
   sort:          `templateLink.text`,
   formatter:     'Link',
@@ -751,7 +768,7 @@ export const CONSTRAINT_VIOLATION_TEMPLATE_LINK = {
 
 export const CONSTRAINT_VIOLATION_COUNT = {
   name:          'Count',
-  label:         'Count',
+  labelKey:      'tableHeaders.count',
   value:         `count`,
   sort:          `count`,
   formatter:     'QualityText',
@@ -952,3 +969,28 @@ export const FLEET_BUNDLE_TYPE = {
   sort:     ['bundleType'],
   width:    100,
 };
+
+// export const RBAC_ROLE = {
+//   name:  'role',
+//   value: 'roleRef.name',
+//   sort:  ['roleRef.name'],
+// };
+
+export const RBAC_USERS = {
+  name:     'users',
+  sort:     ['users'],
+  getValue: row => row.users?.map(({ name }) => name),
+};
+
+export const RBAC_GROUPS = {
+  name: 'groups',
+  sort: ['groups'],
+
+  getValue: row => row.groups?.map(({ name }) => name),
+};
+
+export const RBAC_SERVICE_ACCOUNTS = {
+  name:     'serviceAccount',
+  sort:     ['serviceAccount'],
+  getValue: row => row.serviceAccounts?.map(({ name }) => name),
+};

package/config/types.js

@@ -54,6 +54,7 @@ export const NETWORK_POLICY = 'networking.k8s.io.networkpolicy';
 export const POD = 'pod';
 export const POD_DISRUPTION_BUDGET = 'policy.poddisruptionbudget';
 export const PSP = 'policy.podsecuritypolicy';
+export const PSPS = 'policy.podsecuritypolicies';
 export const PV = 'persistentvolume';
 export const PVC = 'persistentvolumeclaim';
 export const RESOURCE_QUOTA = 'resourcequota';
@@ -65,6 +66,8 @@ export const STORAGE_CLASS = 'storage.k8s.io.storageclass';
 export const CSI_DRIVER = 'storage.k8s.io.csidriver';
 export const OBJECT_META = 'io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta';
 export const NETWORK_ATTACHMENT = 'k8s.cni.cncf.io.networkattachmentdefinition';
+export const USER = 'user';
+export const GROUP = 'group';
 
 export const RBAC = {
   ROLE:                 'rbac.authorization.k8s.io.role',
@@ -92,6 +95,11 @@ const {
 
 export const SCALABLE_WORKLOAD_TYPES = scalableWorkloads;
 
+export const LIST_WORKLOAD_TYPES = {
+  ...WORKLOAD_TYPES,
+  POD
+};
+
 export const METRIC = {
   NODE: 'metrics.k8s.io.nodemetrics',
   POD:  'metrics.k8s.io.podmetrics',
@@ -197,14 +205,16 @@ export const CAPI = {
 // Base: /k8s/clusters/<id>/v1/
 
 export const FLEET = {
-  BUNDLE:            'fleet.cattle.io.bundle',
-  BUNDLE_DEPLOYMENT: 'fleet.cattle.io.bundledeployment',
-  CLUSTER:           'fleet.cattle.io.cluster',
-  CLUSTER_GROUP:     'fleet.cattle.io.clustergroup',
-  DASHBOARD:         'fleet.cattle.io.dashboard',
-  GIT_REPO:          'fleet.cattle.io.gitrepo',
-  WORKSPACE:         'management.cattle.io.fleetworkspace',
-  TOKEN:             'fleet.cattle.io.clusterregistrationtoken',
+  BUNDLE:                   'fleet.cattle.io.bundle',
+  BUNDLE_DEPLOYMENT:        'fleet.cattle.io.bundledeployment',
+  CLUSTER:                  'fleet.cattle.io.cluster',
+  CLUSTER_GROUP:            'fleet.cattle.io.clustergroup',
+  DASHBOARD:                'fleet.cattle.io.dashboard',
+  GIT_REPO:                 'fleet.cattle.io.gitrepo',
+  WORKSPACE:                'management.cattle.io.fleetworkspace',
+  TOKEN:                    'fleet.cattle.io.clusterregistrationtoken',
+  BUNDLE_NAMESPACE_MAPPING: 'fleet.cattle.io.bundlenamespacemapping',
+  GIT_REPO_RESTRICTION:     'fleet.cattle.io.gitreporestriction'
 };
 
 export const GATEKEEPER = {

package/config/uiplugins.js

@@ -33,6 +33,7 @@ export const UI_PLUGINS_REPO_BRANCH = 'main';
 export const UI_PLUGIN_CHART_ANNOTATIONS = {
   RANCHER_VERSION:    'catalog.cattle.io/rancher-version',
   EXTENSIONS_VERSION: 'catalog.cattle.io/ui-extensions-version',
+  UI_VERSION:         'catalog.cattle.io/ui-version',
   EXTENSIONS_HOST:    'catalog.cattle.io/ui-extensions-host',
   DISPLAY_NAME:       'catalog.cattle.io/display-name',
 };
@@ -128,3 +129,32 @@ export function isSupportedChartVersion(chartVersion, rancherVersion) {
 
   return true;
 }
+
+export function isChartVersionAvailableForInstall(version, rancherVersion, returnObj = false) {
+  const parsedRancherVersion = rancherVersion.split('-')?.[0];
+  const regexHashString = new RegExp('^[A-Za-z0-9]{9}$');
+  const isRancherVersionHashString = regexHashString.test(rancherVersion);
+  const requiredUiVersion = version.annotations?.[UI_PLUGIN_CHART_ANNOTATIONS.UI_VERSION];
+  const versionObj = { ...version };
+
+  versionObj.isCompatibleWithUi = true;
+
+  // if it's a head version of Rancher, then we skip the validation and enable them all
+  if (!isRancherVersionHashString && requiredUiVersion && !semver.satisfies(parsedRancherVersion, requiredUiVersion)) {
+    if (!returnObj) {
+      return false;
+    }
+    versionObj.isCompatibleWithUi = false;
+    versionObj.requiredUiVersion = requiredUiVersion;
+  }
+
+  if (returnObj) {
+    return versionObj;
+  }
+
+  return true;
+}
+
+export function isChartVersionHigher(versionA, versionB) {
+  return semver.gt(versionA, versionB);
+}

package/content/docs/en-us/whats-new.md

@@ -2,6 +2,16 @@
 title: What's New in 2.7
 ---
 
+## New in 2.7.2
+
+### Kubernetes 1.25 and PSAs
+
+- Kubernetes 1.25 GA takes PSAs (Pod Security Admissions) out of beta. PSAs replace the former PSP (Pod Security Policy) setup, which is a major change that impacts upgrades of Kubernetes. 
+
+## New in 2.7.1
+
+- This was a security release to address a few CVEs and other bugs. Please see https://github.com/rancher/rancher/releases/tag/v2.7.1 for the full list of what was addressed. 
+
 ## New in 2.7.0
 
 ### k3s provisioning is GA (x86 Only)

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

@@ -2,6 +2,16 @@
 title: 2.7 的新功能
 ---
 
+## 2.7.2 的新功能
+
+### Kubernetes 1.25 和 PSA
+
+- Kubernetes 1.25 GA 让 PSA（Pod Security Admissions）不再只是测试功能。PSA 取代了以前的 PSP（Pod 安全策略），这是 Kubernetes 升级的重大变化。
+
+## 2.7.2 的新功能
+
+- 这是一个安全版本，旨在修复 CVE 和其他错误。如需查看所有已解决的问题，请前往 https://github.com/rancher/rancher/releases/tag/v2.7.1。
+
 ## 2.7.0 的新功能
 
 ### K3s 配置已 GA（仅限 x86）
@@ -14,5 +24,5 @@ title: 2.7 的新功能
 
 ### OCI 对 Helm Fleet 的支持
 
-- 现在支持对基于 OCI 的镜像仓库进行身份验证。请注意，fleet.yaml 的结构是相同的，并且凭证作为 Kubernetes Secret 提供（Repo Structure 文档的 Private Helm Repo 框中已进行了描述）。
+- 现在支持对基于 OCI 的镜像仓库进行认证。请注意，fleet.yaml 的结构是相同的，并且凭证作为 Kubernetes Secret 提供（Repo Structure 文档的 Private Helm Repo 框中已进行了描述）。
 

package/core/plugin-routes.ts

@@ -89,6 +89,29 @@ export class PluginRoutes {
     // Despite what the docs say, routes are not replaced, so we use a workaround
     // Remove all routes that are being replaced
     routes.forEach((r: RouteInfo) => {
+      // Patch colliding legacy routes that start /:product
+      if (r.route.path?.startsWith('/:product')) {
+        // Legacy pattern used by extensions - routes may collide, so modify them not to
+        let productName;
+
+        // If the route has a name (which is always the case for the extensions we have written), use it to get the product name
+        if (r.route.name) {
+          const nameParts = r.route.name.split('-');
+
+          // First part of the route name is the product name
+          productName = nameParts[0];
+        }
+
+        // Use the plugin name as the product, if the route does not have a name
+        productName = productName || plugin.name;
+
+        // Replace the path - removing :product and using the actual product name instead - this avoids route collisions
+        r.route.path = `/${ productName }${ r.route.path.substr(9) }`;
+        r.route.meta = r.route.meta || {};
+
+        r.route.meta.product = r.route.meta.product || productName;
+      }
+
       // See if the route exists
       let existing: any;
 

package/core/plugin.ts

@@ -16,13 +16,15 @@ import {
   PluginRouteConfig, RegisterStore, UnregisterStore, CoreStoreSpecifics, CoreStoreConfig, OnNavToPackage, OnNavAwayFromPackage, OnLogOut
 } from '@shell/core/types';
 
+export type ProductFunction = (plugin: IPlugin, store: any) => void;
+
 export class Plugin implements IPlugin {
   public id: string;
   public name: string;
   public types: any = {};
   public l10n: { [key: string]: Function[] } = {};
   public locales: { locale: string, label: string}[] = [];
-  public products: Function[] = [];
+  public products: ProductFunction[] = [];
   public productNames: string[] = [];
   public routes: { parent?: string, route: RouteConfig }[] = [];
   public stores: { storeName: string, register: RegisterStore, unregister: UnregisterStore }[] = [];
@@ -83,7 +85,7 @@ export class Plugin implements IPlugin {
     return storeDSL;
   }
 
-  addProduct(product: Function): void {
+  addProduct(product: ProductFunction): void {
     this.products.push(product);
   }
 

package/core/types.ts

@@ -1,3 +1,4 @@
+import { ProductFunction } from './plugin';
 import { RouteConfig } from 'vue-router';
 
 // package.json metadata
@@ -136,6 +137,255 @@ export type LocationConfig = {
   mode?: string[]
 };
 
+export interface ProductOptions {
+  /**
+   * The category this product belongs under. i.e. 'config'
+   */
+  category?: string;
+
+  /**
+   * Hide the Copy KubeConfig button in the header
+   */
+  hideCopyConfig?: boolean;
+
+  /**
+   * Hide the Download KubeConfig button in the header
+   */
+  hideKubeConfig?: boolean;
+
+  /**
+   * Hide the Kubectl Shell button in the header
+   */
+  hideKubeShell?: boolean;
+
+  /**
+   * Hide the Namespace location
+   */
+  hideNamespaceLocation?: boolean;
+
+  /**
+   * Hide the system resources
+   */
+
+  hideSystemResources?: boolean;
+  /**
+   * The icon that should be displayed beside this item in the navigation.
+   */
+  icon?: string,
+
+  /**
+   * Only load the product if the feature is present
+   */
+  ifFeature?: string | RegExp;
+
+  /**
+   * Only load the product if the type is present
+   */
+  ifHave?: string;
+
+  /**
+   * Only load the product if the group is present
+   */
+  ifHaveGroup?: string | RegExp;
+
+  /**
+   * Only load the product if the type is present
+   */
+  ifHaveType?: string | RegExp;
+
+  /**
+   * The vuex store that this product should use by default i.e. 'management'
+   */
+  inStore?: string;
+
+  /**
+   * Show the cluster switcher in the navigation
+   */
+  showClusterSwitcher?: boolean;
+
+  /**
+   * Show the namespace filter in the header
+   */
+  showNamespaceFilter?: boolean;
+
+  /**
+   * A number used to determine where in navigation this item will be placed. The highest number will be at the top of the list.
+   */
+  weight?: number;
+
+  /**
+   * Leaving these here for completeness but I don't think these should be advertised as useable to plugin creators.
+   */
+  // ifHaveVerb: string | RegExp;
+  // removable: string;
+  // showWorkspaceSwitcher: boolean;
+  // supportRoute: string;
+  // to: string;
+  // typeStoreMap: string;
+}
+
+export interface HeaderOptions {
+  /**
+   * Name of the header. This should be unique.
+   */
+  name?: string;
+
+  /**
+   * A translation key where the resulting string will show in the table column
+   */
+  labelKey?: string;
+
+  /**
+   * A string which represents the path to access the value from the row object i.e. `row.meta.value`.
+   */
+  value?: string;
+
+  /**
+   * A string which represents the path to access the value from the row object which we'll use to sort i.e. `row.meta.value`
+   */
+  sort?: string;
+
+  /**
+   * A string which represents the path to access the value from the row object which we'll use to search i.e. `row.meta.value`
+   */
+  search?: string;
+
+  /**
+   * Number of pixels the column should be in the table
+   */
+  width?: number;
+
+  /**
+   * The name of a custom formatter. The available formatters can bee seen in `@rancher/shell/components/formatter`
+   */
+  formatter?: string;
+
+  /**
+   * These options are dependent on the formatter that's chosen. Examples can be seen in `@rancher/shell/components/formatter` and `@rancher/shell/config/table-headers`
+   */
+  formatterOpts?: any;
+
+  /**
+   * Provide a function which accets a row and returns the value that should be displayed in the column
+   * @param row This can be any value which represents the row
+   * @returns Can return {@link string | number | null | undefined} to display in the column
+   */
+  getValue?: (row: any) => string | number | null | undefined;
+}
+
+export interface ConfigureTypeOptions {
+  /**
+   * The resource can edit/show yaml
+   */
+  canYaml?: boolean;
+
+  /**
+   * Modify the way the name looks when displayed
+   */
+  displayName?: string;
+
+  /**
+   * New resources can be created of this type
+   */
+  isCreatable?: boolean;
+
+  /**
+   * Resources of this type can be deleted/removed
+   */
+  isRemovable?: boolean;
+
+  /**
+   * This type should be grouped by namespaces when displayed in a table
+   */
+  namespaced?: boolean;
+
+  /**
+   * Show the age column in when displaying this type in a table
+   */
+  showAge?: boolean;
+
+   /**
+   * Show the masthead at the top of the list view of this type
+   */
+  showListMasthead?: boolean;
+
+   /**
+   * Show the state column in when displaying this type in a table
+   */
+  showState?: boolean;
+
+  /**
+   * Leaving these here for completeness but I don't think these should be advertised as useable to plugin creators.
+   */
+  // alias
+  // customRoute
+  // customRoute
+  // depaginate
+  // graphConfig
+  // hasGraph
+  // isEditable
+  // limit
+  // listGroups
+  // localOnly
+  // location
+  // match
+  // realResource
+  // resource
+  // resourceDetail
+  // resourceEdit
+  // showConfigView
+}
+
+export interface DSLReturnType {
+  /**
+   * Register multiple types by name and place them all in a group if desired. Primarily used for grouping things in the cluster explorer navigation.
+   * @param types A list of types that are going to be registered
+   * @param group Conditionally a group you want to places all the types in
+   * @returns {@link void}
+   */
+  basicType: (types: string[], group?: string) => void;
+
+  /**
+   * Configure a myriad of options for the specified type
+   * @param type The type to be configured
+   * @param options {@link ConfigureTypeOptions}
+   * @returns {@link void}
+   */
+  configureType: (type: string, options: ConfigureTypeOptions) => void;
+
+  /**
+   * Register the headers/columns that should be used when rendering a table for the specified type.
+   * @param type The type you'd like to register headers/columns for.
+   * @param headers {@link HeaderOptions[]}
+   * @returns {@link void}
+   */
+  headers: (type: string, headers: HeaderOptions[]) => void;
+
+  /**
+   * Create and register a new product
+   * @param options {@link ProductOptions}
+   * @returns {@link void}
+   */
+  product: (options: ProductOptions) => void;
+
+  /**
+   * Leaving these here for completeness but I don't think these should be advertised as useable to plugin creators.
+   */
+  // componentForType: (type: string, replacementType: string)
+  // groupBy: (type: string, field: string)
+  // hideBulkActions: (type: string, field)
+  // ignoreGroup: (regexOrString)
+  // ignoreType: (regexOrString)
+  // mapGroup: (match, replace)
+  // mapType: (match, replace)
+  // moveType: (match, group)
+  // setGroupDefaultType: (input, defaultType)
+  // spoofedType: (obj)
+  // virtualType: (obj)
+  // weightGroup: (input, weight, forBasic)
+  // weightType: (input, weight, forBasic)
+}
+
 /**
  * Interface for a Dashboard plugin
  */
@@ -144,7 +394,7 @@ export interface IPlugin {
    * Add a product
    * @param importFn Function that will import the module containing a product definition
    */
-  addProduct(importFn: Function): void;
+  addProduct(importFn: ProductFunction): void;
 
   /**
    * Add a locale to the i18n store
@@ -249,4 +499,11 @@ export interface IPlugin {
    * @param {Function} fn function that dynamically loads the module for the thing being registered
    */
   register(type: string, name: string, fn: Function): void;
+
+  /**
+   * Will return all of the configuration functions used for creating a new product.
+   * @param store The store that was passed to the function that's passed to `plugin.addProduct(function)`
+   * @param productName The name of the new product. This name is displayed in the navigation.
+   */
+  DSL(store: any, productName: string): DSLReturnType;
 }

package/creators/app/app.package.json

@@ -7,6 +7,7 @@
   },
   "dependencies": {},
   "resolutions": {
-    "**/webpack": "4"
+    "**/webpack": "4",
+    "@types/node": "^16"
   }  
 }

package/creators/app/files/.eslintrc.js

@@ -30,7 +30,7 @@ module.exports = {
     'unicorn/no-new-buffer':    'off',
     'vue/html-self-closing':    'off',
     'vue/no-unused-components': 'warn',
-    'vue/no-v-html':            'off',
+    'vue/no-v-html':            'error',
     'wrap-iife':                'off',
 
     'array-bracket-spacing':             'warn',

package/creators/app/files/babel.config.js

@@ -1,18 +1 @@
-module.exports = {
-  env: {
-    test: {
-      plugins: [
-        [
-          'module-resolver',
-          {
-            root:  ['.'],
-            alias: {
-              '@': '.',
-              '~': '.',
-            },
-          },
-        ],
-      ],
-    },
-  },
-};
+module.exports = require('@rancher/shell/babel.config.js');

package/creators/app/files/tsconfig.json

@@ -31,7 +31,6 @@
     ],    
     "types": [
       "@types/node",
-      "@nuxt/types",
       "cypress",
       "rancher",
       "shell"

package/creators/app/files/vue.config.js

@@ -0,0 +1,6 @@
+const config = require('@rancher/shell/vue.config');
+
+module.exports = config(__dirname, {
+  excludes: [],
+  // excludes: ['fleet', 'example']
+});

package/creators/app/init

@@ -4,14 +4,14 @@ const path = require('path');
 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_ENV=dev ./node_modules/.bin/vue-cli-service serve',
+  build: './node_modules/.bin/vue-cli-service build',
+  clean: './node_modules/@rancher/shell/scripts/clean'
 };
 
 const files = [
   'tsconfig.json',
-  'nuxt.config.js',
+  'vue.config.js',
   '.eslintignore',
   '.eslintrc.js',
   'babel.config.js',
@@ -24,7 +24,7 @@ console.log('Creating Skeleton Application');
 const args = process.argv;
 let appFolder = path.resolve('.');
 
-if (args.length == 3) {
+if (args.length === 3) {
   const name = args[2];
   const folder = path.resolve('.');