@rancher/shell 3.0.0 → 3.0.1-rc.2

package/utils/auth.js

@@ -116,7 +116,7 @@ export const checkSchemasForFindAllHash = (types, store) => {
     const validSchema = value.schemaValidator ? value.schemaValidator(schema) : !!schema;
 
     if (validSchema) {
-      hash[key] = store.dispatch(`${ value.inStoreType }/findAll`, { type: value.type } );
+      hash[key] = store.dispatch(`${ value.inStoreType }/findAll`, { type: value.type, opt: value.opt } );
     }
   }
 

package/utils/create-yaml.js

@@ -176,7 +176,7 @@ export function createYaml(
   }
 
   // ACTIVELY_REMOVE are fields that should be removed even if they are defined in data
-  for ( const entry of ACTIVELY_REMOVE ) {
+  for ( const entry of (dataOptions.activelyRemove || ACTIVELY_REMOVE) ) {
     const parts = entry.split(/\./);
     const key = parts[parts.length - 1];
     const prefix = parts.slice(0, -1).join('.');

package/utils/favicon.js

@@ -19,6 +19,8 @@ export function setFavIcon(store) {
       brandImage = require('~shell/assets/brand/suse/favicon.png');
     } else if (brandSetting?.value === 'csp') {
       brandImage = require('~shell/assets/brand/csp/favicon.png');
+    } else if (brandSetting?.value === 'harvester') {
+      brandImage = require('~shell/assets/brand/harvester/favicon.png');
     }
 
     link.href = res?.value || brandImage || defaultFavIcon;

package/utils/fleet.ts

@@ -0,0 +1,159 @@
+import {
+  BundleDeploymentResource,
+  BundleResourceKey,
+  BundleDeploymentStatus,
+  BundleStatus,
+} from '@shell/types/resources/fleet';
+import { STATES_ENUM } from '@shell/plugins/dashboard-store/resource-class';
+import { FLEET as FLEET_ANNOTATIONS } from '@shell/config/labels-annotations';
+
+interface Resource extends BundleDeploymentResource {
+  state: string,
+}
+
+type Labels = {
+  [key: string]: string,
+}
+
+interface StatesCounter { [state: string]: number }
+
+function incr(counter: StatesCounter, state: string) {
+  if (!counter[state]) {
+    counter[state] = 0;
+  }
+  counter[state]++;
+}
+
+function resourceKey(r: BundleResourceKey): string {
+  return `${ r.kind }/${ r.namespace }/${ r.name }`;
+}
+
+class Fleet {
+  resourceId(r: BundleResourceKey): string {
+    return r.namespace ? `${ r.namespace }/${ r.name }` : r.name;
+  }
+
+  /**
+   * resourceType normalizes APIVersion and Kind from a Resources into a single string
+   */
+  resourceType(r: Resource): string {
+    // ported from https://github.com/rancher/fleet/blob/v0.10.0/internal/cmd/controller/grutil/resourcekey.go#L116-L128
+    const type = r.kind.toLowerCase();
+
+    if (!r.apiVersion || r.apiVersion === 'v1') {
+      return type;
+    }
+
+    return `${ r.apiVersion.split('/', 2)[0] }.${ type }`;
+  }
+
+  /**
+   * resourcesFromBundleDeploymentStatus extracts the list of resources deployed by a BundleDeployment
+   */
+  resourcesFromBundleDeploymentStatus(status: BundleDeploymentStatus): Resource[] {
+    // status.resources includes of resources that were deployed by Fleet *and still exist in the cluster*
+    // Use a map to avoid `find` over and over again
+    const resources = (status?.resources || []).reduce((res, r) => {
+      res[resourceKey(r)] = Object.assign({ state: STATES_ENUM.READY }, r);
+
+      return res;
+    }, {} as { [resourceKey: string]: Resource });
+
+    const modified: Resource[] = [];
+
+    for (const r of status?.modifiedStatus || []) {
+      const state = r.missing ? STATES_ENUM.MISSING : r.delete ? STATES_ENUM.ORPHANED : STATES_ENUM.MODIFIED;
+      const found: Resource = resources[resourceKey(r)];
+
+      // Depending on the state, the same resource can appear in both fields
+      if (found) {
+        found.state = state;
+      } else {
+        modified.push(Object.assign({ state }, r));
+      }
+    }
+    for (const r of status?.nonReadyStatus || []) {
+      const state = r.summary?.state || STATES_ENUM.UNKNOWN;
+      const found: Resource = resources[resourceKey(r)];
+
+      if (found) {
+        found.state = state;
+      }
+    }
+
+    return modified.concat(Object.values(resources));
+  }
+
+  /**
+   * resourcesFromBundleStatus extracts the list of resources deployed by a Bundle
+   */
+  resourcesFromBundleStatus(status: BundleStatus): Resource[] {
+    // The state of every resource is spread all over the bundle status.
+    // resourceKey contains one entry per resource AND cluster (built by Fleet from all the child BundleDeployments).
+    // However, those entries do not contain the cluster that they belong to, leading to duplicate entries
+
+    // 1. Fold resourceKey by using a unique key, initializing counters for multiple occurrences of the same resource
+    const resources = (status.resourceKey || []).reduce((res, r) => {
+      const k = resourceKey(r);
+
+      if (!res[k]) {
+        res[k] = { r, count: {} };
+      }
+      incr(res[k].count, STATES_ENUM.READY);
+
+      return res;
+    }, {} as { [resourceKey: string]: { r: BundleResourceKey, count: StatesCounter } });
+
+    // 2. Non-ready resources are counted differently and may also appear in resourceKey, depending on their state
+    for (const bundle of status.summary?.nonReadyResources || []) {
+      for (const r of bundle.modifiedStatus || []) {
+        const k = resourceKey(r);
+
+        if (!resources[k]) {
+          resources[k] = { r, count: {} };
+        }
+
+        if (r.missing) {
+          incr(resources[k].count, STATES_ENUM.MISSING);
+        } else if (r.delete) {
+          resources[k].count[STATES_ENUM.READY]--;
+          incr(resources[k].count, STATES_ENUM.ORPHANED);
+        } else {
+          resources[k].count[STATES_ENUM.READY]--;
+          incr(resources[k].count, STATES_ENUM.MODIFIED);
+        }
+      }
+      for (const r of bundle.nonReadyStatus || []) {
+        const k = resourceKey(r);
+        const state = r.summary?.state || STATES_ENUM.UNKNOWN;
+
+        resources[k].count[STATES_ENUM.READY]--;
+        incr(resources[k].count, state);
+      }
+    }
+
+    // 3. Unfold back to an array of resources for display
+    return Object.values(resources).reduce((res, e) => {
+      const { r, count } = e;
+
+      for (const state in count) {
+        for (let x = 0; x < count[state]; x++) {
+          res.push(Object.assign({ state }, r));
+        }
+      }
+
+      return res;
+    }, [] as Resource[]);
+  }
+
+  clusterIdFromBundleDeploymentLabels(labels?: Labels): string {
+    const clusterNamespace = labels?.[FLEET_ANNOTATIONS.CLUSTER_NAMESPACE];
+    const clusterName = labels?.[FLEET_ANNOTATIONS.CLUSTER];
+
+    return `${ clusterNamespace }/${ clusterName }`;
+  }
+}
+
+const instance = new Fleet();
+
+export default instance;

package/utils/gc/gc.ts

@@ -29,7 +29,7 @@ class GarbageCollect {
    * To avoid JSON.parse on the `ui-performance` setting keep a local cache
    */
   private getUiPerfGarbageCollection = (rootState: any) => {
-    const uiPerfSetting = rootState.management.types[MANAGEMENT.SETTING]?.list.find((s: any) => s.id === SETTING.UI_PERFORMANCE);
+    const uiPerfSetting = rootState.management.types[MANAGEMENT.SETTING]?.list?.find((s: any) => s.id === SETTING.UI_PERFORMANCE);
 
     if (!uiPerfSetting || !uiPerfSetting.value) {
       // Could be in the process of logging out

package/utils/v-sphere.ts

@@ -1,5 +1,8 @@
 import merge from 'lodash/merge';
 import { SECRET } from '@shell/config/types';
+import { PROVISIONING_PRE_BOOTSTRAP } from '@shell/store/features';
+
+export const VMWARE_VSPHERE = 'vmwarevsphere';
 
 type Rke2Component = {
     versionInfo: any;
@@ -7,6 +10,7 @@ type Rke2Component = {
     chartVersionKey: (chartName: string) => string;
     value: any;
     isEdit: boolean;
+    provider: string;
     $store: any,
 }
 
@@ -91,10 +95,33 @@ class VSphereUtils {
     };
   }
 
+  /**
+   * Check that system is setup to handle vsphere secrets syncing downstream
+   *
+   * Do this via checking the provider and that the required FF is enabled.
+   */
+  private handleVsphereSecret({ $store, provider }: { $store: any, provider: string}): boolean {
+    if (provider !== VMWARE_VSPHERE) {
+      return false;
+    }
+
+    const isPrebootstrapEnabled = $store.getters['features/get'](PROVISIONING_PRE_BOOTSTRAP);
+
+    if (!isPrebootstrapEnabled) {
+      return false;
+    }
+
+    return true;
+  }
+
   /**
     * Create upstream vsphere cpi secret to sync downstream
     */
   async handleVsphereCpiSecret(rke2Component: Rke2Component) {
+    if (!this.handleVsphereSecret(rke2Component)) {
+      return;
+    }
+
     const generateName = `${ rootGenerateName }cpi-`;
     const downstreamName = 'rancher-vsphere-cpi-credentials';
     const downstreamNamespace = 'kube-system';
@@ -168,6 +195,10 @@ class VSphereUtils {
     * Create upstream vsphere csi secret to sync downstream
     */
   async handleVsphereCsiSecret(rke2Component: Rke2Component) {
+    if (!this.handleVsphereSecret(rke2Component)) {
+      return;
+    }
+
     const generateName = `${ rootGenerateName }csi-`;
     const downstreamName = 'rancher-vsphere-csi-credentials';
     const downstreamNamespace = 'kube-system';

package/utils/validators/cron-schedule.js

@@ -2,7 +2,7 @@ import cronstrue from 'cronstrue';
 
 export function cronSchedule(schedule = '', getters, errors) {
   try {
-    cronstrue.toString(schedule);
+    cronstrue.toString(schedule, { verbose: true });
   } catch (e) {
     errors.push(getters['i18n/t']('validation.invalidCron'));
   }

package/utils/validators/formRules/index.ts

@@ -131,7 +131,7 @@ export default function(t: Translation, { key = 'Value' }: ValidationOptions): {
 
   const cronSchedule: Validator = (val: string) => {
     try {
-      cronstrue.toString(val);
+      cronstrue.toString(val, { verbose: true });
     } catch (e) {
       return t('validation.invalidCron');
     }

package/utils/version.js

@@ -66,7 +66,7 @@ function comparePart(in1, in2) {
   return in1.localeCompare(in2);
 }
 
-export function isPrerelease(version) {
+export function isPrerelease(version = '') {
   if (!semver.valid(version)) {
     version = semver.clean(version, { loose: true });
   }

package/vue.config.js

@@ -131,11 +131,11 @@ const instrumentCode = () => {
 };
 
 const getLoaders = (SHELL_ABS) => [
-  // Ensure there is a fallback for browsers that don't support web workers
+  // no fallback for pre-2013 browsers https://caniuse.com/webworkers
   {
     test:    /web-worker.[a-z-]+.js/i,
     loader:  'worker-loader',
-    options: { inline: 'fallback' },
+    options: { inline: 'no-fallback' },
   },
   // Handler for csv files (e.g. ec2 instance data)
   {