Merge pull request #17228 from richard-cox/mgmttoprov-smaller-parts

Update usages of PCIC, reduce fetching all clusters

Author: richard-cox

cypress/e2e/blueprints/manager/digital-ocean-cluster-provisioning-response.ts

@@ -66,7 +66,8 @@ export function clusterMgmtDigitalOceanSingleResponse(clusterName: string): obje
             name:       `${ clusterName }`,
             namespace:  `${ namespace }`
           }
-        }
+        },
+        provider: 'rke2'
       },
     }],
   };

cypress/e2e/blueprints/nav/fake-cluster.ts

@@ -2528,6 +2528,7 @@ export function generateFakeClusterDataAndIntercepts({
   cy.intercept({
     method:   'GET',
     pathname: '/v1/provisioning.cattle.io.clusters',
+    query:    { pagesize: '*' }
   }, (req) => {
     req.continue((res) => {
       const localIndex = res.body.data.findIndex((item: any) => item.id.includes('/local'));
@@ -2552,7 +2553,11 @@ export function generateFakeClusterDataAndIntercepts({
   }).as('provCluster');
 
   // add extra cluster to the nav list to test https://github.com/rancher/dashboard/issues/10452
-  cy.intercept('GET', `/v1/management.cattle.io.clusters?*`, (req) => {
+  cy.intercept({
+    method:   'GET',
+    pathname: '/v1/management.cattle.io.clusters',
+    query:    { pagesize: '*' }
+  }, (req) => {
     req.continue((res) => {
       const localIndex = res.body.data.findIndex((item: any) => item.id.includes('local'));
 
@@ -2567,6 +2572,13 @@ export function generateFakeClusterDataAndIntercepts({
     });
   }).as('mgmtClusters');
 
+  cy.intercept('GET', `/v1/management.cattle.io.clusters/${ fakeNavClusterData.mgmtClusterObj.id }?*`, (req) => {
+    req.reply({
+      statusCode: 200,
+      body:       fakeNavClusterData.mgmtClusterObj,
+    });
+  }).as('mgmtCluster');
+
   // intercept counts for fake cluster https://github.com/rancher/dashboard/issues/10452
   cy.intercept('GET', `/k8s/clusters/${ fakeMgmtClusterId }/v1/counts?*`, (req) => {
     req.reply({

cypress/e2e/po/pages/cluster-manager/cluster-manager-list.po.ts

@@ -34,24 +34,35 @@ export default class ClusterManagerListPagePo extends BaseListPagePo {
   }
 
   public static mockListRequests(provClusterList: any, mgmtClusterList: any) {
-    cy.intercept('GET', '/v1/management.cattle.io.clusters?*', (req) => {
+    // Covers specific get
+    cy.intercept('GET', `/v1/management.cattle.io.clusters/${ mgmtClusterList.data[0].id }?*`, (req) => {
+      req.reply({
+        statusCode: 200,
+        body:       mgmtClusterList.data[0],
+      });
+    }).as('mgmtCluster');
+
+    // Covers both side bar and any standard cluster list
+    cy.intercept({
+      method:   'GET',
+      pathname: '/v1/management.cattle.io.clusters',
+      query:    { pagesize: '*' }
+    }, (req) => {
       req.reply({
         statusCode: 200,
         body:       mgmtClusterList,
       });
     }).as('mgmtClusterList');
 
-    // Why aren't we doing `/v1/provisioning.cattle.io.clusters?*`
-    // doesn't match the `/v1/provisioning.cattle.io.clusters?pagesize=100000&filter=id%20IN%20(fleet-default url
-    // doesn't match the get
-
+    // Covers specific get
     cy.intercept('GET', `/v1/provisioning.cattle.io.clusters/${ provClusterList.data[0].id }?*`, (req) => {
       req.reply({
         statusCode: 200,
         body:       provClusterList.data[0],
       });
     }).as('provCluster');
 
+    // Covers only fetch all of prov cluster, probably un-used
     cy.intercept({
       method:   'GET',
       pathname: '/v1/provisioning.cattle.io.clusters',

cypress/e2e/tests/pages/user-menu/preferences.spec.ts

@@ -444,7 +444,7 @@ describe('User can update their preferences', () => {
 
   // You want this to be last, there's some issues with logging in and logging out without sessions
 
-  function testLandingPageOption(key: { index: string, value: string, page: string, checkCluster?: string}) {
+  function testLandingPageOption(key: { index: string, value: string, page: string}) {
     /*
     Select each radio button and verify its highlighted
     Validate http request's payload & response contain correct values per selection
@@ -455,13 +455,6 @@ describe('User can update their preferences', () => {
     prefPage.goTo();
     prefPage.landingPageRadioBtn().checkVisible();
 
-    // Check if the dropdown exists before doing anything for the 'specific cluster' option
-    if (key.checkCluster) {
-      // Ensure the clusters fetch has completed and the Select component has populated
-      // with 'local' before we try to select the radio button.
-      prefPage.expectClusterOptionExists(key.checkCluster);
-    }
-
     cy.intercept('PUT', 'v1/userpreferences/*', (req) => {
       let body = req.body;
 
@@ -520,7 +513,7 @@ describe('User can update their preferences', () => {
 
   it('Can select login landing page - specific cluster', { tags: ['@userMenu', '@adminUser'] }, () => {
     testLandingPageOption({ // This option only works when there is an existing local cluster
-      index: '2', value: '{\"name\":\"c-cluster\",\"params\":{\"cluster\":\"local\"}}', page: '/explore', checkCluster: 'local'
+      index: '2', value: '{\"name\":\"c-cluster\",\"params\":{\"cluster\":\"local\"}}', page: '/explore'
     });
   });
 });

shell/assets/translations/en-us.yaml

@@ -2396,7 +2396,7 @@ cluster:
       label: Auto Replace
       toolTip: If greater than 0, nodes that are unreachable for this duration will be automatically deleted and replaced.
       unit: "Seconds"
-  managementTimeout: The cluster to become available. It's possible the cluster was created. We suggest checking the clusters page before trying to create another.
+  managementTimeout: The {type} {name} to become available. It's possible the cluster was created. We suggest checking the clusters page before trying to create another.
   memberRoles:
     removeMessage: 'Note: Removing a user will not remove their project permissions'
     addClusterMember:

shell/components/LandingPagePreference.vue

@@ -14,10 +14,6 @@ export default {
     Select,
   },
 
-  async fetch() {
-    this.clusters = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER });
-  },
-
   data() {
     // Store the route as it was on page load (before the user may have changed it)
     const customRoute = this.$store.getters['prefs/get'](AFTER_LOGIN_ROUTE);
@@ -90,13 +86,25 @@ export default {
   },
 
   methods: {
-    updateLoginRoute(neu) {
+    async updateLoginRoute(neu) {
       if (neu) {
         this.afterLoginRoute = neu;
       } else {
+        this.clusters = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER });
         this.afterLoginRoute = this.routeFromDropdown?.value || this.routeDropdownOptions[0]?.value;
       }
     },
+  },
+
+  watch: {
+    afterLoginRoute: {
+      async handler(neu) {
+        if (typeof neu === 'object') {
+          this.clusters = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER });
+        }
+      },
+      immediate: true
+    },
   }
 };
 </script>
@@ -129,6 +137,7 @@ export default {
           />
           <Select
             v-model:value="routeFromDropdown"
+            :loading="clusters.length < 1"
             :aria-label="t('landing.landingPrefs.ariaLabelTakeMeToCluster')"
             :searchable="true"
             :disabled="afterLoginRoute === 'home' || afterLoginRoute === 'last-visited'"

shell/components/SingleClusterInfo.vue

@@ -13,6 +13,7 @@ export default {
   },
 
   async fetch() {
+    // There's only one cluster, might as well fetch them all...
     this.clusters = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER });
   },
 

shell/components/form/WorkloadPorts.vue

@@ -130,24 +130,19 @@ export default {
       const version = this.provisioningCluster?.kubernetesVersion;
 
       if (this.provisioningCluster?.isRke2) {
+        // This is a candidate for using the prov cluster provisioner (or now the mgmt cluster provisioner directly)
         const machineSelectorConfig = this.provisioningCluster?.spec?.rkeConfig?.machineSelectorConfig || {};
         const agentConfig = (machineSelectorConfig[0] || {}).config;
 
         cloudProvider = agentConfig?.['cloud-provider-name'];
-      } else if (this.provisioningCluster?.isRke1) {
-        const currentCluster = this.$store.getters['currentCluster'];
-
-        cloudProvider = currentCluster?.spec?.rancherKubernetesEngineConfig?.cloudProvider?.name;
       }
 
       return cloudProvider === HARVESTER &&
               isHarvesterSatisfiesVersion(version);
     },
 
     provisioningCluster() {
-      const out = this.$store.getters['management/all'](CAPI.RANCHER_CLUSTER).find((c) => c?.status?.clusterName === this.currentCluster.metadata.name);
-
-      return out;
+      return this.$store.getters['management/byId'](CAPI.RANCHER_CLUSTER, this.currentCluster.provClusterId);
     },
   },
 

shell/components/nav/TopLevelMenu.vue

@@ -423,7 +423,7 @@ export default {
     },
 
     async goToHarvesterCluster() {
-      const localCluster = this.$store.getters['management/all'](CAPI.RANCHER_CLUSTER).find((C) => C.id === 'fleet-local/local');
+      const localCluster = this.$store.getters['management/byId'](CAPI.RANCHER_CLUSTER, 'fleet-local/local');
 
       try {
         await localCluster.goToHarvesterCluster();

shell/config/product/manager.js

@@ -232,7 +232,13 @@ export function init(store) {
 
   headers(CAPI.MACHINE_DEPLOYMENT, [
     STATE,
-    NAME_COL,
+    NAME_COL, {
+      name:     'cluster',
+      labelKey: 'tableHeaders.cluster',
+      value:    'clusterName',
+      getValue: (row) => row.clusterName,
+      sort:     ['clusterName'],
+    },
     MACHINE_SUMMARY,
     AGE
   ]);
@@ -271,4 +277,24 @@ export function init(store) {
       })
     }
   });
+
+  const clusterGroupConfig = {
+    listGroups: [{
+      tooltipKey: 'resourceTable.groupBy.none',
+      icon:       'icon-list-flat',
+      value:      'none',
+    }, {
+      icon:          'icon-folder',
+      value:         'clusterName',
+      field:         'clusterName',
+      hideColumn:    'cluster',
+      tooltipKey:    'resourceTable.groupBy.cluster',
+      groupLabelKey: 'groupByLabel',
+    }],
+    listGroupsWillOverride: true,
+  };
+
+  configureType(CAPI.MACHINE_DEPLOYMENT, { ...clusterGroupConfig });
+  configureType(CAPI.MACHINE_SET, { ...clusterGroupConfig });
+  configureType(CAPI.MACHINE, { ...clusterGroupConfig });
 }