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

package/components/form/__tests__/SchedulingCustomization.test.ts

@@ -0,0 +1,240 @@
+import { mount } from '@vue/test-utils';
+import { nextTick } from 'vue';
+import SchedulingCustomization from '@shell/components/form/SchedulingCustomization.vue';
+import { AGENT_CONFIGURATION_TYPES } from '@shell/config/settings';
+import { _CREATE, _EDIT } from '@shell/config/query-params';
+
+const mockStore = { getters: { 'i18n/t': jest.fn().mockImplementation((key: string) => key) } };
+
+const createWrapper = (propsData: any = {}) => {
+  return mount(SchedulingCustomization, {
+    propsData: {
+      type:       AGENT_CONFIGURATION_TYPES.CLUSTER,
+      feature:    true,
+      mode:       _CREATE,
+      defaultPC:  { value: 100, preemptionPolicy: 'PreemptLowerPriority' },
+      defaultPDB: { maxUnavailable: 1 },
+      ...propsData
+    },
+    global: {
+      mocks: {
+        $store: mockStore,
+        t:      jest.fn().mockImplementation((key: string) => key)
+      }
+    }
+  });
+};
+
+describe('component: SchedulingCustomization - Agent Type Support', () => {
+  let wrapper: any;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  afterEach(() => {
+    if (wrapper) {
+      wrapper.unmount();
+    }
+  });
+
+  describe('agent Type Prop', () => {
+    it('should accept and use CLUSTER agent type', () => {
+      wrapper = createWrapper({ type: AGENT_CONFIGURATION_TYPES.CLUSTER });
+
+      expect(wrapper.vm.type).toBe(AGENT_CONFIGURATION_TYPES.CLUSTER);
+    });
+
+    it('should accept and use FLEET agent type', () => {
+      wrapper = createWrapper({ type: AGENT_CONFIGURATION_TYPES.FLEET });
+
+      expect(wrapper.vm.type).toBe(AGENT_CONFIGURATION_TYPES.FLEET);
+    });
+
+    it('should emit scheduling-customization-changed event with correct agent type for CLUSTER', async() => {
+      wrapper = createWrapper({ type: AGENT_CONFIGURATION_TYPES.CLUSTER });
+
+      const checkbox = wrapper.findComponent('[data-testid="scheduling-customization-checkbox"]');
+
+      await checkbox.vm.$emit('update:value', true);
+
+      expect(wrapper.emitted('scheduling-customization-changed')).toBeTruthy();
+      expect(wrapper.emitted('scheduling-customization-changed')[0][0]).toStrictEqual({
+        event:     true,
+        agentType: AGENT_CONFIGURATION_TYPES.CLUSTER
+      });
+    });
+
+    it('should emit scheduling-customization-changed event with correct agent type for FLEET', async() => {
+      wrapper = createWrapper({ type: AGENT_CONFIGURATION_TYPES.FLEET });
+
+      const checkbox = wrapper.findComponent('[data-testid="scheduling-customization-checkbox"]');
+
+      await checkbox.vm.$emit('update:value', false);
+
+      expect(wrapper.emitted('scheduling-customization-changed')).toBeTruthy();
+      expect(wrapper.emitted('scheduling-customization-changed')[0][0]).toStrictEqual({
+        event:     false,
+        agentType: AGENT_CONFIGURATION_TYPES.FLEET
+      });
+    });
+  });
+
+  describe('settings Mismatch Detection', () => {
+    it('should detect priority class value mismatch', () => {
+      const value = {
+        priorityClass:       { value: 200, preemptionPolicy: 'PreemptLowerPriority' },
+        podDisruptionBudget: { maxUnavailable: 1 }
+      };
+
+      wrapper = createWrapper({
+        value,
+        defaultPC: { value: 100, preemptionPolicy: 'PreemptLowerPriority' },
+        mode:      _EDIT
+      });
+
+      expect(wrapper.vm.settingMissmatch).toBe(true);
+    });
+
+    it('should detect priority class preemption policy mismatch', () => {
+      const value = {
+        priorityClass:       { value: 100, preemptionPolicy: 'Never' },
+        podDisruptionBudget: { maxUnavailable: 1 }
+      };
+
+      wrapper = createWrapper({
+        value,
+        defaultPC: { value: 100, preemptionPolicy: 'PreemptLowerPriority' },
+        mode:      _EDIT
+      });
+
+      expect(wrapper.vm.settingMissmatch).toBe(true);
+    });
+
+    it('should detect pod disruption budget maxUnavailable mismatch', () => {
+      const value = {
+        priorityClass:       { value: 100, preemptionPolicy: 'PreemptLowerPriority' },
+        podDisruptionBudget: { maxUnavailable: 2 }
+      };
+
+      wrapper = createWrapper({
+        value,
+        defaultPDB: { maxUnavailable: 1 },
+        mode:       _EDIT
+      });
+
+      expect(wrapper.vm.settingMissmatch).toBe(true);
+    });
+
+    it('should detect pod disruption budget minAvailable mismatch', () => {
+      const value = {
+        priorityClass:       { value: 100, preemptionPolicy: 'PreemptLowerPriority' },
+        podDisruptionBudget: { minAvailable: 2 }
+      };
+
+      wrapper = createWrapper({
+        value,
+        defaultPDB: { minAvailable: 1 },
+        mode:       _EDIT
+      });
+
+      expect(wrapper.vm.settingMissmatch).toBe(true);
+    });
+
+    it('should not detect mismatch when values match defaults', () => {
+      const value = {
+        priorityClass:       { value: 100, preemptionPolicy: 'PreemptLowerPriority' },
+        podDisruptionBudget: { maxUnavailable: 1 }
+      };
+
+      wrapper = createWrapper({
+        value,
+        defaultPC:  { value: 100, preemptionPolicy: 'PreemptLowerPriority' },
+        defaultPDB: { maxUnavailable: 1 },
+        mode:       _EDIT
+      });
+
+      expect(wrapper.vm.settingMissmatch).toBe(false);
+    });
+
+    it('should not detect mismatch when no value is provided', () => {
+      wrapper = createWrapper({
+        value: undefined,
+        mode:  _EDIT
+      });
+
+      expect(wrapper.vm.settingMissmatch).toBe(false);
+    });
+  });
+
+  describe('component State', () => {
+    it('should be enabled when value is provided', () => {
+      const value = {
+        priorityClass:       { value: 100 },
+        podDisruptionBudget: { maxUnavailable: 1 }
+      };
+
+      wrapper = createWrapper({ value });
+
+      expect(wrapper.vm.enabled).toBe(true);
+    });
+
+    it('should be disabled when no value is provided', () => {
+      wrapper = createWrapper({ value: undefined });
+
+      expect(wrapper.vm.enabled).toBe(false);
+    });
+
+    it('should detect edit mode correctly', () => {
+      wrapper = createWrapper({ mode: _EDIT });
+
+      expect(wrapper.vm.isEdit).toBe(true);
+    });
+
+    it('should detect create mode correctly', () => {
+      wrapper = createWrapper({ mode: _CREATE });
+
+      expect(wrapper.vm.isEdit).toBe(false);
+    });
+  });
+
+  describe('banner Display in Edit Mode', () => {
+    it('should show banner when in edit mode and settings mismatch', async() => {
+      const value = {
+        priorityClass:       { value: 200, preemptionPolicy: 'PreemptLowerPriority' },
+        podDisruptionBudget: { maxUnavailable: 1 }
+      };
+
+      wrapper = createWrapper({
+        value,
+        defaultPC: { value: 100, preemptionPolicy: 'PreemptLowerPriority' },
+        mode:      _EDIT,
+        feature:   true
+      });
+
+      await nextTick();
+
+      // The banner should be available in the template when conditions are met
+      expect(wrapper.vm.settingMissmatch).toBe(true);
+      expect(wrapper.vm.isEdit).toBe(true);
+      expect(wrapper.vm.feature).toBe(true);
+    });
+
+    it('should not show banner when not in edit mode', () => {
+      const value = {
+        priorityClass:       { value: 200, preemptionPolicy: 'PreemptLowerPriority' },
+        podDisruptionBudget: { maxUnavailable: 1 }
+      };
+
+      wrapper = createWrapper({
+        value,
+        defaultPC: { value: 100, preemptionPolicy: 'PreemptLowerPriority' },
+        mode:      _CREATE,
+        feature:   true
+      });
+
+      expect(wrapper.vm.isEdit).toBe(false);
+      // Banner should not show because not in edit mode
+    });
+  });
+});

package/components/formatter/ClusterLink.vue

@@ -15,6 +15,10 @@ export default {
     reference: {
       type:    String,
       default: null,
+    },
+    getCustomDetailLink: {
+      type:    Function,
+      default: null
     }
   },
   computed: {
@@ -23,6 +27,10 @@ export default {
         return get(this.row, this.reference);
       }
 
+      if (this.getCustomDetailLink) {
+        return this.getCustomDetailLink(this.row);
+      }
+
       return this.row?.detailLocation;
     },
 

package/components/formatter/SecretOrigin.vue

@@ -0,0 +1,79 @@
+<script>
+import { MANAGEMENT } from '@shell/config/types';
+import { STORE } from '@shell/store/store-types';
+import { mapGetters } from 'vuex';
+
+export default {
+  props: {
+    row: {
+      type:     Object,
+      required: true
+    },
+  },
+  async fetch() {
+    if (this.row.isProjectScoped && this.currentCluster?.isLocal) {
+      const id = this.row.projectScopedClusterId;
+
+      if (id && !this.$store.getters[`${ STORE.MANAGEMENT }/byId`](MANAGEMENT.CLUSTER, id)) {
+        try {
+          await this.$store.dispatch(`${ STORE.MANAGEMENT }/find`, { type: MANAGEMENT.CLUSTER, id });
+        } catch (e) {
+          // Ignore error
+        }
+      }
+    }
+  },
+  computed: {
+    ...mapGetters(['currentCluster']),
+    originText() {
+      if (this.row.isProjectScoped) {
+        return this.t('secret.projectScoped.origin.source');
+      } else if (this.row.isProjectSecretCopy) {
+        return this.t('secret.projectScoped.origin.copy');
+      }
+
+      return '';
+    },
+    tooltip() {
+      if (this.row.isProjectScoped) {
+        const projectName = this.row.project?.nameDisplay || this.row.projectScopedProjectId;
+        const clusterName = this.row.projectCluster?.nameDisplay || this.row.projectScopedClusterId;
+
+        return this.t('secret.projectScoped.tooltip.source', { project: projectName, cluster: clusterName });
+      } else if (this.row.isProjectSecretCopy) {
+        const projectID = this.row.projectScopedProjectId;
+        const clusterId = this.currentCluster?.id;
+
+        // Try to fetch the project.
+        // Note: The management store might not have the project loaded if we haven't visited the cluster list or project list.
+        // However, if we are in the dashboard, we usually have projects loaded.
+        const project = this.$store.getters[`${ STORE.MANAGEMENT }/byId`](MANAGEMENT.PROJECT, `${ clusterId }/${ projectID }`);
+        const projectName = project?.nameDisplay || projectID;
+
+        return this.t('secret.projectScoped.tooltip.copy', { secret: this.row.nameDisplay, project: projectName });
+      }
+
+      return null;
+    }
+  }
+};
+</script>
+
+<template>
+  <div
+    v-if="originText"
+    v-clean-tooltip="tooltip"
+    class="secret-origin"
+  >
+    {{ originText }}
+  </div>
+  <div v-else>
+    —
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.secret-origin {
+  white-space: nowrap;
+}
+</style>

package/config/labels-annotations.js

@@ -108,12 +108,13 @@ export const CATALOG = {
   _CLUSTER_TPL:  'cluster-template',
   _CLUSTER_TOOL: 'cluster-tool',
 
-  COMPONENT:         'catalog.cattle.io/ui-component',
-  SOURCE_REPO_TYPE:  'catalog.cattle.io/ui-source-repo-type',
-  SOURCE_REPO_NAME:  'catalog.cattle.io/ui-source-repo',
-  COLOR:             'catalog.cattle.io/ui-color',
-  DISPLAY_NAME:      'catalog.cattle.io/display-name',
-  CLUSTER_REPO_NAME: 'catalog.cattle.io/cluster-repo-name',
+  COMPONENT:           'catalog.cattle.io/ui-component',
+  SOURCE_REPO_TYPE:    'catalog.cattle.io/ui-source-repo-type',
+  SOURCE_REPO_NAME:    'catalog.cattle.io/ui-source-repo',
+  COLOR:               'catalog.cattle.io/ui-color',
+  DISPLAY_NAME:        'catalog.cattle.io/display-name',
+  CLUSTER_REPO_NAME:   'catalog.cattle.io/cluster-repo-name',
+  SUSE_APP_COLLECTION: 'catalog.cattle.io/suse-application-collection',
 
   SUPPORTED_OS: 'catalog.cattle.io/os',
   PERMITTED_OS: 'catalog.cattle.io/permits-os',

package/config/pagination-table-headers.js

@@ -3,7 +3,7 @@ import {
   STATE, NAME as NAME_COL, NAMESPACE as NAMESPACE_COL, AGE, OBJECT,
   EVENT_LAST_SEEN_TIME,
   EVENT_TYPE,
-  SECRET_CLONE,
+  SECRET_ORIGIN,
   EVENT_FIRST_SEEN_TIME
 } from '@shell/config/table-headers';
 
@@ -89,7 +89,9 @@ export const STEVE_LIST_GROUPS = [{
   groupLabelKey: 'groupByLabel',
 }];
 
-export const STEVE_SECRET_CLONE = {
-  ...SECRET_CLONE,
-  sort: `metadata.annotations[${ UI_PROJECT_SECRET_COPY }]`,
+export const STEVE_SECRET_ORIGIN = {
+  ...SECRET_ORIGIN,
+  // We can't sort by the 'UI_PROJECT_SECRET' label (management.cattle.io/project-scoped-secret) due to backend limitations.
+  // So we sort by the 'UI_PROJECT_SECRET_COPY' annotation (management.cattle.io/project-scoped-secret-copy) which at least groups the copies.
+  sort: `metadata.annotations[${ UI_PROJECT_SECRET_COPY }]:desc`,
 };

package/config/product/explorer.js

@@ -19,7 +19,7 @@ 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, LAST_USED, SUB_TYPE, AGE_NORMAN, SCOPE_NORMAN, PERSISTENT_VOLUME_CLAIM, RECLAIM_POLICY, PV_REASON, WORKLOAD_HEALTH_SCALE, POD_RESTARTS,
+  DESCRIPTION, SUB_TYPE, PERSISTENT_VOLUME_CLAIM, RECLAIM_POLICY, PV_REASON, WORKLOAD_HEALTH_SCALE, POD_RESTARTS,
   DURATION, MESSAGE, REASON, EVENT_TYPE, OBJECT, ROLE, ROLES, VERSION, INTERNAL_EXTERNAL_IP, KUBE_NODE_OS, CPU, RAM, SECRET_DATA,
   EVENT_LAST_SEEN_TIME,
   EVENT_FIRST_SEEN_TIME,
@@ -546,16 +546,6 @@ export function init(store) {
     AGE
   ]);
 
-  headers(NORMAN.TOKEN, [
-    EXPIRY_STATE,
-    ACCESS_KEY,
-    DESCRIPTION,
-    SCOPE_NORMAN,
-    LAST_USED,
-    EXPIRES,
-    AGE_NORMAN
-  ]);
-
   virtualType({
     label:      store.getters['i18n/t']('clusterIndexPage.header'),
     group:      'Root',

package/config/query-params.js

@@ -94,3 +94,6 @@ export const SECRET_QUERY_PARAMS = {
 export const SECRET_SCOPE = 'scope';
 // RANCHER OIDC CLIENT
 export const RANCHER_AS_OIDC_QUERY_PARAMS = ['scope', 'client_id', 'redirect_uri', 'response_type'];
+
+// For REPOSITORIES, to determine which type of repo to create, used on clusterrepo create page
+export const TARGET = 'target';

package/config/settings.ts

@@ -2,6 +2,11 @@
 import { GC_DEFAULTS, GC_PREFERENCES } from '@shell/utils/gc/gc-types';
 import { PaginationSettings } from '@shell/types/resources/settings';
 
+export const AGENT_CONFIGURATION_TYPES = {
+  CLUSTER: 'cluster',
+  FLEET:   'fleet'
+} as const;
+
 interface GlobalSettingRuleset {
   name: string,
   key?: string | number,
@@ -17,6 +22,7 @@ interface GlobalSetting {
     kind?: string,
     options?: string[]
     readOnly?: boolean,
+    agent?: typeof AGENT_CONFIGURATION_TYPES.CLUSTER | typeof AGENT_CONFIGURATION_TYPES.FLEET,
     /**
      * Function used from the form validation
      */
@@ -111,6 +117,8 @@ export const SETTING = {
   IMPORTED_CLUSTER_VERSION_MANAGEMENT:           'imported-cluster-version-management',
   CLUSTER_AGENT_DEFAULT_PRIORITY_CLASS:          'cluster-agent-default-priority-class',
   CLUSTER_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET: 'cluster-agent-default-pod-disruption-budget',
+  FLEET_AGENT_DEFAULT_PRIORITY_CLASS:            'fleet-agent-default-priority-class',
+  FLEET_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET:   'fleet-agent-default-pod-disruption-budget',
   KEV2_OPERATORS:                                'kev2-operators',
   /**
    * Dynamic Content settings
@@ -178,8 +186,11 @@ export const ALLOWED_SETTINGS: GlobalSetting = {
     ruleSet: [{ name: 'minValue', factoryArg: 1 }]
   },
   [SETTING.IMPORTED_CLUSTER_VERSION_MANAGEMENT]:           { kind: 'boolean' },
-  [SETTING.CLUSTER_AGENT_DEFAULT_PRIORITY_CLASS]:          { kind: 'json' },
-  [SETTING.CLUSTER_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET]: { kind: 'json' }
+  // Configuration setup for agent configuration. Setting this up will activate the specific banner configuration.
+  [SETTING.CLUSTER_AGENT_DEFAULT_PRIORITY_CLASS]:          { kind: 'json', agent: AGENT_CONFIGURATION_TYPES.CLUSTER },
+  [SETTING.CLUSTER_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET]: { kind: 'json', agent: AGENT_CONFIGURATION_TYPES.CLUSTER },
+  [SETTING.FLEET_AGENT_DEFAULT_PRIORITY_CLASS]:            { kind: 'json', agent: AGENT_CONFIGURATION_TYPES.FLEET },
+  [SETTING.FLEET_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET]:   { kind: 'json', agent: AGENT_CONFIGURATION_TYPES.FLEET }
 
 };
 
@@ -195,6 +206,8 @@ export const PROVISIONING_SETTINGS = [
   SETTING.IMPORTED_CLUSTER_VERSION_MANAGEMENT,
   SETTING.CLUSTER_AGENT_DEFAULT_PRIORITY_CLASS,
   SETTING.CLUSTER_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET,
+  SETTING.FLEET_AGENT_DEFAULT_PRIORITY_CLASS,
+  SETTING.FLEET_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET,
 ];
 
 /**

package/config/table-headers.js

@@ -1,4 +1,4 @@
-import { CATTLE_PUBLIC_ENDPOINTS, UI_PROJECT_SECRET_COPY } from '@shell/config/labels-annotations';
+import { CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotations';
 import { NODE as NODE_TYPE, NAMESPACE as NAMESPACE_TYPE } from '@shell/config/types';
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 
@@ -55,6 +55,11 @@ export const NAME = {
   canBeVariable: true,
 };
 
+export const PROJECT_NAMESPACES_NAME = {
+  ...NAME,
+  search: ['nameDisplay', 'projectNameDisplay'],
+};
+
 export const LOGGING_OUTPUT_PROVIDERS = {
   name:      'logging-output-providers',
   labelKey:  'tableHeaders.loggingOutputProviders',
@@ -385,27 +390,17 @@ export const SECRET_DATA = {
   formatter: 'SecretData'
 };
 
-export const SECRET_CLONE = {
-  name:      'secret-clone',
-  labelKey:  'tableHeaders.secret.project-clone',
-  tooltip:   'tableHeaders.secret.project-clone-tooltip',
-  value:     'isProjectSecretCopy',
-  sort:      `metadata.annotations."${ UI_PROJECT_SECRET_COPY }"`,
-  search:    false,
-  formatter: 'Checked',
-};
-
-export const SECRET_PROJECT_SCOPED = {
-  name:     'secret-project-scoped',
-  labelKey: 'tableHeaders.secret.project-scoped',
-  tooltip:  'tableHeaders.secret.project-scoped-tooltip',
-  value:    'clusterAndProjectLabel',
+export const SECRET_ORIGIN = {
+  name:      'secret-origin',
+  labelKey:  'tableHeaders.secret.origin',
+  tooltip:   'tableHeaders.secret.originTooltip',
+  formatter: 'SecretOrigin',
   // Cannot _sort_ upstream secrets by if they are cluster scoped
   // https://github.com/rancher/rancher/issues/51001
   // metadata.labels[management.cattle.io/project-scoped-secret] - covers both cluster scoped AND clones
   // metadata.annotations[management.cattle.io/project-scoped-secret-copy]
   // sort:     [`metadata.labels[${ UI_PROJECT_SECRET }]`, `metadata.annotations[${ UI_PROJECT_SECRET_COPY }]`],
-  search:   false,
+  search:    false,
 };
 
 export const TARGET_KIND = {
@@ -1038,6 +1033,15 @@ export const SCOPE_NORMAN = {
   sort:  ['clusterId'],
 };
 
+export const NORMAN_KEY_DEPRECATION = {
+  name:        'isNormanKeyDeprecated',
+  labelKey:    'tableHeaders.isLegacy',
+  value:       (row) => row.isDeprecated ? 'True' : undefined,
+  sort:        'isDeprecated',
+  align:       'left',
+  dashIfEmpty: true,
+};
+
 export const EXPIRES = {
   name:      'expires',
   value:     'expiresAt',

package/config/types.js

@@ -269,6 +269,7 @@ export const EXT = {
   GROUP_MEMBERSHIP_REFRESH_REQUESTS: 'ext.cattle.io.groupmembershiprefreshrequest',
   PASSWORD_CHANGE_REQUESTS:          'ext.cattle.io.passwordchangerequest',
   KUBECONFIG:                        'ext.cattle.io.kubeconfig',
+  TOKEN:                             'ext.cattle.io.token',
 };
 
 export const CAPI = {
@@ -390,21 +391,35 @@ export const ADDRESSES = {
 export const DEFAULT_WORKSPACE = 'fleet-default';
 
 export const AUTH_TYPE = {
-  _NONE:  '_none',
-  _BASIC: '_basic',
-  _SSH:   '_ssh',
-  _S3:    '_S3',
-  _RKE:   '_RKE',
+  _NONE:              '_none',
+  _BASIC:             '_basic',
+  _SSH:               '_ssh',
+  _S3:                '_S3',
+  _RKE:               '_RKE',
+  _IMAGE_PULL_SECRET: '_IPS',
 };
 
 export const LOCAL_CLUSTER = 'local';
 
 export const CLUSTER_REPO_TYPES = {
-  HELM_URL: 'helm-url',
-  GIT_REPO: 'git-repo',
-  OCI_URL:  'oci-url'
+  HELM_URL:            'helm-url',
+  GIT_REPO:            'git-repo',
+  OCI_URL:             'oci-url',
+  SUSE_APP_COLLECTION: 'suse-application-collection'
 };
 
+/**
+ * The `generateName` prefix used when creating authentication secrets
+ * for SUSE App Collection repositories.
+ */
+export const CLUSTER_REPO_APPCO_AUTH_GENERATE_NAME = 'clusterrepo-appco-auth-';
+
+/**
+ * The `generateName` prefix used when creating authentication secrets
+ * for standard repositories.
+ */
+export const CLUSTER_REPO_AUTH_GENERATE_NAME = 'clusterrepo-auth-';
+
 export const ZERO_TIME = '0001-01-01T00:00:00Z';
 
 export const DEFAULT_GRAFANA_STORAGE_SIZE = '10Gi';

package/detail/workload/index.vue

@@ -2,7 +2,7 @@
 import CreateEditView from '@shell/mixins/create-edit-view';
 import { NAMESPACE as NAMESPACE_COL } from '@shell/config/table-headers';
 import {
-  POD, WORKLOAD_TYPES, SERVICE, INGRESS, NODE, NAMESPACE, WORKLOAD_TYPE_TO_KIND_MAPPING, METRICS_SUPPORTED_KINDS
+  POD, WORKLOAD_TYPES, SERVICE, INGRESS, NAMESPACE, WORKLOAD_TYPE_TO_KIND_MAPPING, METRICS_SUPPORTED_KINDS
 } from '@shell/config/types';
 import ResourceTable from '@shell/components/ResourceTable';
 import Tab from '@shell/components/Tabbed/Tab';
@@ -13,6 +13,7 @@ import DashboardMetrics from '@shell/components/DashboardMetrics';
 import { mapGetters } from 'vuex';
 import { allDashboardsExist } from '@shell/utils/grafana';
 import { PROJECT } from '@shell/config/labels-annotations';
+import { fetchNodesForServiceTargets } from '@shell/models/service';
 
 const WORKLOAD_METRICS_DETAIL_URL = '/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/d/rancher-workload-pods-1/rancher-workload-pods?orgId=1';
 const WORKLOAD_METRICS_SUMMARY_URL = '/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/d/rancher-workload-1/rancher-workload?orgId=1';
@@ -29,28 +30,23 @@ export default {
   mixins: [CreateEditView],
 
   async fetch() {
-    let hasNodes = false;
-
-    try {
-      const inStore = this.$store.getters['currentStore']();
-      const schema = this.$store.getters[`${ inStore }/schemaFor`](NODE);
-
-      if (schema) {
-        hasNodes = true;
-      }
-    } catch {}
-
     const hash = {
       allIngresses: this.$store.dispatch('cluster/findAll', { type: INGRESS }),
-      // Nodes should be fetched because they may be referenced in the target
-      // column of a service list item.
-      allNodes:     hasNodes ? this.$store.dispatch('cluster/findAll', { type: NODE }) : []
+      // Nodes should be fetched because they may be referenced in the target column of a service list item.
+      nodes:        fetchNodesForServiceTargets({
+        $store:  this.$store,
+        inStore: this.$store.getters['currentStore']()
+      })
     };
 
     if (this.podSchema) {
       hash.pods = this.value.fetchPods();
     }
 
+    if (this.serviceSchema) {
+      hash.servicesInNamespace = this.$store.dispatch('cluster/findAll', { type: SERVICE, opt: { namespaced: this.value.metadata.namespace } });
+    }
+
     if (this.value.type === WORKLOAD_TYPES.CRON_JOB) {
       hash.jobs = this.value.matchingJobs();
     }
@@ -88,7 +84,6 @@ export default {
     return {
       allIngresses:                    [],
       matchingIngresses:               [],
-      allNodes:                        [],
       WORKLOAD_METRICS_DETAIL_URL,
       WORKLOAD_METRICS_SUMMARY_URL,
       POD_PROJECT_METRICS_DETAIL_URL:  '',

package/dialog/DeactivateDriverDialog.vue

@@ -55,7 +55,7 @@ export default {
       try {
         await Promise.all(this.drivers.map(
           (driver) => this.$store.dispatch('rancher/request', {
-            url:    `v3/${ this.driverType }/${ escape(driver.id) }?action=deactivate`,
+            url:    `v3/${ this.driverType }/${ encodeURIComponent(driver.id) }?action=deactivate`,
             method: 'POST'
           })
         ));