@rancher/shell 0.1.1 → 0.1.3

package/edit/namespace.vue

@@ -15,7 +15,7 @@ import MoveModal from '@shell/components/MoveModal';
 import ResourceQuota from '@shell/components/form/ResourceQuota/Namespace';
 import Loading from '@shell/components/Loading';
 import { HARVESTER_TYPES, RANCHER_TYPES } from '@shell/components/form/ResourceQuota/shared';
-import { NAME as HARVESTER } from '@shell/config/product/harvester';
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/product/harvester-manager';
 
 export default {
   components: {
@@ -34,9 +34,11 @@ export default {
   mixins: [CreateEditView],
 
   async fetch() {
-    this.projects = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.PROJECT });
+    if (this.$store.getters['management/schemaFor'](MANAGEMENT.PROJECT)) {
+      this.projects = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.PROJECT });
 
-    this.project = this.projects.find(p => p.id.includes(this.projectName));
+      this.project = this.projects.find(p => p.id.includes(this.projectName));
+    }
   },
 
   data() {
@@ -62,8 +64,9 @@ export default {
 
   computed: {
     ...mapGetters(['isSingleProduct']),
-    isHarvester() {
-      return this.$store.getters['currentProduct'].inStore === HARVESTER;
+
+    isSingleHarvester() {
+      return this.$store.getters['currentProduct'].inStore === HARVESTER && this.isSingleProduct;
     },
 
     projectOpts() {
@@ -93,7 +96,11 @@ export default {
     },
 
     showResourceQuota() {
-      return Object.keys(this.project?.spec?.resourceQuota?.limit || {}).length > 0;
+      return !this.isSingleHarvester && Object.keys(this.project?.spec?.resourceQuota?.limit || {}).length > 0;
+    },
+
+    showContainerResourceLimit() {
+      return !this.isSingleHarvester;
     }
   },
 
@@ -160,13 +167,13 @@ export default {
       :namespaced="false"
       :mode="mode"
     >
-      <template v-if="!isSingleProduct" #project-col>
+      <template v-if="project" #project-col>
         <LabeledSelect v-model="projectName" :label="t('namespace.project.label')" :options="projectOpts" />
       </template>
     </NameNsDescription>
 
     <Tabbed :side-tabs="true">
-      <Tab v-if="!isSingleProduct && showResourceQuota" :weight="1" name="container-resource-quotas" :label="t('namespace.resourceQuotas')">
+      <Tab v-if="showResourceQuota" :weight="1" name="container-resource-quotas" :label="t('namespace.resourceQuotas')">
         <div class="row">
           <div class="col span-12">
             <p class="helper-text mb-10">
@@ -177,7 +184,7 @@ export default {
         </div>
         <ResourceQuota v-model="value" :mode="mode" :project="project" :types="isHarvester ? HARVESTER_TYPES : RANCHER_TYPES" />
       </Tab>
-      <Tab v-if="!isSingleProduct" :weight="0" name="container-resource-limit" :label="t('namespace.containerResourceLimit')">
+      <Tab v-if="showContainerResourceLimit" :weight="0" name="container-resource-limit" :label="t('namespace.containerResourceLimit')">
         <ContainerResourceLimit
           :key="JSON.stringify(containerResourceLimits)"
           :value="containerResourceLimits"
@@ -200,6 +207,6 @@ export default {
         />
       </Tab>
     </Tabbed>
-    <MoveModal />
+    <MoveModal v-if="projects" />
   </CruResource>
 </template>

package/edit/networking.k8s.io.ingress/index.vue

@@ -44,10 +44,11 @@ export default {
     }
   },
   async fetch() {
+    const ingressClassSchema = this.$store.getters[`cluster/schemaFor`](INGRESS_CLASS);
     const hash = await allHash({
       secrets:        this.$store.dispatch('cluster/findAll', { type: SECRET }),
       services:       this.$store.dispatch('cluster/findAll', { type: SERVICE }),
-      ingressClasses: this.$store.dispatch('cluster/findAll', { type: INGRESS_CLASS }),
+      ingressClasses: ingressClassSchema ? this.$store.dispatch('cluster/findAll', { type: INGRESS_CLASS }) : Promise.resolve([]),
     });
 
     this.allServices = hash.services;

package/edit/persistentvolumeclaim.vue

@@ -5,6 +5,7 @@ import CruResource from '@shell/components/CruResource';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import Tab from '@shell/components/Tabbed/Tab';
 import { RadioGroup } from '@components/Form/Radio';
+import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import UnitInput from '@shell/components/form/UnitInput';
 import uniq from 'lodash/uniq';
@@ -24,6 +25,7 @@ export default {
     Banner,
     Checkbox,
     CruResource,
+    LabeledInput,
     LabeledSelect,
     Labels,
     NameNsDescription,
@@ -38,7 +40,9 @@ export default {
   async fetch() {
     const storageClasses = await this.$store.dispatch('cluster/findAll', { type: STORAGE_CLASS });
 
-    this.persistentVolumes = await this.$store.dispatch('cluster/findAll', { type: PV });
+    if (this.$store.getters['management/canList'](PV)) {
+      this.persistentVolumes = await this.$store.dispatch('cluster/findAll', { type: PV });
+    }
 
     this.storageClassOptions = storageClasses.map(s => s.name).sort();
     this.storageClassOptions.unshift(this.t('persistentVolumeClaim.useDefault'));
@@ -55,6 +59,8 @@ export default {
     this.$set(this.value.spec, 'storageClassName', this.value.spec.storageClassName || this.storageClassOptions[0]);
   },
   data() {
+    const canListPersistentVolumes = this.$store.getters['management/canList'](PV);
+    const canListStorageClasses = this.$store.getters['management/canList'](STORAGE_CLASS);
     const sourceOptions = [
       {
         label: this.t('persistentVolumeClaim.source.options.new'),
@@ -65,6 +71,7 @@ export default {
         value: 'existing'
       }
     ];
+
     const defaultAccessModes = ['ReadWriteOnce'];
 
     this.$set(this.value, 'spec', this.value.spec || {});
@@ -85,6 +92,8 @@ export default {
       persistentVolumes:       [],
       storageClassOptions:     [],
       defaultTab,
+      canListPersistentVolumes,
+      canListStorageClasses,
     };
   },
   computed: {
@@ -216,16 +225,37 @@ export default {
           <div class="col span-6">
             <div class="row">
               <div v-if="source === 'new'" class="col span-12">
-                <LabeledSelect v-model="value.spec.storageClassName" :options="storageClassOptions" :label="t('persistentVolumeClaim.volumeClaim.storageClass')" :mode="immutableMode" />
+                <LabeledSelect
+                  v-if="canListStorageClasses"
+                  v-model="value.spec.storageClassName"
+                  :options="storageClassOptions"
+                  :label="t('persistentVolumeClaim.volumeClaim.storageClass')"
+                  :mode="immutableMode"
+                />
+                <LabeledInput
+                  v-else
+                  v-model="value.spec.storageClassName"
+                  :label="t('persistentVolumeClaim.volumeClaim.storageClass')"
+                  :mode="immutableMode"
+                  :tooltip="t('persistentVolumeClaim.volumeClaim.tooltips.noStorageClass')"
+                />
               </div>
               <div v-else class="col span-12">
                 <LabeledSelect
+                  v-if="canListPersistentVolumes"
                   v-model="persistentVolume"
                   :options="persistentVolumeOptions"
                   :label="t('persistentVolumeClaim.volumeClaim.persistentVolume')"
                   :selectable="isPersistentVolumeSelectable"
                   :mode="immutableMode"
                 />
+                <LabeledInput
+                  v-else
+                  v-model="persistentVolume"
+                  :label="t('persistentVolumeClaim.volumeClaim.persistentVolume')"
+                  :mode="immutableMode"
+                  :tooltip="t('persistentVolumeClaim.volumeClaim.tooltips.noPersistentVolume')"
+                />
               </div>
             </div>
             <div class="row">
@@ -239,6 +269,7 @@ export default {
                   :output-modifier="true"
                   :increment="1024"
                   :min="1"
+                  :required="true"
                 />
                 <Banner v-if="isEdit && !value.expandable" color="info" class="mt-10">
                   {{ t('persistentVolumeClaim.expand.notSupported') }}

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

@@ -71,7 +71,7 @@ export default {
         const e = sanitizeValue(t.effect);
 
         if ( k && v && e ) {
-          out.push(`--taint ${ k }=${ v }:${ e }`);
+          out.push(`--taints ${ k }=${ v }:${ e }`);
         }
       }
 

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

@@ -1,5 +1,4 @@
 <script>
-
 import { LabeledInput } from '@components/Form/LabeledInput';
 import { Checkbox } from '@components/Form/Checkbox';
 import { _EDIT } from '@shell/config/query-params';
@@ -64,11 +63,40 @@ export default {
 
   data() {
     const parseDuration = (duration) => {
-      // The back end stores the timeout in Duration format, for example, "10m".
-      // Here we convert that string to an integer.
-      const numberString = duration.split('m')[0];
+      // The back end stores the timeout in Duration format, for example, "42d31h10m30s".
+      // Here we convert that string to an integer and return the duration as seconds.
+      const splitStr = duration.split(/([a-z])/);
+
+      const durationsAsSeconds = splitStr.reduce((old, neu, idx) => {
+        const parsed = parseInt(neu);
+
+        if ( isNaN(parsed) ) {
+          return old;
+        }
+
+        const interval = splitStr[(idx + 1)];
+
+        switch (interval) {
+        case 'd':
+          old.push(parsed * 24 * 60 * 60);
+          break;
+        case 'h':
+          old.push(parsed * 60 * 60);
+          break;
+        case 'm':
+          old.push(parsed * 60);
+          break;
+        case 's':
+          old.push(parsed);
+          break;
+        default:
+          break;
+        }
+
+        return old;
+      }, []);
 
-      return parseInt(numberString, 10);
+      return durationsAsSeconds.reduce((old, neu) => old + neu);
     };
 
     return {
@@ -210,7 +238,7 @@ export default {
             :mode="mode"
             :output-modifier="true"
             :base-unit="t('cluster.machinePool.autoReplace.unit')"
-            @input="value.pool.unhealthyNodeTimeout = `${unhealthyNodeTimeoutInteger}m`"
+            @input="value.pool.unhealthyNodeTimeout = `${unhealthyNodeTimeoutInteger}s`"
           />
         </div>
         <div class="col span-4">

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

@@ -4,7 +4,7 @@ import Loading from '@shell/components/Loading';
 import CruResource from '@shell/components/CruResource';
 import SelectIconGrid from '@shell/components/SelectIconGrid';
 import EmberPage from '@shell/components/EmberPage';
-import ToggleSwitch from '@shell/components/form/ToggleSwitch';
+import { ToggleSwitch } from '@components/Form/ToggleSwitch';
 import {
   CHART, FROM_CLUSTER, SUB_TYPE, _EDIT, _IMPORT, _CONFIG, _VIEW
 } from '@shell/config/query-params';

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

@@ -249,10 +249,6 @@ export default {
       set(this.value.spec, 'defaultPodSecurityPolicyTemplateName', '');
     }
 
-    if (this.isHarvesterDriver && this.mode === _CREATE && this.agentConfig['cloud-provider-name'] === undefined) {
-      this.agentConfig['cloud-provider-name'] = HARVESTER;
-    }
-
     await this.initAddons();
     await this.initRegistry();
 
@@ -501,11 +497,17 @@ export default {
         // If we have a preferred provider... only show default, preferred and external
         const isPreferred = opt === preferred;
         const isExternal = opt === 'external';
+        let disabled = false;
+
+        if (this.isHarvesterExternalCredential && isPreferred) {
+          disabled = true;
+        }
 
         if (showAllOptions || isPreferred || isExternal) {
           out.push({
             label: this.$store.getters['i18n/withFallback'](`cluster.cloudProvider."${ opt }".label`, null, opt),
             value: opt,
+            disabled,
           });
         }
       }
@@ -843,7 +845,11 @@ export default {
 
     showForm() {
       return !!this.credentialId || !this.needCredential;
-    }
+    },
+
+    isHarvesterExternalCredential() {
+      return this.credential?.harvestercredentialConfig?.clusterType === 'external';
+    },
   },
 
   watch: {
@@ -861,6 +867,7 @@ export default {
     credentialId(val) {
       if ( val ) {
         this.credential = this.$store.getters['rancher/byId'](NORMAN.CLOUD_CREDENTIAL, this.credentialId);
+        this.setHarvesterDefaultCloudProvider();
       } else {
         this.credential = null;
       }
@@ -1552,7 +1559,15 @@ export default {
         }
       });
     },
-    get
+    get,
+
+    setHarvesterDefaultCloudProvider() {
+      if (this.isHarvesterDriver && this.mode === _CREATE && this.agentConfig['cloud-provider-name'] === undefined && !this.isHarvesterExternalCredential) {
+        this.agentConfig['cloud-provider-name'] = HARVESTER;
+      } else {
+        this.agentConfig['cloud-provider-name'] = '';
+      }
+    },
   },
 };
 </script>

package/edit/service.vue

@@ -22,7 +22,7 @@ import HarvesterServiceAddOnConfig from '@shell/components/HarvesterServiceAddOn
 import { clone } from '@shell/utils/object';
 import { POD, CAPI } from '@shell/config/types';
 import { matching } from '@shell/utils/selector';
-import { NAME as HARVESTER } from '@shell/config/product/harvester';
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/product/harvester-manager';
 import { allHash } from '@shell/utils/promise';
 import { isHarvesterSatisfiesVersion } from '@shell/utils/cluster';
 import { Port } from '@shell/utils/validators/formRules';