@rancher/shell 2.0.2-rc.1 → 2.0.3

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.bundle.vue

@@ -1,77 +1,25 @@
 <script>
-import { FLEET } from '@shell/config/types';
 import FleetBundleResources from '@shell/components/fleet/FleetBundleResources.vue';
-import SortableTable from '@shell/components/SortableTable';
+import FleetUtils from '@shell/utils/fleet';
 
 export default {
   name: 'FleetBundleDetail',
 
-  components: {
-    FleetBundleResources,
-    SortableTable,
-  },
-  props: {
+  components: { FleetBundleResources },
+  props:      {
     value: {
       type:     Object,
       required: true,
     }
   },
 
-  data() {
-    return { repo: null };
-  },
-
-  async fetch() {
-    const { namespace, labels } = this.value.metadata;
-    const repoName = `${ namespace }/${ labels['fleet.cattle.io/repo-name'] }`;
-
-    if (this.hasRepoLabel) {
-      this.repo = await this.$store.dispatch('management/find', { type: FLEET.GIT_REPO, id: repoName });
-    }
-  },
-
   computed: {
-    hasRepoLabel() {
-      return !!(this.value?.metadata?.labels && this.value?.metadata?.labels['fleet.cattle.io/repo-name']);
-    },
     bundleResources() {
-      if (this.hasRepoLabel) {
-        const bundleResourceIds = this.bundleResourceIds;
-
-        return this.repo?.status?.resources?.filter((resource) => {
-          return bundleResourceIds.includes(resource.name);
-        });
-      } else if (this.value?.spec?.resources?.length) {
-        return this.value?.spec?.resources.map((item) => {
-          return {
-            content: item.content,
-            name:    item.name.includes('.') ? item.name.split('.')[0] : item.name
-          };
-        });
-      }
-
-      return [];
-    },
-    resourceHeaders() {
-      return [
-        {
-          name:     'name',
-          value:    'name',
-          sort:     ['name'],
-          labelKey: 'tableHeaders.name',
-        },
-      ];
+      return FleetUtils.resourcesFromBundleStatus(this.value?.status);
     },
     resourceCount() {
-      return (this.bundleResources && this.bundleResources.length) || this.value?.spec?.resources?.length;
+      return this.bundleResources.length;
     },
-    bundleResourceIds() {
-      if (this.value.status?.resourceKey) {
-        return this.value?.status?.resourceKey.map((item) => item.name);
-      }
-
-      return [];
-    }
   }
 };
 
@@ -84,19 +32,8 @@ export default {
       <span>{{ resourceCount }}</span>
     </div>
     <FleetBundleResources
-      v-if="hasRepoLabel"
       :value="bundleResources"
     />
-    <SortableTable
-      v-else
-      :rows="bundleResources"
-      :headers="resourceHeaders"
-      :table-actions="false"
-      :row-actions="false"
-      key-field="tableKey"
-      default-sort-by="state"
-      :paged="true"
-    />
   </div>
 </template>
 

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);
@@ -80,7 +80,8 @@ export default {
     const allDispatches = await checkSchemasForFindAllHash({
       allBundles: {
         inStoreType: 'management',
-        type:        FLEET.BUNDLE
+        type:        FLEET.BUNDLE,
+        opt:         { excludeFields: ['metadata.managedFields', 'spec.resources'] },
       },
 
       allBundleDeployments: {

package/edit/provisioning.cattle.io.cluster/__tests__/DirectoryConfig.test.ts

@@ -1,6 +1,7 @@
+import { nextTick } from 'vue';
 /* eslint-disable jest/no-hooks */
 import { mount, Wrapper } from '@vue/test-utils';
-import DirectoryConfig from '@shell/edit/provisioning.cattle.io.cluster/tabs/DirectoryConfig.vue';
+import DirectoryConfig, { DATA_DIR_RADIO_OPTIONS, DEFAULT_SUBDIRS } from '@shell/edit/provisioning.cattle.io.cluster/tabs/DirectoryConfig.vue';
 import { _EDIT, _CREATE } from '@shell/config/query-params';
 import { clone } from '@shell/utils/object';
 
@@ -14,7 +15,8 @@ describe('component: DirectoryConfig', () => {
         provisioning: '',
         k8sDistro:    '',
       },
-      mode: _CREATE,
+      k8sVersion: 'k3s',
+      mode:       _CREATE,
     },
     mocks: {
       $store: {
@@ -33,48 +35,88 @@ describe('component: DirectoryConfig', () => {
     );
 
     const title = wrapper.find('h3');
+    const radioInput = wrapper.find('[data-testid="rke2-directory-config-radio-input"]');
+    const commonInput = wrapper.find('[data-testid="rke2-directory-config-common-data-dir"]');
     const systemAgentInput = wrapper.find('[data-testid="rke2-directory-config-systemAgent-data-dir"]');
     const provisioningInput = wrapper.find('[data-testid="rke2-directory-config-provisioning-data-dir"]');
     const k8sDistroInput = wrapper.find('[data-testid="rke2-directory-config-k8sDistro-data-dir"]');
 
     expect(title.exists()).toBe(true);
+    expect(radioInput.exists()).toBe(true);
 
-    expect(systemAgentInput.exists()).toBe(true);
-    expect(provisioningInput.exists()).toBe(true);
-    expect(k8sDistroInput.exists()).toBe(true);
+    // for the default config, the default radio input should be "default"
+    expect(wrapper.vm.dataConfigRadioValue).toBe(DATA_DIR_RADIO_OPTIONS.DEFAULT);
+
+    // since we have all of the vars empty, then the inputs should not be there
+    expect(commonInput.exists()).toBe(false);
+    expect(systemAgentInput.exists()).toBe(false);
+    expect(provisioningInput.exists()).toBe(false);
+    expect(k8sDistroInput.exists()).toBe(false);
   });
 
-  it('updating each individual data dir should set the correct values on each data dir variable', async() => {
+  it('updating common base directory should set the correct values on each data dir variable', async() => {
+    const newMountOptions = clone(mountOptions);
+
     wrapper = mount(
       DirectoryConfig,
-      mountOptions
+      {
+        ...newMountOptions,
+        // couldn't use setData, so this is the next best solution
+        data() {
+          return { dataConfigRadioValue: DATA_DIR_RADIO_OPTIONS.COMMON };
+        }
+      }
     );
 
     const inputPath = 'some-data-dir';
+    const commonInput = wrapper.find('[data-testid="rke2-directory-config-common-data-dir"]');
+
+    // update base dir value
+    expect(commonInput.exists()).toBe(true);
+    commonInput.setValue(inputPath);
+    await nextTick();
+
+    expect(wrapper.vm.value.systemAgent).toStrictEqual(`${ inputPath }/${ DEFAULT_SUBDIRS.AGENT }`);
+    expect(wrapper.vm.value.provisioning).toStrictEqual(`${ inputPath }/${ DEFAULT_SUBDIRS.PROVISIONING }`);
+    expect(wrapper.vm.value.k8sDistro).toStrictEqual(`${ inputPath }/${ DEFAULT_SUBDIRS.K8S_DISTRO_K3S }`);
+  });
+
+  it('updating each individual data dir should set the correct values on each data dir variable', async() => {
+    const newMountOptions = clone(mountOptions);
+
+    wrapper = mount(
+      DirectoryConfig,
+      {
+        ...newMountOptions,
+        // couldn't use setData, so this is the next best solution
+        data() {
+          return { dataConfigRadioValue: DATA_DIR_RADIO_OPTIONS.CUSTOM };
+        }
+      }
+    );
+    const inputPath = 'some-data-dir';
+    const agentValue = `${ inputPath }/${ DEFAULT_SUBDIRS.AGENT }`;
+    const provisioningValue = `${ inputPath }/${ DEFAULT_SUBDIRS.PROVISIONING }`;
+    const k8sDistroValue = `${ inputPath }/${ DEFAULT_SUBDIRS.K8S_DISTRO_RKE2 }`;
 
     const systemAgentInput = wrapper.find('[data-testid="rke2-directory-config-systemAgent-data-dir"]');
     const provisioningInput = wrapper.find('[data-testid="rke2-directory-config-provisioning-data-dir"]');
     const k8sDistroInput = wrapper.find('[data-testid="rke2-directory-config-k8sDistro-data-dir"]');
 
-    systemAgentInput.setValue(inputPath);
-    provisioningInput.setValue(inputPath);
-    k8sDistroInput.setValue(inputPath);
-    await wrapper.vm.$nextTick();
+    systemAgentInput.setValue(agentValue);
+    provisioningInput.setValue(provisioningValue);
+    k8sDistroInput.setValue(k8sDistroValue);
+    await nextTick();
 
-    expect(wrapper.vm.value.systemAgent).toStrictEqual(inputPath);
-    expect(wrapper.vm.value.provisioning).toStrictEqual(inputPath);
-    expect(wrapper.vm.value.k8sDistro).toStrictEqual(inputPath);
+    expect(wrapper.vm.value.systemAgent).toStrictEqual(agentValue);
+    expect(wrapper.vm.value.provisioning).toStrictEqual(provisioningValue);
+    expect(wrapper.vm.value.k8sDistro).toStrictEqual(k8sDistroValue);
   });
 
-  it('on a mode different than _CREATE all visible inputs should be disabled (with different values)', () => {
+  it('should render the component with configuration being an empty object, without errors and radio be of value DATA_DIR_RADIO_OPTIONS.CUSTOM (edit scenario)', () => {
     const newMountOptions = clone(mountOptions);
-    const inputPath1 = 'some-data-dir1';
-    const inputPath2 = 'some-data-dir2';
-    const inputPath3 = 'some-data-dir3';
 
-    newMountOptions.propsData.value.systemAgent = inputPath1;
-    newMountOptions.propsData.value.provisioning = inputPath2;
-    newMountOptions.propsData.value.k8sDistro = inputPath3;
+    newMountOptions.propsData.value = {};
     newMountOptions.propsData.mode = _EDIT;
 
     wrapper = mount(
@@ -82,16 +124,59 @@ describe('component: DirectoryConfig', () => {
       newMountOptions
     );
 
+    const title = wrapper.find('h3');
+    const radioInput = wrapper.find('[data-testid="rke2-directory-config-radio-input"]');
     const systemAgentInput = wrapper.find('[data-testid="rke2-directory-config-systemAgent-data-dir"]');
     const provisioningInput = wrapper.find('[data-testid="rke2-directory-config-provisioning-data-dir"]');
     const k8sDistroInput = wrapper.find('[data-testid="rke2-directory-config-k8sDistro-data-dir"]');
 
+    expect(title.exists()).toBe(true);
+    expect(radioInput.isVisible()).toBe(false);
+
+    expect(wrapper.vm.dataConfigRadioValue).toBe(DATA_DIR_RADIO_OPTIONS.CUSTOM);
+
+    // since we have all of the vars empty, then the inputs should not be there
     expect(systemAgentInput.exists()).toBe(true);
     expect(provisioningInput.exists()).toBe(true);
     expect(k8sDistroInput.exists()).toBe(true);
 
-    expect(systemAgentInput.attributes('disabled')).toBe('disabled');
-    expect(provisioningInput.attributes('disabled')).toBe('disabled');
-    expect(k8sDistroInput.attributes('disabled')).toBe('disabled');
+    expect(systemAgentInput.attributes().disabled).toBeDefined();
+    expect(provisioningInput.attributes().disabled).toBeDefined();
+    expect(k8sDistroInput.attributes().disabled).toBeDefined();
+  });
+
+  it('radio input should be set to DATA_DIR_RADIO_OPTIONS.CUSTOM with all data dir values existing and different (edit scenario)', () => {
+    const newMountOptions = clone(mountOptions);
+    const inputPath = 'some-data-dir';
+
+    newMountOptions.propsData.value.systemAgent = `${ inputPath }/${ DEFAULT_SUBDIRS.AGENT }`;
+    newMountOptions.propsData.value.provisioning = `${ inputPath }/${ DEFAULT_SUBDIRS.PROVISIONING }`;
+    newMountOptions.propsData.value.k8sDistro = `${ inputPath }/${ DEFAULT_SUBDIRS.K8S_DISTRO_K3S }`;
+    newMountOptions.propsData.mode = _EDIT;
+
+    wrapper = mount(
+      DirectoryConfig,
+      newMountOptions
+    );
+
+    expect(wrapper.vm.dataConfigRadioValue).toBe(DATA_DIR_RADIO_OPTIONS.CUSTOM);
+
+    const radioInput = wrapper.find('[data-testid="rke2-directory-config-radio-input"]');
+    const systemAgentInput = wrapper.find('[data-testid="rke2-directory-config-systemAgent-data-dir"]');
+    const provisioningInput = wrapper.find('[data-testid="rke2-directory-config-provisioning-data-dir"]');
+    const k8sDistroInput = wrapper.find('[data-testid="rke2-directory-config-k8sDistro-data-dir"]');
+
+    expect(radioInput.isVisible()).toBe(false);
+    expect(systemAgentInput.isVisible()).toBe(true);
+    expect(provisioningInput.isVisible()).toBe(true);
+    expect(k8sDistroInput.isVisible()).toBe(true);
+
+    expect(systemAgentInput.attributes().disabled).toBeDefined();
+    expect(provisioningInput.attributes().disabled).toBeDefined();
+    expect(k8sDistroInput.attributes().disabled).toBeDefined();
+
+    expect(wrapper.vm.value.systemAgent).toStrictEqual(`${ inputPath }/${ DEFAULT_SUBDIRS.AGENT }`);
+    expect(wrapper.vm.value.provisioning).toStrictEqual(`${ inputPath }/${ DEFAULT_SUBDIRS.PROVISIONING }`);
+    expect(wrapper.vm.value.k8sDistro).toStrictEqual(`${ inputPath }/${ DEFAULT_SUBDIRS.K8S_DISTRO_K3S }`);
   });
 });

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

@@ -203,8 +203,9 @@ export default {
 
     emberLink() {
       if (this.value) {
+        // set subtype if editing EKS/GKE/AKS cluster -- this ensures that the component provided by extension is loaded instead of iframing old ember ui
         if (this.value.provisioner) {
-          const matchingSubtype = this.subTypes.find((st) => st.id.toLowerCase() === this.value.provisioner.toLowerCase() || DRIVER_TO_IMPORT[st.id.toLowerCase()] === this.value.provisioner.toLowerCase());
+          const matchingSubtype = this.subTypes.find((st) => DRIVER_TO_IMPORT[st.id.toLowerCase()] === this.value.provisioner.toLowerCase());
 
           if (matchingSubtype) {
             this.selectType(matchingSubtype.id, false);
@@ -395,7 +396,8 @@ export default {
           disabled:    ext.disabled || false,
           link:        ext.link,
           tag:         ext.tag,
-          component:   ext.component
+          component:   ext.component,
+          hidden:      ext.hidden,
         };
 
         out.push(subtype);
@@ -440,10 +442,14 @@ export default {
       }
     },
 
+    filteredSubTypes() {
+      return this.subTypes.filter((subtype) => !subtype.hidden);
+    },
+
     groupedSubTypes() {
       const out = {};
 
-      for ( const row of this.subTypes ) {
+      for ( const row of this.filteredSubTypes ) {
         const name = row.group;
         let entry = out[name];
 
@@ -605,7 +611,7 @@ export default {
       <div
         v-for="(obj, i) in groupedSubTypes"
         :key="obj.id"
-        class="mb-20"
+        :class="{'mt-5': i === 0, 'mt-20': i !== 0 }"
         style="width: 100%;"
       >
         <h4>

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

@@ -64,13 +64,12 @@ 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, { VMWARE_VSPHERE } from '@shell/utils/v-sphere';
 
 const HARVESTER = 'harvester';
 const HARVESTER_CLOUD_PROVIDER = 'harvester-cloud-provider';
 const NETBIOS_TRUNCATION_LENGTH = 15;
 
-const VMWARE_VSPHERE = 'vmwarevsphere';
-
 /**
  * Classes to be adopted by the node badges in Machine pools
  */
@@ -892,6 +891,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 +905,14 @@ export default {
   methods: {
     set,
 
+    async handleVsphereCpiSecret() {
+      return VsphereUtils.handleVsphereCpiSecret(this);
+    },
+
+    async handleVsphereCsiSecret() {
+      return VsphereUtils.handleVsphereCsiSecret(this);
+    },
+
     /**
      * Initialize all the cluster specs
      */
@@ -2420,8 +2429,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/edit/provisioning.cattle.io.cluster/tabs/Advanced.vue

@@ -101,6 +101,7 @@ export default {
     <template v-if="haveArgInfo">
       <DirectoryConfig
         v-model="value.spec.rkeConfig.dataDirectories"
+        :k8s-version="value.spec.kubernetesVersion"
         :mode="mode"
       />
       <h3>{{ t('cluster.advanced.argInfo.title') }}</h3>