@rancher/shell 2.0.2-rc.1 → 2.0.2

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

@@ -5,7 +5,7 @@ import { mount, Wrapper } from '@vue/test-utils';
 // DISCLAIMER: This should not be added here, although we have several store requests which are irrelevant
 const defaultStore = {
   'management/byId':         jest.fn(),
-  'management/schemaFor':    jest.fn(),
+  'management/schemaFor':    () => ({}),
   'i18n/t':                  jest.fn(),
   'features/get':            jest.fn(),
   'prefs/theme':             jest.fn(),
@@ -20,7 +20,11 @@ describe('topLevelMenu', () => {
       mocks: {
         $store: {
           getters: {
-            'management/all': () => [{ name: 'whatever' }],
+            'management/all': () => [{
+              name: 'whatever',
+              id:   'an-id1',
+              mgmt: { id: 'an-id1' },
+            }],
             ...defaultStore
           },
         },
@@ -48,21 +52,21 @@ describe('topLevelMenu', () => {
             'management/all': () => [
               {
                 name:        'x32-cwf5-name',
-                id:          'x32-cwf5-id',
+                id:          'an-id1',
                 mgmt:        { id: 'an-id1' },
                 nameDisplay: 'c-cluster',
                 isReady:     true
               },
               {
                 name:        'x33-cwf5-name',
-                id:          'x33-cwf5-id',
+                id:          'an-id2',
                 mgmt:        { id: 'an-id2' },
                 nameDisplay: 'a-cluster',
                 isReady:     true
               },
               {
                 name:        'x34-cwf5-name',
-                id:          'x34-cwf5-id',
+                id:          'an-id3',
                 mgmt:        { id: 'an-id3' },
                 nameDisplay: 'b-cluster',
                 isReady:     true
@@ -70,7 +74,7 @@ describe('topLevelMenu', () => {
               {
                 name:        'local-name',
                 id:          'local',
-                mgmt:        { id: 'an-id4' },
+                mgmt:        { id: 'local' },
                 nameDisplay: 'local',
                 isReady:     true
               },
@@ -103,21 +107,21 @@ describe('topLevelMenu', () => {
             'management/all': () => [
               {
                 name:        'x32-cwf5-name',
-                id:          'x32-cwf5-id',
+                id:          'an-id1',
                 mgmt:        { id: 'an-id1' },
                 nameDisplay: 'c-cluster',
                 isReady:     true
               },
               {
                 name:        'x33-cwf5-name',
-                id:          'x33-cwf5-id',
+                id:          'an-id2',
                 mgmt:        { id: 'an-id2' },
                 nameDisplay: 'a-cluster',
                 isReady:     false
               },
               {
                 name:        'x34-cwf5-name',
-                id:          'x34-cwf5-id',
+                id:          'an-id3',
                 mgmt:        { id: 'an-id3' },
                 nameDisplay: 'b-cluster',
                 isReady:     true
@@ -125,7 +129,7 @@ describe('topLevelMenu', () => {
               {
                 name:        'local-name',
                 id:          'local',
-                mgmt:        { id: 'an-id4' },
+                mgmt:        { id: 'local' },
                 nameDisplay: 'local',
                 isReady:     true
               },
@@ -158,7 +162,7 @@ describe('topLevelMenu', () => {
             'management/all': () => [
               {
                 name:        'x32-cwf5-name',
-                id:          'x32-cwf5-id',
+                id:          'an-id1',
                 mgmt:        { id: 'an-id1' },
                 nameDisplay: 'c-cluster',
                 isReady:     true,
@@ -166,7 +170,7 @@ describe('topLevelMenu', () => {
               },
               {
                 name:        'x33-cwf5-name',
-                id:          'x33-cwf5-id',
+                id:          'an-id2',
                 mgmt:        { id: 'an-id2' },
                 nameDisplay: 'a-cluster',
                 isReady:     true,
@@ -174,7 +178,7 @@ describe('topLevelMenu', () => {
               },
               {
                 name:        'x34-cwf5-name',
-                id:          'x34-cwf5-id',
+                id:          'an-id3',
                 mgmt:        { id: 'an-id3' },
                 nameDisplay: 'b-cluster',
                 isReady:     true,
@@ -183,7 +187,7 @@ describe('topLevelMenu', () => {
               {
                 name:        'local-name',
                 id:          'local',
-                mgmt:        { id: 'an-id4' },
+                mgmt:        { id: 'local' },
                 nameDisplay: 'local',
                 isReady:     true,
                 pinned:      true
@@ -217,7 +221,7 @@ describe('topLevelMenu', () => {
             'management/all': () => [
               {
                 name:        'x32-cwf5-name',
-                id:          'x32-cwf5-id',
+                id:          'an-id1',
                 mgmt:        { id: 'an-id1' },
                 nameDisplay: 'c-cluster',
                 isReady:     true,
@@ -225,7 +229,7 @@ describe('topLevelMenu', () => {
               },
               {
                 name:        'x33-cwf5-name',
-                id:          'x33-cwf5-id',
+                id:          'an-id2',
                 mgmt:        { id: 'an-id2' },
                 nameDisplay: 'a-cluster',
                 isReady:     true,
@@ -233,7 +237,7 @@ describe('topLevelMenu', () => {
               },
               {
                 name:        'x34-cwf5-name',
-                id:          'x34-cwf5-id',
+                id:          'an-id3',
                 mgmt:        { id: 'an-id3' },
                 nameDisplay: 'b-cluster',
                 isReady:     false,
@@ -242,7 +246,7 @@ describe('topLevelMenu', () => {
               {
                 name:        'local-name',
                 id:          'local',
-                mgmt:        { id: 'an-id4' },
+                mgmt:        { id: 'local' },
                 nameDisplay: 'local',
                 isReady:     true,
                 pinned:      true
@@ -333,7 +337,7 @@ describe('topLevelMenu', () => {
   it('should show description if it is available on the mgmt cluster (relevant for RKE1/ember world)', async() => {
     const wrapper: Wrapper<InstanceType<typeof TopLevelMenu>> = mount(TopLevelMenu, {
       data: () => {
-        return { hasProvCluster: false, showPinClusters: true };
+        return { hasProvCluster: true, showPinClusters: true };
       },
       mocks: {
         $store: {
@@ -347,6 +351,7 @@ describe('topLevelMenu', () => {
               {
                 name:        'whatever',
                 id:          'an-id1',
+                mgmt:        { id: 'an-id1' },
                 description: 'some-description1',
                 nameDisplay: 'some-label',
                 isReady:     true,
@@ -356,6 +361,7 @@ describe('topLevelMenu', () => {
               {
                 name:        'whatever',
                 id:          'an-id2',
+                mgmt:        { id: 'an-id2' },
                 description: 'some-description2',
                 nameDisplay: 'some-label',
                 pinned:      true
@@ -364,6 +370,7 @@ describe('topLevelMenu', () => {
               {
                 name:        'whatever',
                 id:          'an-id3',
+                mgmt:        { id: 'an-id3' },
                 description: 'some-description3',
                 nameDisplay: 'some-label',
                 isReady:     true
@@ -372,6 +379,7 @@ describe('topLevelMenu', () => {
               {
                 name:        'whatever',
                 id:          'an-id4',
+                mgmt:        { id: 'an-id4' },
                 description: 'some-description4',
                 nameDisplay: 'some-label'
               },
@@ -430,11 +438,15 @@ describe('topLevelMenu', () => {
     describe('should displays a no results message if have clusters but', () => {
       it('given no matching clusters', () => {
         const wrapper: Wrapper<InstanceType<typeof TopLevelMenu>> = mount(TopLevelMenu, {
-          data:  () => ({ clusterFilter: 'whatever' }),
+          data:  () => ({ hasProvCluster: true, clusterFilter: 'whatever' }),
           mocks: {
             $store: {
               getters: {
-                'management/all': () => [{ nameDisplay: 'something else' }],
+                'management/all': () => [{
+                  id:          'an-id1',
+                  mgmt:        { id: 'an-id1' },
+                  nameDisplay: 'something else'
+                }],
                 ...defaultStore
               },
             },
@@ -449,11 +461,16 @@ describe('topLevelMenu', () => {
 
       it('given no matched pinned clusters', () => {
         const wrapper: Wrapper<InstanceType<typeof TopLevelMenu>> = mount(TopLevelMenu, {
-          data:  () => ({ clusterFilter: 'whatever' }),
+          data:  () => ({ hasProvCluster: true, clusterFilter: 'whatever' }),
           mocks: {
             $store: {
               getters: {
-                'management/all': () => [{ nameDisplay: 'something else', pinned: true }],
+                'management/all': () => [{
+                  id:          'an-id1',
+                  mgmt:        { id: 'an-id1' },
+                  nameDisplay: 'something else',
+                  pinned:      true
+                }],
                 ...defaultStore
               },
             },
@@ -471,11 +488,15 @@ describe('topLevelMenu', () => {
       it('given matching clusters', () => {
         const search = 'you found me';
         const wrapper: Wrapper<InstanceType<typeof TopLevelMenu>> = mount(TopLevelMenu, {
-          data:  () => ({ clusterFilter: search }),
+          data:  () => ({ hasProvCluster: true, clusterFilter: search }),
           mocks: {
             $store: {
               getters: {
-                'management/all': () => [{ nameDisplay: search }],
+                'management/all': () => [{
+                  id:          'an-id1',
+                  mgmt:        { id: 'an-id1' },
+                  nameDisplay: search
+                }],
                 ...defaultStore
               },
             },
@@ -492,11 +513,16 @@ describe('topLevelMenu', () => {
       it('given clusters with status pinned', () => {
         const search = 'you found me';
         const wrapper: Wrapper<InstanceType<typeof TopLevelMenu>> = mount(TopLevelMenu, {
-          data:  () => ({ clusterFilter: search }),
+          data:  () => ({ hasProvCluster: true, clusterFilter: search }),
           mocks: {
             $store: {
               getters: {
-                'management/all': () => [{ nameDisplay: search, pinned: true }],
+                'management/all': () => [{
+                  nameDisplay: search,
+                  pinned:      true,
+                  id:          'an-id1',
+                  mgmt:        { id: 'an-id1' },
+                }],
                 ...defaultStore
               },
             },

package/config/labels-annotations.js

@@ -172,3 +172,5 @@ export const SYSTEM_LABELS = [
   'node.kubernetes.io',
   'egress.rke2.io'
 ];
+
+export const CLOUD_CREDENTIALS = { EXPIRATION: 'rancher.io/expiration-timestamp' };

package/detail/catalog.cattle.io.app.vue

@@ -9,7 +9,8 @@ import RelatedResources from '@shell/components/RelatedResources';
 import jsyaml from 'js-yaml';
 import merge from 'lodash/merge';
 import { CATALOG } from '@shell/config/types';
-import { sortBy } from '~shell/utils/sort';
+import { sortBy } from '@shell/utils/sort';
+import { allHash } from '@shell/utils/promise';
 
 export default {
   name: 'DetailRelease',
@@ -30,9 +31,15 @@ export default {
   },
 
   async fetch() {
-    await this.$store.dispatch('catalog/load');
+    const promises = {
+      catalog:       this.$store.dispatch('catalog/load'),
+      allOperations: this.$store.dispatch('cluster/findAll', { type: CATALOG.OPERATION }),
+      secrets:       this.value.fetchValues(true),
+    };
 
-    this.allOperations = await this.$store.dispatch('cluster/findAll', { type: CATALOG.OPERATION });
+    const res = await allHash(promises);
+
+    this.allOperations = res.allOperations;
   },
 
   computed: {
@@ -45,7 +52,7 @@ export default {
     },
 
     valuesYaml() {
-      const combined = merge(merge({}, this.value?.spec?.chart?.values || {}), this.value?.spec?.values || {});
+      const combined = merge(merge({}, this.value?.chartValues || {}), this.value?.values || {});
 
       return jsyaml.dump(combined);
     },
@@ -95,6 +102,12 @@ export default {
       }
     },
   },
+
+  watch: {
+    'value.secretId'(neu, old) {
+      this.value.fetchValues(true);
+    }
+  },
 };
 </script>
 

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

@@ -6,6 +6,7 @@ import ResourceTabs from '@shell/components/form/ResourceTabs';
 import Tab from '@shell/components/Tabbed/Tab';
 import { MANAGEMENT, FLEET } from '@shell/config/types';
 import { FLEET as FLEET_LABELS } from '@shell/config/labels-annotations';
+import { allHash } from 'utils/promise';
 
 export default {
   name: 'FleetDetailCluster',
@@ -27,17 +28,18 @@ export default {
 
   async fetch() {
     const clusterId = this.value?.metadata?.labels[FLEET_LABELS.CLUSTER_NAME];
-
-    this.rancherCluster = await this.$store.dispatch('management/find', {
-      type: MANAGEMENT.CLUSTER,
-      id:   clusterId
+    const hash = await allHash({
+      rancherCluster: this.$store.dispatch('management/find', {
+        type: MANAGEMENT.CLUSTER,
+        id:   clusterId
+      }),
+      repos:             this.$store.dispatch('management/findAll', { type: FLEET.GIT_REPO }),
+      workspaces:        this.$store.dispatch('management/findAll', { type: FLEET.WORKSPACE }),
+      bundleDeployments: this.$store.dispatch('management/findAll', { type: FLEET.BUNDLE_DEPLOYMENT })
     });
 
-    this.allRepos = await this.$store.dispatch('management/findAll', { type: FLEET.GIT_REPO });
-
-    await this.$store.dispatch('management/findAll', { type: FLEET.WORKSPACE });
-
-    await this.$store.dispatch('management/findAll', { type: FLEET.BUNDLE_DEPLOYMENT });
+    this.rancherCluster = hash.rancherCluster;
+    this.allRepos = hash.repos;
   },
 
   data() {

package/detail/fleet.cattle.io.gitrepo.vue

@@ -40,7 +40,7 @@ export default {
   },
   computed: {
     gitRepoHasClusters() {
-      return this.value?.clusterResourceStatus?.length;
+      return this.value.status.desiredReadyClusters;
     },
     clusterSchema() {
       return this.$store.getters['management/schemaFor'](FLEET.CLUSTER);

package/edit/provisioning.cattle.io.cluster/rke2.vue

@@ -64,6 +64,7 @@ import AddOnConfig from '@shell/edit/provisioning.cattle.io.cluster/tabs/AddOnCo
 import Advanced from '@shell/edit/provisioning.cattle.io.cluster/tabs/Advanced';
 import ClusterAppearance from '@shell/components/form/ClusterAppearance';
 import AddOnAdditionalManifest from '@shell/edit/provisioning.cattle.io.cluster/tabs/AddOnAdditionalManifest';
+import VsphereUtils from '@shell/utils/v-sphere';
 
 const HARVESTER = 'harvester';
 const HARVESTER_CLOUD_PROVIDER = 'harvester-cloud-provider';
@@ -892,6 +893,8 @@ export default {
   created() {
     this.registerBeforeHook(this.saveMachinePools, 'save-machine-pools', 1);
     this.registerBeforeHook(this.setRegistryConfig, 'set-registry-config');
+    this.registerBeforeHook(this.handleVsphereCpiSecret, 'sync-vsphere-cpi');
+    this.registerBeforeHook(this.handleVsphereCsiSecret, 'sync-vsphere-csi');
     this.registerAfterHook(this.cleanupMachinePools, 'cleanup-machine-pools');
     this.registerAfterHook(this.saveRoleBindings, 'save-role-bindings');
 
@@ -904,6 +907,14 @@ export default {
   methods: {
     set,
 
+    async handleVsphereCpiSecret() {
+      return VsphereUtils.handleVsphereCpiSecret(this);
+    },
+
+    async handleVsphereCsiSecret() {
+      return VsphereUtils.handleVsphereCsiSecret(this);
+    },
+
     /**
      * Initialize all the cluster specs
      */
@@ -2420,8 +2431,10 @@ export default {
           name="additionalmanifest"
           label-key="cluster.tabs.addOnAdditionalManifest"
           :showHeader="false"
+          @active="refreshComponentWithYamls('additionalmanifest')"
         >
           <AddOnAdditionalManifest
+            ref="additionalmanifest"
             :value="value"
             :mode="mode"
             @additional-manifest-changed="updateAdditionalManifest"

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

@@ -10,10 +10,11 @@ import { mapFeature, HARVESTER as HARVESTER_FEATURE } from '@shell/store/feature
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import { BadgeState } from '@components/BadgeState';
+import CloudCredExpired from '@shell/components/formatter/CloudCredExpired';
 
 export default {
   components: {
-    Banner, ResourceTable, Masthead, BadgeState
+    Banner, ResourceTable, Masthead, BadgeState, CloudCredExpired
   },
   mixins: [ResourceFetch],
   props:  {
@@ -41,6 +42,8 @@ export default {
       mgmtClusters:    this.$fetchType(MANAGEMENT.CLUSTER),
     };
 
+    this.$store.dispatch('rancher/findAll', { type: NORMAN.CLOUD_CREDENTIAL });
+
     if ( this.$store.getters['management/canList'](SNAPSHOT) ) {
       hash.etcdSnapshots = this.$fetchType(SNAPSHOT);
     }
@@ -141,6 +144,29 @@ export default {
       // This will be used when there's clusters from extension based provisioners
       // We should re-visit this for scaling reasons
       return this.filteredRows.some((c) => c.metadata.namespace !== 'fleet-local' && c.metadata.namespace !== 'fleet-default');
+    },
+
+    tokenExpiredData() {
+      const counts = this.rows.reduce((res, provCluster) => {
+        const expireData = provCluster.cloudCredential?.expireData;
+
+        if (expireData?.expiring) {
+          res.expiring++;
+        }
+        if (expireData?.expired) {
+          res.expired++;
+        }
+
+        return res;
+      }, {
+        expiring: 0,
+        expired:  0
+      });
+
+      return {
+        expiring: counts.expiring ? this.t('cluster.cloudCredentials.banners.expiring', { count: counts.expiring }) : '',
+        expired:  counts.expired ? this.t('cluster.cloudCredentials.banners.expired', { count: counts.expired }) : '',
+      };
     }
   },
 
@@ -186,6 +212,17 @@ export default {
       </template>
     </Masthead>
 
+    <Banner
+      v-if="tokenExpiredData.expiring"
+      color="warning"
+      :label="tokenExpiredData.expiring"
+    />
+    <Banner
+      v-if="tokenExpiredData.expired"
+      color="error"
+      :label="tokenExpiredData.expired"
+    />
+
     <ResourceTable
       :schema="schema"
       :rows="filteredRows"
@@ -194,6 +231,7 @@ export default {
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
       :data-testid="'cluster-list'"
       :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
+      :sub-rows="true"
     >
       <!-- Why are state column and subrow overwritten here? -->
       <!-- for rke1 clusters, where they try to use the mgmt cluster stateObj instead of prov cluster stateObj,  -->
@@ -207,19 +245,32 @@ export default {
       </template>
       <template #sub-row="{fullColspan, row, keyField, componentTestid, i, onRowMouseEnter, onRowMouseLeave}">
         <tr
-          v-if="row.stateDescription"
           :key="row[keyField] + '-description'"
           :data-testid="componentTestid + '-' + i + '-row-description'"
           class="state-description sub-row"
           @mouseenter="onRowMouseEnter"
           @mouseleave="onRowMouseLeave"
         >
-          <td>&nbsp;</td>
+          <td v-if="row.cloudCredentialWarning || row.stateDescription">
+&nbsp;
+          </td>
           <td
+            v-if="row.cloudCredentialWarning || row.stateDescription"
             :colspan="fullColspan - 1"
-            :class="{ 'text-error' : row.stateObj.error }"
           >
-            {{ row.stateDescription }}
+            <CloudCredExpired
+              v-if="row.cloudCredentialWarning"
+              :value="row.cloudCredential.expires"
+              :row="row.cloudCredential"
+              :verbose="true"
+              :class="{'mb-10': row.stateDescription}"
+            />
+            <div
+              v-if="row.stateDescription"
+              :class="{ 'text-error' : row.stateObj.error }"
+            >
+              {{ row.stateDescription }}
+            </div>
           </td>
         </tr>
       </template>

package/mixins/chart.js

@@ -291,6 +291,8 @@ export default {
             id:   `${ this.query.appNamespace }/${ this.query.appName }`,
           });
 
+          await this.existing?.fetchValues(true);
+
           this.mode = _EDIT;
         } catch (e) {
           this.mode = _CREATE;
@@ -450,10 +452,12 @@ export default {
               }
             }
             if (existingCRDApp) {
+              await existingCRDApp.fetchValues(true);
+
               // spec.values are any non-default values the user configured
               // the installation form should show these, as well as any default values from the chart
-              const existingValues = clone(existingCRDApp.spec?.values || {});
-              const defaultValues = clone(existingCRDApp.spec?.chart?.values || {});
+              const existingValues = clone(existingCRDApp.values || {});
+              const defaultValues = clone(existingCRDApp.chartValues || {});
 
               crdVersionInfo.existingValues = existingValues;
               crdVersionInfo.allValues = merge(defaultValues, existingValues);