@rancher/shell 3.0.9-rc.4 → 3.0.9-rc.5

package/components/nav/__tests__/TopLevelMenu.test.ts

@@ -595,7 +595,7 @@ describe('topLevelMenu', () => {
       jest.spyOn(sideNavService, 'init').mockImplementation(() => {});
       const updateSpy = jest.fn();
       const mockHelper = {
-        update: updateSpy, clustersPinned: [], clustersOthers: []
+        update: updateSpy, clustersPinned: [], clustersOthers: [], updateCount: () => {}
       };
 
       jest.spyOn(sideNavService, 'helper', 'get').mockReturnValue(mockHelper as any);
@@ -624,7 +624,7 @@ describe('topLevelMenu', () => {
       jest.spyOn(sideNavService, 'init').mockImplementation(() => {});
       const updateSpy = jest.fn();
       const mockHelper = {
-        update: updateSpy, clustersPinned: [], clustersOthers: []
+        update: updateSpy, clustersPinned: [], clustersOthers: [], updateCount: () => {}
       };
 
       jest.spyOn(sideNavService, 'helper', 'get').mockReturnValue(mockHelper as any);
@@ -653,7 +653,7 @@ describe('topLevelMenu', () => {
       jest.spyOn(sideNavService, 'init').mockImplementation(() => {});
       const updateSpy = jest.fn();
       const mockHelper = {
-        update: updateSpy, clustersPinned: [], clustersOthers: []
+        update: updateSpy, clustersPinned: [], clustersOthers: [], updateCount: () => {}
       };
 
       jest.spyOn(sideNavService, 'helper', 'get').mockReturnValue(mockHelper as any);

package/components/nav/__tests__/Type.test.ts

@@ -21,8 +21,9 @@ describe('component: Type', () => {
     const defaultCount = 1;
     const storeMock = {
       getters: {
-        currentStore:    () => 'cluster',
-        'cluster/count': () => defaultCount,
+        currentStore:          () => 'cluster',
+        'cluster/count':       () => defaultCount,
+        'type-map/optionsFor': () => {},
       }
     };
     const routerMock = {
@@ -449,8 +450,9 @@ describe('component: Type', () => {
 
               $store: {
                 getters: {
-                  currentStore:    () => 'cluster',
-                  'cluster/count': () => null,
+                  currentStore:          () => 'cluster',
+                  'cluster/count':       () => null,
+                  'type-map/optionsFor': () => {},
                 }
               },
               $router: routerMock,

package/config/product/explorer.js

@@ -3,7 +3,7 @@ import {
   CONFIG_MAP,
   EVENT,
   NODE, SECRET, INGRESS,
-  WORKLOAD, WORKLOAD_TYPES, SERVICE, HPA, NETWORK_POLICY, PV, PVC, STORAGE_CLASS, POD, POD_DISRUPTION_BUDGET, LIMIT_RANGE, RESOURCE_QUOTA,
+  WORKLOAD, WORKLOAD_TYPES, SERVICE, HPA, NETWORK_POLICY, PV, PVC, STORAGE_CLASS, POD, POD_DISRUPTION_BUDGET, LIMIT_RANGE, RESOURCE_QUOTA, AUDIT_POLICY,
   MANAGEMENT,
   NAMESPACE,
   NORMAN,
@@ -83,6 +83,7 @@ export function init(store) {
     NETWORK_POLICY,
     POD_DISRUPTION_BUDGET,
     RESOURCE_QUOTA,
+    AUDIT_POLICY,
   ], 'policy');
 
   basicType([
@@ -118,6 +119,7 @@ export function init(store) {
   weightGroup('storage', 95, true);
   weightGroup('policy', 94, true);
   weightType(POD, -1, true);
+  weightType(AUDIT_POLICY, -1, true);
 
   // here is where we define the usage of the WORKLOAD custom list view for
   // all the workload types (ex: deployments, cron jobs, daemonsets, etc)
@@ -152,6 +154,7 @@ export function init(store) {
   mapGroup('autoscaling', 'Autoscaling');
   mapGroup('policy', 'Policy');
   mapGroup('networking.k8s.io', 'Networking');
+  mapGroup('auditlog.cattle.io', 'Policy');
   mapGroup(/^(.+\.)?api(server)?.*\.k8s\.io$/, 'API');
   mapGroup('rbac.authorization.k8s.io', 'RBAC');
   mapGroup('admissionregistration.k8s.io', 'admission');
@@ -181,7 +184,6 @@ export function init(store) {
 
   const dePaginateBindings = configureConditionalDepaginate({ maxResourceCount: 5000 });
   const dePaginateNormanBindings = configureConditionalDepaginate({ maxResourceCount: 5000, isNorman: true });
-  const dePaginateNormanUsers = configureConditionalDepaginate({ maxResourceCount: 5000, isNorman: true });
 
   configureType(NODE, { isCreatable: false, isEditable: true });
   configureType(WORKLOAD_TYPES.JOB, { isEditable: false, match: WORKLOAD_TYPES.JOB });
@@ -190,7 +192,6 @@ export function init(store) {
   configureType(MANAGEMENT.PROJECT, { displayName: store.getters['i18n/t']('namespace.project.label') });
   configureType(NORMAN.CLUSTER_ROLE_TEMPLATE_BINDING, { depaginate: dePaginateNormanBindings });
   configureType(NORMAN.PROJECT_ROLE_TEMPLATE_BINDING, { depaginate: dePaginateNormanBindings });
-  configureType(NORMAN.USER, { depaginate: dePaginateNormanUsers });
   configureType(SNAPSHOT, { depaginate: true });
 
   configureType(SECRET, { showListMasthead: false });

package/config/product/manager.js

@@ -3,16 +3,20 @@ import {
   CAPI,
   CATALOG,
   EXT,
+  COUNT,
   NORMAN,
   HCI,
   MANAGEMENT,
   SNAPSHOT,
   VIRTUAL_TYPES,
-  HOSTED_PROVIDER
+  HOSTED_PROVIDER,
+  SAVED_COUNTS
 } from '@shell/config/types';
 import { MULTI_CLUSTER } from '@shell/store/features';
 import { DSL } from '@shell/store/type-map';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
+import { markRaw } from 'vue';
+
 export const NAME = 'manager';
 
 export function init(store) {
@@ -219,4 +223,17 @@ export function init(store) {
       defaultSort: true,
     },
   ]);
+
+  // Configure custom count getter for cluster count (so we don't include Harvester clusters)
+  configureType(CAPI.RANCHER_CLUSTER, {
+    custom: {
+      countGetter: markRaw((getters) => {
+        const savedClusterCount = getters['management/getSavedCount'](SAVED_COUNTS.K8S_CLUSTERS);
+        const counts = getters[`management/all`](COUNT)?.[0]?.counts || {};
+        const clusterCount = counts[CAPI.RANCHER_CLUSTER]?.summary.count;
+
+        return savedClusterCount || clusterCount;
+      })
+    }
+  });
 }

package/config/router/navigation-guards/authentication.js

@@ -28,16 +28,16 @@ export function install(router, context) {
 }
 
 /**
- * Generate an object that includes both the v3User and the me data
- * @param {*} v3User V3 user information
+ * Generate an object that includes both the user and the me data
+ * @param {*} user User information
  * @param {*} me Me user data
  * @returns User info to be passed to `isLoggedIn`
  */
-function getUserObject(v3User, me) {
+function getUserObject(user, me) {
   return {
     id: me.id,
     me,
-    v3User,
+    user,
   };
 }
 
@@ -59,10 +59,9 @@ export async function authenticate(to, from, next, { store }) {
   if ( store.getters['auth/enabled'] !== false && !store.getters['auth/loggedIn'] ) {
     // `await` so we have one successfully request whilst possibly logged in (ensures fromHeader is populated from `x-api-cattle-auth`)
     await store.dispatch('auth/getUser');
+    const user = store.getters['auth/user'] || {};
 
-    const v3User = store.getters['auth/v3User'] || {};
-
-    if (v3User?.mustChangePassword) {
+    if (user?.mustChangePassword) {
       return next({ name: 'auth-setup' });
     }
 
@@ -75,7 +74,7 @@ export async function authenticate(to, from, next, { store }) {
     } else if ( fromHeader === 'true' ) {
       const me = await findMe(store);
 
-      await isLoggedIn(store, getUserObject(v3User, me));
+      await isLoggedIn(store, getUserObject(user, me));
       handleOidcRedirectToCallbackUrl();
     } else if ( fromHeader === 'false' ) {
       notLoggedIn(store, next, to);
@@ -86,7 +85,7 @@ export async function authenticate(to, from, next, { store }) {
       try {
         const me = await findMe(store);
 
-        await isLoggedIn(store, getUserObject(v3User, me));
+        await isLoggedIn(store, getUserObject(user, me));
         handleOidcRedirectToCallbackUrl();
       } catch (e) {
         const status = e?._status;

package/config/types.js

@@ -61,6 +61,7 @@ export const POD_DISRUPTION_BUDGET = 'policy.poddisruptionbudget';
 export const PV = 'persistentvolume';
 export const PVC = 'persistentvolumeclaim';
 export const RESOURCE_QUOTA = 'resourcequota';
+export const AUDIT_POLICY = 'auditlog.cattle.io.auditpolicy';
 export const SCHEMA = 'schema';
 export const SERVICE = 'service';
 export const SECRET = 'secret';
@@ -263,8 +264,11 @@ export const BRAND = {
 };
 
 export const EXT = {
-  USER_ACTIVITY: 'ext.cattle.io.useractivity',
-  KUBECONFIG:    'ext.cattle.io.kubeconfig',
+  USER_ACTIVITY:                     'ext.cattle.io.useractivity',
+  SELFUSER:                          'ext.cattle.io.selfuser',
+  GROUP_MEMBERSHIP_REFRESH_REQUESTS: 'ext.cattle.io.groupmembershiprefreshrequest',
+  PASSWORD_CHANGE_REQUESTS:          'ext.cattle.io.passwordchangerequest',
+  KUBECONFIG:                        'ext.cattle.io.kubeconfig',
 };
 
 export const CAPI = {
@@ -409,3 +413,7 @@ export const DEPRECATED = 'Deprecated';
 export const EXPERIMENTAL = 'Experimental';
 export const AUTOSCALER_CONFIG_MAP_ID = 'kube-system/cluster-autoscaler-status';
 export const HOSTED_PROVIDER = 'hostedprovider';
+
+// Named saved counts
+
+export const SAVED_COUNTS = { K8S_CLUSTERS: 'k8sClusters' };

package/detail/auditlog.cattle.io.auditpolicy.vue

@@ -0,0 +1,19 @@
+<script lang="ts">
+// Shared AuditPolicy interface for all audit log policy components
+import CreateEditView from '@shell/mixins/create-edit-view';
+import ResourceTabs from '@shell/components/form/ResourceTabs/index.vue';
+
+export default {
+  name:       'DetailAuditPolicy',
+  components: { ResourceTabs },
+  mixins:     [CreateEditView],
+};
+</script>
+
+<template>
+  <Loading v-if="$fetchState.pending" />
+  <ResourceTabs
+    :mode="mode"
+    :value="value"
+  />
+</template>

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

@@ -3,7 +3,7 @@ import CreateEditView from '@shell/mixins/create-edit-view';
 import Tab from '@shell/components/Tabbed/Tab';
 import ResourceTabs from '@shell/components/form/ResourceTabs';
 import SortableTable from '@shell/components/SortableTable';
-import { MANAGEMENT, NORMAN } from '@shell/config/types';
+import { MANAGEMENT } from '@shell/config/types';
 import Loading from '@shell/components/Loading';
 import { NAME } from '@shell/config/table-headers';
 
@@ -31,7 +31,6 @@ export default {
     if (this.canSeeRoleTemplates) {
       // Upfront fetch, avoid async computes
       await Promise.all([
-        await this.$store.dispatch('rancher/find', { type: NORMAN.USER, id: this.value.id }),
         await this.$store.dispatch('management/findAll', { type: MANAGEMENT.ROLE_TEMPLATE }),
         await this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER_ROLE_TEMPLATE_BINDING }),
         await this.$store.dispatch('management/findAll', { type: MANAGEMENT.PROJECT_ROLE_TEMPLATE_BINDING })

package/detail/node.vue

@@ -196,7 +196,6 @@ export default {
     v-else
     class="node"
   >
-    <div class="spacer" />
     <div class="alerts">
       <Alert
         class="mr-10"

package/detail/provisioning.cattle.io.cluster.vue

@@ -364,7 +364,8 @@ export default {
         const machineFullName = machineNameFn(this.value.name, mp.name);
 
         const machines = this.value.machines.filter((machine) => {
-          const isElementalCluster = machine.spec?.infrastructureRef?.apiVersion.startsWith('elemental.cattle.io');
+          // elemental machines use an older version of CAPI CRDs that use apiVersion instead of apiGroup
+          const isElementalCluster = (machine.spec?.infrastructureRef?.apiGroup || machine.spec?.infrastructureRef?.apiVersion).startsWith('elemental.cattle.io');
           const machinePoolInfName = machine.spec?.infrastructureRef?.name;
 
           if (isElementalCluster) {

package/dialog/ChangePasswordDialog.vue

@@ -9,6 +9,13 @@ export default {
   components: {
     Card, AsyncButton, ChangePassword
   },
+  props: {
+    user: {
+      type:     Object,
+      default:  () => null,
+      required: true
+    }
+  },
   data() {
     return { valid: false, password: '' };
   },
@@ -45,6 +52,7 @@ export default {
       <form @submit.prevent>
         <ChangePassword
           ref="changePassword"
+          :user="user"
           @valid="valid = $event"
         />
       </form>

package/dialog/GenericPrompt.vue

@@ -38,9 +38,24 @@ export default {
       type:    Function,
       default: () => { }
     },
+    actionColor: {
+      type:    String,
+      default: 'role-primary',
+    },
+    errors: {
+      type:    Array,
+      default: () => []
+    }
   },
+
   data() {
-    return { errors: [] };
+    return { applyErrors: [] };
+  },
+
+  computed: {
+    allErrors() {
+      return [...this.errors, ...this.applyErrors];
+    }
   },
 
   methods: {
@@ -51,13 +66,14 @@ export default {
     },
 
     async apply(buttonDone) {
+      this.applyErrors = [];
       try {
         await this.applyAction(buttonDone);
         this.confirm(true);
         this.$emit('close');
       } catch (err) {
         console.error(err); // eslint-disable-line
-        this.errors = exceptionToErrorsArray(err);
+        this.applyErrors = exceptionToErrorsArray(err);
         buttonDone(false);
       }
     }
@@ -92,7 +108,7 @@ export default {
     <template #actions>
       <div class="bottom">
         <Banner
-          v-for="(err, i) in errors"
+          v-for="(err, i) in allErrors"
           :key="i"
           color="error"
           :label="err"
@@ -107,6 +123,7 @@ export default {
 
           <AsyncButton
             :mode="applyMode"
+            :action-color="actionColor"
             @click="apply"
           />
         </div>

package/dialog/ScaleMachineDownDialog.vue

@@ -2,7 +2,7 @@
 import { CAPI as CAPI_LABELS } from '@shell/config/labels-annotations';
 import { MANAGEMENT, CAPI } from '@shell/config/types';
 import GenericPrompt from './GenericPrompt';
-
+import { exceptionToErrorsArray } from '@shell/utils/error';
 export default {
   emits: ['close'],
 
@@ -16,17 +16,26 @@ export default {
   },
 
   async fetch() {
-    if (this.isRke2) {
-      await Promise.all([
-        this.$store.dispatch('management/findAll', { type: CAPI.MACHINE_DEPLOYMENT }),
-        this.$store.dispatch('management/findAll', { type: CAPI.MACHINE })
-      ]);
-    } else {
-      await Promise.all([
-        this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_POOL }),
-        this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE })
-      ]);
+    this.loading = true;
+    try {
+      if (this.isRke2) {
+        await Promise.all([
+          this.$store.dispatch('management/findAll', { type: CAPI.MACHINE_DEPLOYMENT }),
+          this.$store.dispatch('management/findAll', { type: CAPI.MACHINE })
+        ]);
+        const machineSetPromises = this.safeMachinesToDelete.filter((machine) => machine.isWorker).map((machine) => this.getMachineSets(machine));
+
+        this.workerMachineSets = await Promise.all(machineSetPromises);
+      } else {
+        await Promise.all([
+          this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_POOL }),
+          this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE })
+        ]);
+      }
+    } catch (e) {
+      this.errors = exceptionToErrorsArray(e);
     }
+    this.loading = false;
   },
 
   data() {
@@ -51,11 +60,39 @@ export default {
         title:       this.t('promptRemove.title'),
         applyMode:   'delete',
         applyAction: this.remove,
-      }
+      },
+      workerMachineSets: [],
+      loading:           false,
+      errors:            []
     };
   },
+  computed: {
+    showScaling() {
+      for (const machineSet of this.workerMachineSets) {
+        const data = machineSet?.data || [];
+
+        for (const ms of data) {
+          if (!ms?.spec?.replicas || !ms?.status?.readyReplicas || ms.spec.replicas !== ms.status.readyReplicas) {
+            return true;
+          }
+        }
+      }
+
+      return false;
+    }
+  },
 
   methods: {
+    getMachineSets(machine) {
+      const namespace = machine.namespace;
+      const labelSelector = { matchLabels: { [CAPI_LABELS.DEPLOYMENT_NAME]: machine.poolName } }; // machine.poolId
+
+      return this.$store.dispatch('management/findLabelSelector', {
+        type:     CAPI.MACHINE_SET,
+        matching: { namespace, labelSelector },
+        opt:      { transient: true }
+      });
+    },
     deleteType(type, allToDelete, cluster, isRke2) {
       const allToDeleteByType = allToDelete.reduce((res, m) => {
         if (m[type]) {
@@ -117,15 +154,28 @@ export default {
 <template>
   <GenericPrompt
     v-bind="config"
+    action-color="bg-error role-primary"
+    :errors="errors"
     @close="$emit('close')"
   >
     <template #body>
       <div class="pl-10 pr-10 mt-20 mb-20 body">
-        <div v-if="allToDelete.length === 1">
-          {{ t('promptRemove.attemptingToRemove', { type }) }} <b>{{ safeMachinesToDelete[0].nameDisplay }}</b>
+        <div
+          v-if="loading"
+          class="text-center"
+        >
+          <i class="icon icon-spinner icon-spin icon-lg" />
         </div>
         <div v-else>
-          {{ t('promptScaleMachineDown.attemptingToRemove', { type, count: allToDelete.length }, true) }}
+          <div v-if="showScaling">
+            <span v-clean-html="t('promptScaleMachineDown.scaling', { count: resources.length }, true)" />
+          </div>
+          <div v-else-if="safeMachinesToDelete.length === 1">
+            {{ t('promptRemove.attemptingToRemove', { type }) }} <b>{{ safeMachinesToDelete[0].nameDisplay }}</b>
+          </div>
+          <div v-else>
+            {{ t('promptScaleMachineDown.attemptingToRemove', { type, count: allToDelete.length }, true) }}
+          </div>
         </div>
         <div
           v-if="ignored.length"

package/dialog/SearchDialog.vue

@@ -46,13 +46,21 @@ export default {
       const counts = this.$store.getters[`${ product.inStore }/all`](COUNT)?.[0]?.counts || {};
 
       out.forEach((o) => {
-        o.children?.forEach((t) => {
+        o.children = o.children?.reduce((res, t) => {
+          if (!this.$store.getters[`${ product.inStore }/canList`](t.name)) {
+            return res;
+          }
+
           const count = counts[t.name];
 
           t.count = count ? count.summary.count || 0 : null;
           t.byNamespace = count ? count.namespaces : {};
           t.revision = count ? count.revision : null;
-        });
+
+          res.push(t);
+
+          return res;
+        }, []);
       });
 
       this.groups = out;