@rancher/shell 3.0.1 → 3.0.2-rc.1

package/config/product/apps.js

@@ -10,6 +10,7 @@ import {
 
 import { CATALOG } from '@shell/config/types';
 import { DSL } from '@shell/store/type-map';
+import { STEVE_AGE_COL, STEVE_NAMESPACE_COL, STEVE_NAME_COL, STEVE_STATE_COL } from '@shell/config/pagination-table-headers';
 
 export const NAME = 'apps';
 
@@ -75,41 +76,73 @@ export function init(store) {
     dashIfEmpty: true,
   };
 
-  headers(CATALOG.APP, [STATE, NAME_COL, NAMESPACE, CHART, CHART_UPGRADE, APP_SUMMARY, AGE]);
+  headers(CATALOG.APP,
+    [STATE, NAME_COL, NAMESPACE, CHART, CHART_UPGRADE, APP_SUMMARY, AGE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, {
+      ...CHART,
+      sort:   ['spec.chart.metadata.name'],
+      search: ['spec.chart.metadata.name'],
+    }, {
+      ...CHART_UPGRADE,
+      sort:   false,
+      search: false,
+    },
+    APP_SUMMARY,
+    STEVE_AGE_COL]
+  );
   headers(CATALOG.REPO, [STATE, NAME_COL, NAMESPACE, repoType, repoUrl, repoBranch, AGE]);
-  headers(CATALOG.CLUSTER_REPO, [STATE, NAME_COL, repoType, repoUrl, repoBranch, AGE]);
+  headers(CATALOG.CLUSTER_REPO,
+    [STATE, NAME_COL, repoType, repoUrl, repoBranch, AGE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, {
+      ...repoType,
+      sort:   false,
+      search: false,
+    }, {
+      ...repoUrl,
+      sort:   false,
+      search: false,
+    },
+    repoBranch]
+  );
+
+  const opAction = {
+    name:     'action',
+    label:    'Action',
+    sort:     'status.action',
+    value:    'status.action',
+    labelKey: 'catalog.operation.tableHeaders.action',
+  };
+  const opReleaseNs = {
+    name:     'releaseNamespace',
+    label:    'Tgt Namespace',
+    sort:     'status.namespace',
+    value:    'status.namespace',
+    labelKey: 'catalog.operation.tableHeaders.releaseNamespace',
+  };
+  const opReleaseName = {
+    name:     'releaseName',
+    label:    'Tgt Release',
+    sort:     'status.releaseName',
+    value:    'status.releaseName',
+    labelKey: 'catalog.operation.tableHeaders.releaseName',
+  };
+
   headers(CATALOG.OPERATION, [
     STATE,
     NAME_COL,
     NAMESPACE,
-    {
-      name:     'action',
-      label:    'Action',
-      sort:     'status.action',
-      value:    'status.action',
-      labelKey: 'catalog.operation.tableHeaders.action',
-    },
-    {
-      name:     'releaseNamespace',
-      label:    'Tgt Namespace',
-      sort:     'status.namespace',
-      value:    'status.namespace',
-      labelKey: 'catalog.operation.tableHeaders.releaseNamespace',
-    },
-    {
-      name:     'releaseName',
-      label:    'Tgt Release',
-      sort:     'status.releaseName',
-      value:    'status.releaseName',
-      labelKey: 'catalog.operation.tableHeaders.releaseName',
-    },
+    opAction,
+    opReleaseNs,
+    opReleaseName,
     AGE
+  ],
+  [
+    STEVE_STATE_COL,
+    STEVE_NAME_COL,
+    STEVE_NAMESPACE_COL,
+    opAction,
+    opReleaseNs,
+    opReleaseName,
+    STEVE_AGE_COL
   ]);
 }
-
-//   name:      'cpu',
-//   labelKey:  'tableHeaders.cpu',
-//   sort:      'cpu',
-//   value:     'cpuUsagePercentage',
-//   formatter: 'PercentageBar'
-// };

package/config/product/explorer.js

@@ -19,18 +19,19 @@ import {
   USER_ID, USERNAME, USER_DISPLAY_NAME, USER_PROVIDER, USER_LAST_LOGIN, USER_DISABLED_IN, USER_DELETED_IN, WORKLOAD_ENDPOINTS, STORAGE_CLASS_DEFAULT,
   STORAGE_CLASS_PROVISIONER, PERSISTENT_VOLUME_SOURCE,
   HPA_REFERENCE, MIN_REPLICA, MAX_REPLICA, CURRENT_REPLICA,
-  ACCESS_KEY, DESCRIPTION, EXPIRES, EXPIRY_STATE, SUB_TYPE, AGE_NORMAN, SCOPE_NORMAN, PERSISTENT_VOLUME_CLAIM, RECLAIM_POLICY, PV_REASON, WORKLOAD_HEALTH_SCALE, POD_RESTARTS,
+  ACCESS_KEY, DESCRIPTION, EXPIRES, EXPIRY_STATE, LAST_USED, SUB_TYPE, AGE_NORMAN, SCOPE_NORMAN, PERSISTENT_VOLUME_CLAIM, RECLAIM_POLICY, PV_REASON, WORKLOAD_HEALTH_SCALE, POD_RESTARTS,
   DURATION, MESSAGE, REASON, LAST_SEEN_TIME, EVENT_TYPE, OBJECT, ROLE, ROLES, VERSION, INTERNAL_EXTERNAL_IP, KUBE_NODE_OS, CPU, RAM, SECRET_DATA
 } from '@shell/config/table-headers';
 
 import { DSL } from '@shell/store/type-map';
 import {
-  STEVE_AGE_COL, STEVE_LIST_GROUPS, STEVE_NAMESPACE_COL, STEVE_NAME_COL, STEVE_STATE_COL
+  STEVE_AGE_COL, STEVE_EVENT_OBJECT, STEVE_LIST_GROUPS, STEVE_NAMESPACE_COL, STEVE_NAME_COL, STEVE_STATE_COL
 } from '@shell/config/pagination-table-headers';
 
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 import { STEVE_CACHE } from '@shell/store/features';
 import { configureConditionalDepaginate } from '@shell/store/type-map.utils';
+import { CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotations';
 
 export const NAME = 'explorer';
 
@@ -81,6 +82,7 @@ export function init(store) {
     POD_DISRUPTION_BUDGET,
     RESOURCE_QUOTA,
   ], 'policy');
+
   basicType([
     SERVICE,
     INGRESS,
@@ -216,7 +218,25 @@ export function init(store) {
    */
   configureType(MANAGEMENT.PSA, { localOnly: true });
 
-  headers(PV, [STATE, NAME_COL, RECLAIM_POLICY, PERSISTENT_VOLUME_CLAIM, PERSISTENT_VOLUME_SOURCE, PV_REASON, AGE]);
+  headers(PV,
+    [STATE, NAME_COL, RECLAIM_POLICY, PERSISTENT_VOLUME_CLAIM, PERSISTENT_VOLUME_SOURCE, PV_REASON, AGE],
+    [
+      STEVE_STATE_COL,
+      STEVE_NAME_COL,
+      RECLAIM_POLICY,
+      {
+        ...PERSISTENT_VOLUME_CLAIM,
+        sort:   ['metadata.fields.5'],
+        search: ['metadata.fields.5'],
+      }, {
+        ...PERSISTENT_VOLUME_SOURCE,
+        sort:   false,
+        search: false,
+      },
+      PV_REASON,
+      STEVE_AGE_COL,
+    ]
+  );
 
   headers(CONFIG_MAP,
     [NAME_COL, NAMESPACE_COL, KEYS, AGE],
@@ -254,18 +274,142 @@ export function init(store) {
     STEVE_AGE_COL
   ]);
 
-  headers(INGRESS, [STATE, NAME_COL, NAMESPACE_COL, INGRESS_TARGET, INGRESS_DEFAULT_BACKEND, INGRESS_CLASS, AGE]);
-  headers(SERVICE, [STATE, NAME_COL, NAMESPACE_COL, TARGET_PORT, SELECTOR, SPEC_TYPE, AGE]);
-  headers(EVENT, [STATE, { ...LAST_SEEN_TIME, defaultSort: true }, EVENT_TYPE, REASON, OBJECT, 'Subobject', 'Source', MESSAGE, 'First Seen', 'Count', NAME_COL, NAMESPACE_COL]);
-  headers(HPA, [STATE, NAME_COL, HPA_REFERENCE, MIN_REPLICA, MAX_REPLICA, CURRENT_REPLICA, AGE]);
+  headers(INGRESS,
+    [STATE, NAME_COL, NAMESPACE_COL, INGRESS_TARGET, INGRESS_DEFAULT_BACKEND, INGRESS_CLASS, AGE],
+    [
+      STEVE_STATE_COL,
+      STEVE_NAME_COL,
+      STEVE_NAMESPACE_COL,
+      {
+        ...INGRESS_TARGET,
+        sort:   'spec.rules[0].host', // Pending API support https://github.com/rancher/rancher/issues/48473 (index fields)
+        search: false, // This is broken in normal world, so disable here
+      },
+      {
+        ...INGRESS_DEFAULT_BACKEND,
+        sort:   false,
+        search: false,
+      },
+      {
+        ...INGRESS_CLASS,
+        sort:   'spec.ingressClassName',
+        search: 'spec.ingressClassName', // Pending API support  (blocked https://github.com/rancher/rancher/issues/48473 (index fields)
+      },
+      STEVE_AGE_COL
+    ]
+  );
+
+  headers(SERVICE,
+    [STATE, NAME_COL, NAMESPACE_COL, TARGET_PORT, SELECTOR, SPEC_TYPE, AGE],
+    [
+      STEVE_STATE_COL,
+      STEVE_NAME_COL,
+      STEVE_NAMESPACE_COL,
+      TARGET_PORT,
+      {
+        // Selector is an object. This is broken in non-SSP world anyway (won't sort on object, filtering on `$[x][y]` paths are broken )
+        ...SELECTOR,
+        sort:   false,
+        search: false,
+      },
+      {
+        ...SPEC_TYPE,
+        sort:   false, // ['spec.type', 'spec.clusterIP'] Pending API support  (blocked https://github.com/rancher/rancher/issues/48473 (index fields)
+        search: 'spec.type',
+      },
+      STEVE_AGE_COL
+    ]
+  );
+
+  const eventLastSeenTime = {
+    ...LAST_SEEN_TIME,
+    defaultSort: true,
+  };
+
+  headers(EVENT,
+    [STATE, eventLastSeenTime, EVENT_TYPE, REASON, OBJECT, 'Subobject', 'Source', MESSAGE, 'First Seen', 'Count', NAME_COL, NAMESPACE_COL],
+    [
+      STEVE_STATE_COL, {
+        ...eventLastSeenTime,
+        value: 'metadata.fields.0',
+        sort:  'metadata.fields.0',
+      }, {
+        ...EVENT_TYPE,
+        value: '_type',
+        sort:  '_type',
+      },
+      REASON,
+      STEVE_EVENT_OBJECT,
+      'Subobject',
+      'Source',
+      MESSAGE,
+      'First Seen',
+      'Count',
+      STEVE_NAME_COL,
+      STEVE_NAMESPACE_COL,
+    ]
+  );
+  headers(HPA,
+    [STATE, NAME_COL, NAMESPACE_COL, HPA_REFERENCE, MIN_REPLICA, MAX_REPLICA, CURRENT_REPLICA, AGE],
+    [
+      STEVE_STATE_COL,
+      STEVE_NAME_COL,
+      STEVE_NAMESPACE_COL,
+      HPA_REFERENCE, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      MIN_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      MAX_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      CURRENT_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      STEVE_AGE_COL
+    ]
+  );
+
+  const STEVE_WORKLOAD_ENDPOINTS = {
+    ...WORKLOAD_ENDPOINTS,
+    sort:   [`metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]`],
+    search: [`metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]`],
+  };
+
+  const createSteveWorkloadImageCol = (resourceFieldPos) => ({
+    ...WORKLOAD_IMAGES,
+    sort:   `metadata.fields.${ resourceFieldPos }`,
+    search: `metadata.fields.${ resourceFieldPos }`,
+  });
+
   headers(WORKLOAD, [STATE, NAME_COL, NAMESPACE_COL, TYPE, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
-  headers(WORKLOAD_TYPES.DEPLOYMENT, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Up-to-date', 'Available', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
-  headers(WORKLOAD_TYPES.DAEMON_SET, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
-  headers(WORKLOAD_TYPES.REPLICA_SET, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
-  headers(WORKLOAD_TYPES.STATEFUL_SET, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
-  headers(WORKLOAD_TYPES.JOB, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Completions', DURATION, POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
-  headers(WORKLOAD_TYPES.CRON_JOB, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Schedule', 'Last Schedule', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
-  headers(WORKLOAD_TYPES.REPLICATION_CONTROLLER, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
+  headers(WORKLOAD_TYPES.DEPLOYMENT,
+    [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Up-to-date', 'Available', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(6), STEVE_WORKLOAD_ENDPOINTS, 'Ready', 'Up-to-date', 'Available', STEVE_AGE_COL],
+  );
+  headers(WORKLOAD_TYPES.DAEMON_SET,
+    [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(9), STEVE_WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', STEVE_AGE_COL]
+  );
+  headers(WORKLOAD_TYPES.REPLICA_SET,
+    [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(6), STEVE_WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', STEVE_AGE_COL],
+  );
+  headers(WORKLOAD_TYPES.STATEFUL_SET,
+    [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(4), STEVE_WORKLOAD_ENDPOINTS, 'Ready', STEVE_AGE_COL],
+  );
+  headers(WORKLOAD_TYPES.JOB,
+    [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Completions', DURATION, POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(6), STEVE_WORKLOAD_ENDPOINTS, 'Completions', {
+      ...DURATION,
+      value:     'metadata.fields.3',
+      sort:      false,
+      search:    'metadata.fields.3',
+      formatter: undefined, // Now that sort/search is remote we're not doing weird things with start time (see `duration` in model)
+    }, STEVE_AGE_COL],
+  );
+  headers(WORKLOAD_TYPES.CRON_JOB,
+    [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Schedule', 'Last Schedule', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(8), STEVE_WORKLOAD_ENDPOINTS, 'Schedule', 'Last Schedule', STEVE_AGE_COL]
+  );
+  headers(WORKLOAD_TYPES.REPLICATION_CONTROLLER,
+    [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(6), STEVE_WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', STEVE_AGE_COL],
+  );
 
   headers(POD,
     [STATE, NAME_COL, NAMESPACE_COL, POD_IMAGES, 'Ready', 'Restarts', 'IP', NODE_COL, AGE],
@@ -281,7 +425,8 @@ export function init(store) {
         search: 'spec.nodeName'
       },
       STEVE_AGE_COL
-    ]);
+    ]
+  );
 
   headers(NODE,
     [
@@ -341,13 +486,32 @@ export function init(store) {
         search:     false,
       },
       STEVE_AGE_COL
-    ]);
+    ]
+  );
 
   headers(MANAGEMENT.PSA, [STATE, NAME_COL, {
     ...DESCRIPTION,
     width: undefined
   }, AGE]);
-  headers(STORAGE_CLASS, [STATE, NAME_COL, STORAGE_CLASS_PROVISIONER, STORAGE_CLASS_DEFAULT, AGE]);
+
+  headers(STORAGE_CLASS,
+    [STATE, NAME_COL, STORAGE_CLASS_PROVISIONER, STORAGE_CLASS_DEFAULT, AGE],
+    [
+      STEVE_STATE_COL,
+      STEVE_NAME_COL,
+      {
+        ...STORAGE_CLASS_PROVISIONER,
+        sort:   ['provisioner'],
+        search: ['provisioner']
+      },
+      {
+        ...STORAGE_CLASS_DEFAULT,
+        sort:   false, // [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`], // Pending API Support - https://github.com/rancher/rancher/issues/48453
+        search: false, // [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`], // Pending API Support - https://github.com/rancher/rancher/issues/48453
+      },
+      STEVE_AGE_COL
+    ]
+  );
 
   configureType(MANAGEMENT.CLUSTER_ROLE_TEMPLATE_BINDING, {
     listGroups: [
@@ -378,6 +542,7 @@ export function init(store) {
     ACCESS_KEY,
     DESCRIPTION,
     SCOPE_NORMAN,
+    LAST_USED,
     EXPIRES,
     AGE_NORMAN
   ]);

package/config/product/settings.js

@@ -6,6 +6,7 @@ import {
   RESTART,
   NAME_UNLINKED,
 } from '@shell/config/table-headers';
+import { getVendor } from '@shell/config/private-label';
 
 export const NAME = 'settings';
 
@@ -142,11 +143,18 @@ export function init(store) {
     canYaml:     true,
   });
 
+  // Change the restart header to 'Restart <VENDOR>' so that it is clearer what is being restarted
+  const t = store.getters['i18n/t'];
+
   headers(MANAGEMENT.FEATURE, [
     STATE,
     NAME_UNLINKED,
     FEATURE_DESCRIPTION,
-    RESTART,
+    {
+      ...RESTART,
+      labelKey: undefined,
+      label:    t('tableHeaders.restartSystem', { vendor: getVendor() })
+    }
   ]);
 
   hideBulkActions(MANAGEMENT.FEATURE, true);

package/config/router/routes.js

@@ -25,7 +25,6 @@ export default [
   {
     path:      '/',
     component: () => interopDefault(import('@shell/pages/index.vue')),
-    name:      'index',
     meta:      { requiresAuthentication: true },
     children:  [
       {

package/config/settings.ts

@@ -1,7 +1,16 @@
 // Settings
 import { GC_DEFAULTS, GC_PREFERENCES } from '@shell/utils/gc/gc-types';
 import { PaginationSettings } from '@shell/types/resources/settings';
-import { CAPI, MANAGEMENT } from '@shell/config/types';
+import {
+  CAPI, MANAGEMENT, EVENT, CATALOG, HPA, INGRESS, SERVICE,
+  CONFIG_MAP,
+  SECRET,
+  POD, NODE,
+  STORAGE_CLASS,
+  PVC,
+  PV,
+  WORKLOAD_TYPES
+} from '@shell/config/types';
 
 interface GlobalSettingRuleset {
   name: string,
@@ -250,7 +259,16 @@ export const DEFAULT_PERF_SETTING: PerfSettings = {
         resources: {
           enableAll:  false,
           enableSome: {
-            enabled: ['configmap', 'secret', 'pod', 'node'],
+            // if a resource list is shown by a custom resource list component or has specific list headers then it's not generically shown
+            // and must be included here.
+            enabled: [
+              NODE, EVENT,
+              WORKLOAD_TYPES.CRON_JOB, WORKLOAD_TYPES.DAEMON_SET, WORKLOAD_TYPES.DEPLOYMENT, WORKLOAD_TYPES.JOB, WORKLOAD_TYPES.STATEFUL_SET, POD,
+              CATALOG.APP, CATALOG.CLUSTER_REPO, CATALOG.OPERATION,
+              HPA, INGRESS, SERVICE,
+              PV, CONFIG_MAP, STORAGE_CLASS, PVC, SECRET,
+              WORKLOAD_TYPES.REPLICA_SET, WORKLOAD_TYPES.REPLICATION_CONTROLLER
+            ],
             generic: true,
           }
         }

package/config/table-headers.js

@@ -82,7 +82,7 @@ export const EFFECT = {
 export const STORAGE_CLASS_PROVISIONER = {
   name:     'storage_class_provisioner',
   labelKey: 'tableHeaders.storage_class_provisioner',
-  value:    'provisionerDisplay',
+  value:    'provisionerListDisplay',
   sort:     ['provisioner'],
 };
 
@@ -94,6 +94,9 @@ export const STORAGE_CLASS_DEFAULT = {
   formatter: 'Checked',
 };
 
+/**
+ * spec.csi.driver OR spec[known driver type]
+ */
 export const PERSISTENT_VOLUME_SOURCE = {
   name:     'persistent_volume_source',
   labelKey: 'tableHeaders.persistentVolumeSource',
@@ -101,13 +104,16 @@ export const PERSISTENT_VOLUME_SOURCE = {
   sort:     ['provisioner'],
 };
 
+/**
+ * Link to the PVC associated with PV
+ */
 export const PERSISTENT_VOLUME_CLAIM = {
   name:          'persistent-volume-claim',
   labelKey:      'tableHeaders.persistentVolumeClaim',
-  sort:          ['nameSort'],
+  sort:          ['claimName'],
   value:         'claimName',
   formatter:     'LinkDetail',
-  formatterOpts: { reference: 'claim.detailLocation' },
+  formatterOpts: { reference: 'claim.detailLocation' }
 };
 
 export const OUTPUT = {
@@ -320,15 +326,6 @@ export const POD_RESTARTS = {
   liveUpdates:  true
 };
 
-export const ENDPOINTS = {
-  name:      'endpoint',
-  labelKey:  'tableHeaders.endpoints',
-  value:     'status.endpoints',
-  formatter: 'Endpoints',
-  width:     60,
-  align:     'center',
-};
-
 export const SCALE = {
   name:      'scale',
   labelKey:  'tableHeaders.scale',
@@ -657,8 +654,8 @@ export const TARGET_PORT = {
   formatter: 'ServiceTargets',
   labelKey:  'tableHeaders.targetPort',
   name:      'targetPort',
-  sort:      `$['spec']['targetPort']`,
-  value:     `$['spec']['targetPort']`,
+  sort:      false,
+  value:     false,
 };
 
 export const SELECTOR = {
@@ -963,13 +960,24 @@ export const EXPIRES = {
   formatter: 'LiveExpiryDate'
 };
 
+export const LAST_USED = {
+  name:          'lastUsed',
+  value:         'lastUsedAt',
+  labelKey:      'tableHeaders.lastUsed',
+  align:         'left',
+  sort:          ['lastUsedAt'],
+  width:         200,
+  formatter:     'LiveExpiryDate',
+  formatterOpts: { missingKey: 'generic.unknown' },
+};
+
 export const RESTART = {
   name:      'restart',
   labelKey:  'tableHeaders.restart',
   value:     'restartRequired',
   sort:      ['restartRequired', 'nameSort'],
   formatter: 'Checked',
-  width:     75,
+  width:     125,
   align:     'center'
 };
 

package/config/types.js

@@ -333,7 +333,8 @@ export const AUTH_TYPE = {
   _NONE:  '_none',
   _BASIC: '_basic',
   _SSH:   '_ssh',
-  _S3:    '_S3'
+  _S3:    '_S3',
+  _RKE:   '_RKE',
 };
 
 export const LOCAL_CLUSTER = 'local';

package/edit/__tests__/fleet.cattle.io.gitrepo.test.ts

@@ -33,12 +33,21 @@ describe('view: fleet.cattle.io.gitrepo should', () => {
     global: { mocks }
   });
 
-  it('should have self-healing checkbox and banner', () => {
+  it('should have self-healing checkbox and tooltip', () => {
     const correctDriftCheckbox = wrapper.find('[data-testid="GitRepo-correctDrift-checkbox"]');
-    const correctDriftBanner = wrapper.find('[data-testid="GitRepo-correctDrift-banner"]');
+    const tooltip = wrapper.find('[data-testid="GitRepo-correctDrift-checkbox"]');
 
+    expect(tooltip.element.classList).toContain('v-popper--has-tooltip');
+    expect(correctDriftCheckbox.exists()).toBeTruthy();
+    expect(correctDriftCheckbox.attributes().value).toBeFalsy();
+  });
+
+  it('should have keep-resources checkbox and tooltip', () => {
+    const correctDriftCheckbox = wrapper.find('[data-testid="GitRepo-keepResources-checkbox"]');
+    const tooltip = wrapper.find('[data-testid="GitRepo-keepResources-checkbox"]');
+
+    expect(tooltip.element.classList).toContain('v-popper--has-tooltip');
     expect(correctDriftCheckbox.exists()).toBeTruthy();
-    expect(correctDriftBanner.exists()).toBeTruthy();
     expect(correctDriftCheckbox.attributes().value).toBeFalsy();
   });