@rancher/shell 3.0.5-rc.6 → 3.0.5-rc.8

package/assets/translations/en-us.yaml

@@ -607,6 +607,9 @@ authConfig:
     starttls:
       label: Start TLS
       tip: Upgrades non-encrypted connections by wrapping with TLS during the connection process. Can not be used in conjunction with TLS.
+    searchUsingServiceAccount: 
+      label: Enable Service Account Search
+      tip: When enabled, Rancher will use the service account instead of the user account to search for users and groups.
     tls: TLS
     userEnabledAttribute: User Enabled Attribute
     userMemberAttribute: User Member Attribute
@@ -1046,7 +1049,9 @@ catalog:
         label: Chart Versions
         showMore: Show More
         showLess: Show Less
-      home: Home
+        missingVersionDate: No date available for this chart version
+      home: Homepage
+      repository: Repository Page
       maintainers: Maintainers
       related: Related
       chartUrls: Chart
@@ -1074,10 +1079,8 @@ catalog:
     header: Charts
     noCharts:
       title: No charts to show
-      messagePart1: <b>Tips:</b> undo the last filter you applied or
-      messagePart2: clear all filters
-      messagePart3: ', and ensure you have the right <a tabindex="0" href={repositoriesUrl} rel="noopener noreferrer nofollow">repositories</a> in place.'
-      messagePart4: 'Want to learn more about Helm Charts and Apps? Read our <a tabindex="0" href="{docsBase}/how-to-guides/new-user-guides/helm-charts-in-rancher" target="_blank" class="secondary-text-link">documentation <i class="icon icon-external-link"></i></a>.'
+      message: '<b>Tips:</b> undo the last filter you applied or <resetAllFilters>clear all filters</resetAllFilters>, and ensure you have the right <repositoriesUrl>repositories</repositoriesUrl> in place.'
+      docsMessage: 'Want to learn more about Helm Charts and Apps? Read our <docsUrl>documentation</docsUrl>.'
     noWindows: Your repos do not contain any charts capable of being deployed on a cluster with Windows nodes.
     noWindowsAndLinux: Your repos do not contain any charts capable of being deployed on a cluster with both Windows and Linux worker nodes.
     operatingSystems:
@@ -1091,6 +1094,8 @@ catalog:
       label: Add new
       ariaLabel: Add a new repository
     appChartCard:
+      subHeaderItem:
+        missingVersionDate: Last updated date is not available for this chart
       footerItem:
         ariaLabel: Apply filter
     statusFilterCautions:
@@ -1116,11 +1121,50 @@ catalog:
       alphaDescending: Chart name, Z → A
     refreshButton:
       label: Refresh all repositories
+    findSimilar:
+      message: "Find similar charts based on this {type}"
+      types:
+        keyword: keyword
+        repo: repository
+        category: category
+        tag: tag
   install:
     action:
       goToUpgrade: Edit/Upgrade
     appReadmeMissing: This chart doesn't have any additional chart information.
     appReadmeTitle: Chart Information (Helm README)
+    button:
+      alreadyInstalled: '{chart} version {version} is already installed.'
+      viewDetails: View chart details
+      customizeInstall: Customize Install Options
+      viewLogs: View Installation Logs
+      waitForLogs: Installation initialized; waiting for logs...
+      canNotCreateRepos: It looks like you don't have permission to add repositories and install helm charts. 
+      canNotInstallApps: The {repo} repository has been added, but you don't have permission to install charts from it.
+      stages:
+        addRepo:
+          action: Add the {repo} repository
+          waiting: Adding {repo} repository...
+          success: Repository added
+          error: Error adding {repo} repository
+        loadCharts:
+          action:  Fetch {repo} repository chart(s)
+          waiting: Fetching {repo} repository chart(s)...
+          success: '{chart} found'
+          error: '{chart} chart not found - Try again?'
+        installChart:
+          action: Install {chart}
+          waiting: Installing {chart}...
+          success: '{chart} installation started'
+          error: Error installing {chart}
+        waitForLogs:
+          action: View installation logs
+          waiting: Waiting for installation logs...
+          error: Unable to load installation logs
+      errors:
+        fetchChart: Error retrieving chart from repository
+        alreadyInstalled: Chart already installed
+        timeoutWaiting: Timed out waiting for logs
     chart: Chart
     warning:
       managed:
@@ -1615,6 +1659,12 @@ cluster:
         label: KubeconfigContent
       placeholder: 'Namespace/Name'
       cluster: Imported Harvester Cluster
+      enableTpm: Enable TPM
+      enableCpuPinning: Enable CPU Pinning
+      cpuPinningTooltip: Enable CPU Pinning brings better performance and reduce latency for the harvester virtual machine
+      cpuManagerWarning: You must enable CPU Manager for at least one node in harvester host page to enable CPU Pinning for VM
+      secureBoot: Secure Boot
+      enableEfi: Booting in EFI mode
       installGuestAgent: Install guest agent
       tokenExpirationWarning: 'Warning: Harvester Cloud Credentials use an underlying authentication token that may have an expiry time - please see the following <a href="https://harvesterhci.io/kb/renew_harvester_cloud_credentials" target="_blank" rel="noopener nofollow">knowledge base article</a> for possible implications on management operations.'
   description:
@@ -1654,6 +1704,9 @@ cluster:
       sshUser:
         placeholder: e.g. ubuntu
         toolTip: SSH user to login with the selected OS image.
+    kubeconfigSecret:
+        nameRequired: Cluster name is required.
+        error: 'Error generating Harvester kubeconfig secret: {err}'
   haveOneOwner: There must be at least one member with the Owner role.
   import:
     warningBanner: 'You should not import a cluster which has already been connected to another instance of Rancher as it will lead to data corruption.'
@@ -1995,6 +2048,9 @@ cluster:
       location:
         zone:
           label: Zone
+      preemptible:
+        label: Make VM instance preemptible
+        tooltip: Preemptible machines offer significant cost savings, but may be abruptly stopped when Google Compute Engine needs to reclaim the compute resources for higher-priority VMs.
       scopes:
         add: Add scope
         label: Scopes
@@ -2083,7 +2139,7 @@ cluster:
   banner:
     warning: 'This cluster contains a machineSelectorConfig, which this form does not fully support; use the YAML editor to manage the full configuration.'
     os: 'You are attempting to add a {newOS} worker node to a cluster with one or more {existingOS} worker nodes: some installed apps may need to be upgraded or removed.'
-    rke2-k3-reprovisioning: 'Making changes to cluster configuration may result in nodes reprovisioning. For more information see the <a href="{docsBase}/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/rke1-vs-rke2-differences#cluster-api" target="_blank" rel="noopener nofollow">documentation</a>.'
+    rke2-k3-reprovisioning: 'Making changes to cluster configuration may result in nodes reprovisioning. For more information see the <a href="{docsBase}/how-to-guides/new-user-guides/launch-kubernetes-with-rancher#launching-kubernetes-on-new-nodes-in-an-infrastructure-provider" target="_blank" rel="noopener nofollow">documentation</a>.'
     desiredNodeGroupWarning: There are 0 nodes available to run the cluster agent. The cluster will not become active until at least one node is available.
     haveArgInfo: Configuration information is not available for the selected Kubernetes version.  The options available on this screen will be limited; you may want to use the YAML editor.
     cloudProviderAddConfig: 'On Kubernetes 1.27 or greater, the <b>Amazon</b> Cloud Provider requires additional configuration. See <a href="https://ranchermanager.docs.rancher.com/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon" target="_blank" rel="noopener noreferrer nofollow">the documentation</a> for more information.'
@@ -2096,13 +2152,6 @@ cluster:
       }
     rke1DeprecationMessage: 'Rancher Kubernetes Engine (RKE / RKE1) has reached end of life and these clusters are no longer supported. We recommend replatforming RKE1 clusters to RKE2 to ensure continued support and security updates. Learn more about the transition <a href="https://www.suse.com/support/kb/doc/?id=000021518" target="_blank" rel="noopener noreferrer nofollow">here</a>.'
   rke1Unsupported: RKE1 Clusters are no longer supported
-  cloudCredentials:
-    renew: Renew Cloud Credentials
-    expired: Cloud Credential expired, please Renew Cloud Credentials
-    expiring: Cloud Credential will expire on { expires }, please Renew Cloud Credentials
-    banners:
-      expiring: "{count} {count, plural, =1 { Cluster has a Cloud Credential that expires soon} other { Clusters have Cloud Credentials that expire soon}}, please Renew Cloud {count, plural, =1 { Credential} other { Credentials}}"
-      expired: "{count} {count, plural, =1 { Cluster has a Cloud Credential that has expired} other { Clusters have Cloud Credentials that have expired}}, please Renew Cloud {count, plural, =1 { Credential} other { Credentials}}"
 
   architecture:
     label:
@@ -2302,6 +2351,7 @@ cluster:
       server: Server compliance Profile
       agent: Compliance Profile
       override: Allow the default Pod Security Admission Configuration Template to be overridden when using a compliance profile
+      warning: After saving changes, and if this cluster has already been provisioned, please restart the rke2-server service on all nodes to ensure etcd file permissions are correct
     defaultPodSecurityPolicyTemplateName:
       label: Default Pod Security Policy
       option: Default - RKE2 Embedded
@@ -2382,6 +2432,19 @@ cluster:
         true: Exposed to the public interface
       s3backups:
         label: Save Backups to S3
+      s3config:
+        bucket:
+          label: Bucket
+        folder:
+          label: Folder
+        region:
+          label: Region
+        endpoint:
+          label: Endpoint
+        skipSSLVerify:
+          label: Accept any certificate (insecure)
+        endpointCA:
+          label: Endpoint CA Cert
   k3s:
     systemService:
       coredns: 'CoreDNS'
@@ -2625,8 +2688,8 @@ etcdInfoBanner:
 
 fleet:
   settings:
-    label: Fleet
-    title: Fleet Settings
+    label: Continuous Delivery
+    title: Continuous Delivery Settings
     info: Rancher will reboot Fleet agent and controller on settings change.
     apply: Apply changes
     noPermissions: You have no permissions to modify Fleet Settings
@@ -2745,6 +2808,7 @@ fleet:
       filters:
         gitRepos: Show Git Repos
         helmOps: Show Helm Ops
+      search: Filter
       resourceSummary:
         part1: in
         part2: |-
@@ -2904,7 +2968,7 @@ fleet:
         label: Polling Interval
         tooltip: Polling Interval is the time between a push to the Repository and Fleet's reaction to it.
         webhookWarning: A webhook is configured in Rancher to reconcile Git updates and GitRepo resources. The Polling Interval will automatically be adjusted to 1 hour.
-        minimumValuewarning: The recommended minimum Polling Interval is 15 seconds. To avoid performance issues with GitRepos that contain a large amount of resources please consider increasing this value.
+        minimumValueWarning: The recommended minimum Polling Interval is 15 seconds. To avoid performance issues with GitRepos that contain a large amount of resources please consider increasing this value.
     ociStorageSecret:
       title: OCI Registry
       label: OCI Storage Secret
@@ -3033,18 +3097,18 @@ fleet:
         oci: OCI Registry
       tarball:
         label: Absolute URL
-        placeholder: e.g. https://github.com/rancher/fleet/helm-chart/helm-chart-0.0.1.tgz
+        placeholder: e.g. https://example.com/charts/my-chart-1.2.3.tgz
       repo:
         repo:
-          label: URL
-          placeholder: e.g. https://github.com/rancher/fleet/helm-chart
+          label: Repository URL
+          placeholder: e.g. https://foo.bar/baz
         chart:
           label: Chart
           placeholder: The path to the chart name in the repository
       oci:
         chart:
           label: OCI Registry URL
-          placeholder: e.g. oci://ghcr.io/rancher/fleet/helm-chart or oci://ghcr.io/rancher/fleet/helm-chart:0.0.1
+          placeholder: e.g. oci://foo.bar/baz
       version:
         label: Version
         placeholder: The Chart version
@@ -3111,7 +3175,8 @@ fleet:
       pollingInterval:
         label: Polling Interval
         tooltip: Polling Interval is the time between a push to the Repository and Fleet's reaction to it.
-        minimumValuewarning: The recommended minimum Polling Interval is 15 seconds. To avoid performance issues with HelmOps that contain a large amount of resources please consider increasing this value.
+        minimumValueWarning: The recommended minimum Polling Interval is 15 seconds. To avoid performance issues with HelmOps that contain a large amount of resources please consider increasing this value.
+        versionTooltip: Polling can be enabled only if version is a valid semantic versioning constraint (e.g. 2.x.x, < 1.0).
     tls:
       insecure: Accept any certificate (insecure)
     auth:
@@ -5868,6 +5933,13 @@ secret:
     'kubernetes.io/tls':
       description: Store a certificate and key for TLS
       docLink: https://kubernetes.io/docs/concepts/configuration/secret/#tls-secrets
+  tabs:
+    namespaced:
+      label: Namespaced
+      create: Create Secret
+    projectScoped:
+      label: Project Scoped
+      create: Create Project Secret
 
 selectOrCreateAuthSecret:
   label: Authentication
@@ -6570,6 +6642,11 @@ tableHeaders:
   scope: Scope
   selector: Selector
   secrets: Secrets
+  secret:
+    project-clone: Created by Project Secret
+    project-clone-tooltip: Has a Project Scoped Secret created this Secret in this Namespace
+    project-scoped: Project Secret
+    project-scoped-tooltip: This Project Scoped Secret will create matching Secrets in the Namespaces it contains
   schedule: Schedule
   service: Service
   serviceAccounts: Service Accounts
@@ -6749,10 +6826,10 @@ validation:
   flowOutput:
     both: Requires "Output" or "Cluster Output" to be selected.
     global: Requires "Cluster Output" to be selected.
-  git:
-    url: URL must be a HTTP(s) or SSH url with no trailing spaces
+  repository:
+    url: It must be a valid HTTP(s) or SSH URL with no trailing spaces
   oci:
-    url: URL must be an OCI url with no trailing spaces
+    url: It must be a valid OCI URL with no trailing spaces
   output:
     logdna:
       apiKey: Required an "Api Key" to be set.
@@ -6819,6 +6896,7 @@ validation:
       missingApiGroup: You must specify an API Group for each resource grant
       missingOneResource: You must specify at least one Resource, Non-Resource URL or API Group for each resource grant
       noResourceAndNonResource: Each rule may contain Resources or Non-Resource URLs but not both
+  semanticVersion: Version must be a valid version number or a semantic versioning constraint (e.g. 2.x.x, < 1.0)
   service:
     externalName:
       none: External Name is required on an ExternalName Service.
@@ -6843,6 +6921,7 @@ validation:
       localhost: If the Server URL is internal to the Rancher server (e.g. localhost) the downstream clusters may not be able to communicate with Rancher.
       trailingForwardSlash: Server URL should not have a trailing forward slash.
       url: Server URL must be an URL.
+      awsStyleEndpoint: Endpoint URL has to be a valid domain-based endpoint and cannot start with a protocol (e.g https:// or http://)
   genericUrl: Field must be a valid URL
   stringLength:
     between: '"{key}" should be between {min} and {max} {max, plural, =1 {character} other {characters}}'
@@ -6856,6 +6935,7 @@ validation:
       match: At least one Match or Match Regex must be selected
       interval: '"{key}" must be of a format with digits followed by a unit i.e. 1h, 2m, 30s'
   tab: "One or more fields in this tab contain a form validation error"
+  version: Invalid Version number
 
 carousel:
   previous: Previous
@@ -7855,6 +7935,11 @@ typeLabel:
       one { Secret }
       other { Secrets }
     }
+  projectsecret: |-
+    {count, plural,
+      one { Project Secret }
+      other { Project Secrets }
+    }
   apiregistration.k8s.io.apiservice: |-
     {count, plural,
       one { APIService }
@@ -8198,6 +8283,7 @@ action:
   runNow: Run Now
   suspend: Suspend
   resume: Resume
+  showConfiguration: Show Configuration
 
 unit:
   sec: secs
@@ -8638,11 +8724,6 @@ volumeClaimTemplate:
 manager:
   cloudCredentials:
     label: Cloud Credentials
-    renew: Renew
-    expired: Expired
-    banners:
-      expiring: "{count} Cloud {count, plural, =1 { Credential expires soon} other { Credentials expire soon}}, please Renew"
-      expired: "{count} Cloud {count, plural, =1 { Credential has expired} other { Credentials have expired}}, please Renew"
   drivers:
     label: Drivers
   rkeTemplates:

package/chart/__tests__/S3.test.ts

@@ -11,7 +11,8 @@ describe('rancher-backup: S3', () => {
       'i18n/t':                    (text: string) => text,
       t:                           (text: string) => text,
       'cluster/all':               () => [],
-      'cluster/paginationEnabled': () => false
+      'cluster/paginationEnabled': () => false,
+      currentStore:                () => 'cluster'
     }
   };
   const wrapper = mount(S3, {

package/cloud-credential/generic.vue

@@ -4,6 +4,7 @@ import KeyValue from '@shell/components/form/KeyValue';
 import { Banner } from '@components/Banner';
 import { simplify, iffyFields, likelyFields } from '@shell/store/plugins';
 import Loading from '@shell/components/Loading';
+import { SCHEMA } from '@shell/config/types';
 
 export default {
   emits: ['validationChanged'],
@@ -23,10 +24,15 @@ export default {
   async fetch() {
     let keyOptions = [];
 
-    const { normanSchema } = this;
+    const normanType = this.$store.getters['plugins/credentialFieldForDriver'](this.driverName);
+    const configId = `${ normanType }credentialconfig`;
+
+    this.normanSchema = await this.$store.dispatch('rancher/find', {
+      type: SCHEMA, id: configId, opt: { url: `/v3/schemas/${ configId }` }
+    });
 
-    if ( normanSchema?.resourceFields ) {
-      keyOptions = Object.keys(normanSchema.resourceFields);
+    if ( this.normanSchema?.resourceFields ) {
+      keyOptions = Object.keys(this.normanSchema.resourceFields);
     } else {
       keyOptions = await this.$store.getters['plugins/fieldNamesForDriver'](this.driverName);
     }
@@ -38,7 +44,7 @@ export default {
     for ( const k of keyOptions ) {
       const sk = simplify(k);
 
-      if ( normanSchema?.resourceFields || likelyFields.includes(sk) || iffyFields.includes(sk) ) {
+      if ( this.normanSchema?.resourceFields || likelyFields.includes(sk) || iffyFields.includes(sk) ) {
         keys.push(k);
       }
     }
@@ -51,13 +57,9 @@ export default {
   },
 
   data() {
-    const normanType = this.$store.getters['plugins/credentialFieldForDriver'](this.driverName);
-    const normanSchema = this.$store.getters['rancher/schemaFor'](`${ normanType }credentialconfig`);
-
     return {
-      hasSupport: !!normanSchema,
-      errors:     null,
-      normanSchema,
+      errors:       null,
+      normanSchema: null,
     };
   },
 
@@ -73,6 +75,12 @@ export default {
     }
   },
 
+  computed: {
+    hasSupport() {
+      return !!this.normanSchema;
+    }
+  }
+
 };
 </script>
 

package/cloud-credential/harvester.vue

@@ -1,7 +1,6 @@
 <script>
 import CreateEditView from '@shell/mixins/create-edit-view';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
-import { Banner } from '@components/Banner';
 
 import { get, set } from '@shell/utils/object';
 import { MANAGEMENT, VIRTUAL_HARVESTER_PROVIDER } from '@shell/config/types';
@@ -9,7 +8,7 @@ import { MANAGEMENT, VIRTUAL_HARVESTER_PROVIDER } from '@shell/config/types';
 export default {
   emits: ['validationChanged'],
 
-  components: { LabeledSelect, Banner },
+  components: { LabeledSelect },
   mixins:     [CreateEditView],
 
   async fetch() {
@@ -100,13 +99,6 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-10">
-      <Banner
-        color="warning"
-        label-key="cluster.credential.harvester.tokenExpirationWarning"
-        data-testid="harvester-token-expiration-warning-banner"
-      />
-    </div>
     <div class="row mb-10">
       <div
         class="col span-6"

package/components/AdvancedSection.vue

@@ -32,9 +32,17 @@ export default {
       v-t="show ? 'generic.hideAdvanced' : 'generic.showAdvanced'"
       class="hand block"
       :class="{'mb-10': show}"
+      tabindex="0"
+      @keydown.enter.space.prevent="toggle"
       @click="toggle"
     />
 
     <slot v-if="show" />
   </div>
 </template>
+
+<style lang="scss" scoped>
+.hand.block {
+  max-width: fit-content;
+}
+</style>

package/components/ChartReadme.vue

@@ -8,6 +8,14 @@ export default {
       type:     Object,
       required: true
     },
+    showAppReadme: {
+      type:    Boolean,
+      default: true
+    },
+    hideReadmeFirstTitle: {
+      type:    Boolean,
+      default: true
+    }
   },
   data() {
     return {
@@ -30,13 +38,13 @@ export default {
   <div class="wrapper">
     <div class="chart-readmes">
       <Markdown
-        v-if="appReadme"
+        v-if="showAppReadme && appReadme"
         v-model:value="appReadme"
-        class="md md-desc mb-20"
+        :class="[hideReadmeFirstTitle ? 'hidden-first-title' : '', 'md', 'md-desc', 'mb-20']"
         @loaded="appReadmeLoaded = true"
       />
       <h1
-        v-if="appReadme && readme && appReadmeLoaded && readmeLoaded"
+        v-if="showAppReadme && appReadme && readme && appReadmeLoaded && readmeLoaded"
         class="pt-10"
       >
         {{ t('catalog.install.appReadmeTitle') }}
@@ -45,6 +53,7 @@ export default {
         v-if="readme"
         v-model:value="readme"
         class="md md-desc"
+        :class="[hideReadmeFirstTitle ? 'hidden-first-title' : '', 'md', 'md-desc']"
         @loaded="readmeLoaded = true"
       />
     </div>
@@ -88,13 +97,14 @@ export default {
       word-break: break-word;
     }
 
-    :deep()  > h1:first-of-type {
-      display: none;
-    }
-
     :deep() p {
       margin-bottom: 0.5em;
     }
   }
+  .hidden-first-title {
+    :deep() > h1:first-of-type {
+      display: none;
+    }
+  }
 
 </style>

package/components/CodeMirror.vue

@@ -444,7 +444,7 @@ export default {
         justify-content: center;
         border: 1px solid transparent;
         color: var(--darker);
-        background-color: var(--overlay-bg);
+        background-color: var(--subtle-overlay-bg);
         font-size: 12px;
 
         .close-indicator {

package/components/Drawer/Chrome.vue

@@ -61,7 +61,6 @@ const ariaLabel = computed(() => i18n.t('component.drawer.chrome.ariaLabel.close
     bottom: 0;
     left: 0;
     right: 0;
-    z-index: 1000;
 
     display: flex;
     flex-direction: column;

package/components/Drawer/ResourceDetailDrawer/__tests__/composables.test.ts

@@ -1,7 +1,6 @@
-import { useDefaultConfigTabProps, useDefaultYamlTabProps, useResourceDetailDrawer } from '@shell/components/Drawer/ResourceDetailDrawer/composables';
+import { useDefaultConfigTabProps, useDefaultYamlTabProps } from '@shell/components/Drawer/ResourceDetailDrawer/composables';
 import * as helpers from '@shell/components/Drawer/ResourceDetailDrawer/helpers';
 import * as vuex from 'vuex';
-import * as drawer from '@shell/composables/drawer';
 
 jest.mock('@shell/components/Drawer/ResourceDetailDrawer/helpers');
 jest.mock('vuex');
@@ -26,11 +25,13 @@ describe('composables: ResourceDetailDrawer', () => {
   describe('useDefaultConfigTabProps', () => {
     const hasCustomEdit = jest.fn();
     const importEdit = jest.fn();
+    const hasCustomDetail = jest.fn();
     const editComponent = { component: 'EDIT_COMPONENT' };
     const store: any = {
       getters: {
-        'type-map/hasCustomEdit': hasCustomEdit,
-        'type-map/importEdit':    importEdit
+        'type-map/hasCustomEdit':   hasCustomEdit,
+        'type-map/importEdit':      importEdit,
+        'type-map/hasCustomDetail': hasCustomDetail,
       }
     };
 
@@ -43,40 +44,38 @@ describe('composables: ResourceDetailDrawer', () => {
       expect(props).toBeUndefined();
     });
 
+    it('should return undefined if it does not have a customDetail', async() => {
+      jest.spyOn(vuex, 'useStore').mockImplementation(() => store);
+      const hasCustomEditSpy = hasCustomEdit.mockImplementation(() => true);
+      const hasCustomDetailSpy = hasCustomDetail.mockImplementation(() => false);
+      const props = useDefaultConfigTabProps(resource);
+
+      expect(hasCustomEditSpy).toHaveBeenCalledWith(resource.type);
+      expect(hasCustomDetailSpy).toHaveBeenCalledWith(resource.type);
+      expect(props).toBeUndefined();
+    });
+
+    it('should return undefined if resource disableResourceDetailDrawerConfigTab is true', async() => {
+      jest.spyOn(vuex, 'useStore').mockImplementation(() => store);
+      const hasCustomDetailSpy = hasCustomDetail.mockImplementation(() => false);
+      const props = useDefaultConfigTabProps({ ...resource, disableResourceDetailDrawerConfigTab: true });
+
+      expect(hasCustomDetailSpy).toHaveBeenCalledWith(resource.type);
+      expect(props).toBeUndefined();
+    });
+
     it('should return props if it has a customEdit', async() => {
       jest.spyOn(vuex, 'useStore').mockImplementation(() => store);
       const hasCustomEditSpy = hasCustomEdit.mockImplementation(() => true);
+      const hasCustomDetailSpy = hasCustomDetail.mockImplementation(() => true);
       const importEditSpy = importEdit.mockImplementation(() => editComponent);
       const props = useDefaultConfigTabProps(resource);
 
       expect(hasCustomEditSpy).toHaveBeenCalledWith(resource.type);
+      expect(hasCustomDetailSpy).toHaveBeenCalledWith(resource.type);
       expect(importEditSpy).toHaveBeenCalledWith(resource.type);
       expect(props?.component).toStrictEqual(editComponent);
       expect(props?.resource).toStrictEqual(resource);
     });
   });
-
-  describe('useResourceDetailDrawer', () => {
-    it('should create a wrapper that passes that appropriate properties to the drawer methods', () => {
-      const openSpy = jest.fn();
-      const closeSpy = jest.fn();
-      const selector = '.selector';
-      const useDrawerSpy = jest.spyOn(drawer, 'useDrawer').mockImplementation(() => ({ open: openSpy, close: closeSpy }));
-      const resourceDetailDrawer = useResourceDetailDrawer();
-
-      resourceDetailDrawer.openResourceDetailDrawer(resource, selector);
-
-      expect(useDrawerSpy).toHaveBeenCalledTimes(1);
-      expect(openSpy).toHaveBeenCalledWith({ name: 'ResourceDetailDrawer' }, selector, {
-        resource,
-        onClose:            closeSpy,
-        width:              '73%',
-        // We want this to be full viewport height top to bottom
-        height:             '100vh',
-        top:                '0',
-        'z-index':          101, // We want this to be above the main side menu
-        closeOnRouteChange: ['name', 'params', 'query']
-      });
-    });
-  });
 });

package/components/Drawer/ResourceDetailDrawer/composables.ts

@@ -1,31 +1,8 @@
-import ResourceDetailDrawer from '@shell/components/Drawer/ResourceDetailDrawer/index.vue';
 import { Props as YamlTabProps } from '@shell/components/Drawer/ResourceDetailDrawer/YamlTab.vue';
 import { Props as ConfigTabProps } from '@shell/components/Drawer/ResourceDetailDrawer/ConfigTab.vue';
 import { useStore } from 'vuex';
-import { useDrawer } from '@shell/composables/drawer';
 import { getYaml } from '@shell/components/Drawer/ResourceDetailDrawer/helpers';
 
-export function useResourceDetailDrawer() {
-  const { open, close } = useDrawer();
-
-  const openResourceDetailDrawer = (resource: any, returnFocusSelector: string) => {
-    open(ResourceDetailDrawer,
-      returnFocusSelector,
-      {
-        resource,
-        onClose:            close,
-        width:              '73%',
-        // We want this to be full viewport height top to bottom
-        height:             '100vh',
-        top:                '0',
-        'z-index':          101, // We want this to be above the main side menu
-        closeOnRouteChange: ['name', 'params', 'query'] // We want to ignore hash changes, tables in extensions can trigger the drawer to close while opening
-      });
-  };
-
-  return { openResourceDetailDrawer };
-}
-
 export async function useDefaultYamlTabProps(resource: any): Promise<YamlTabProps> {
   const yaml = await getYaml(resource);
 
@@ -38,7 +15,10 @@ export async function useDefaultYamlTabProps(resource: any): Promise<YamlTabProp
 export function useDefaultConfigTabProps(resource: any): ConfigTabProps | undefined {
   const store = useStore();
 
-  if (!store.getters['type-map/hasCustomEdit'](resource.type)) {
+  // You don't want to show the Config tab if there isn't a an edit page to show and you don't want to show it if there isn't
+  // a detail page because we default to showing the existing edit page if the detail page doesn't exist. Showing them again
+  // wouldn't be worth while.
+  if (!store.getters['type-map/hasCustomEdit'](resource.type) || !store.getters['type-map/hasCustomDetail'](resource.type) || resource.disableResourceDetailDrawerConfigTab) {
     return;
   }