@rancher/shell 0.2.2 → 0.2.4

package/edit/persistentvolume/plugins/storageos.vue

@@ -39,24 +39,49 @@ export default {
   <div>
     <div class="row mb-20">
       <div class="col span-6">
-        <LabeledInput v-model="value.spec.storageos.volumeName" :mode="mode" :label="t('persistentVolume.storageos.volumeName.label')" :placeholder="t('persistentVolume.storageos.volumeName.placeholder')" />
+        <LabeledInput
+          v-model="value.spec.storageos.volumeName"
+          :mode="mode"
+          :label="t('persistentVolume.storageos.volumeName.label')"
+          :placeholder="t('persistentVolume.storageos.volumeName.placeholder')"
+        />
       </div>
       <div class="col span-6">
-        <LabeledInput v-model="value.spec.storageos.volumeNamespace" :mode="mode" :label="t('persistentVolume.storageos.volumeNamespace.label')" :placeholder="t('persistentVolume.storageos.volumeNamespace.placeholder')" />
+        <LabeledInput
+          v-model="value.spec.storageos.volumeNamespace"
+          :mode="mode"
+          :label="t('persistentVolume.storageos.volumeNamespace.label')"
+          :placeholder="t('persistentVolume.storageos.volumeNamespace.placeholder')"
+        />
       </div>
     </div>
     <div class="row mb-20">
       <div class="col span-6">
-        <LabeledInput v-model="value.spec.storageos.secretRef.name" :mode="mode" :label="t('persistentVolume.shared.secretName.label')" :placeholder="t('persistentVolume.shared.secretName.placeholder')" />
+        <LabeledInput
+          v-model="value.spec.storageos.secretRef.name"
+          :mode="mode"
+          :label="t('persistentVolume.shared.secretName.label')"
+          :placeholder="t('persistentVolume.shared.secretName.placeholder')"
+        />
       </div>
       <div class="col span-6">
-        <LabeledInput v-model="value.spec.storageos.secretRef.namespace" :mode="mode" :label="t('persistentVolume.shared.secretNamespace.label')" :placeholder="t('persistentVolume.shared.secretNamespace.placeholder')" />
+        <LabeledInput
+          v-model="value.spec.storageos.secretRef.namespace"
+          :mode="mode"
+          :label="t('persistentVolume.shared.secretNamespace.label')"
+          :placeholder="t('persistentVolume.shared.secretNamespace.placeholder')"
+        />
       </div>
     </div>
 
     <div class="row mb-20">
       <div class="col span-6">
-        <LabeledInput v-model="value.spec.storageos.fsType" :mode="mode" :label="t('persistentVolume.shared.filesystemType.label')" :placeholder="t('persistentVolume.shared.filesystemType.placeholder')" />
+        <LabeledInput
+          v-model="value.spec.storageos.fsType"
+          :mode="mode"
+          :label="t('persistentVolume.shared.filesystemType.label')"
+          :placeholder="t('persistentVolume.shared.filesystemType.placeholder')"
+        />
       </div>
       <div class="col span-6">
         <RadioGroup

package/edit/persistentvolume/plugins/vsphereVolume.vue

@@ -25,18 +25,38 @@ export default {
   <div>
     <div class="row mb-20">
       <div class="col span-6">
-        <LabeledInput v-model="value.spec.vsphereVolume.volumePath" :mode="mode" :label="t('persistentVolume.vsphereVolume.volumePath.label')" :placeholder="t('persistentVolume.vsphereVolume.volumePath.placeholder')" />
+        <LabeledInput
+          v-model="value.spec.vsphereVolume.volumePath"
+          :mode="mode"
+          :label="t('persistentVolume.vsphereVolume.volumePath.label')"
+          :placeholder="t('persistentVolume.vsphereVolume.volumePath.placeholder')"
+        />
       </div>
       <div class="col span-6">
-        <LabeledInput v-model="value.spec.vsphereVolume.storagePolicyName" :mode="mode" :label="t('persistentVolume.vsphereVolume.storagePolicyName.label')" :placeholder="t('persistentVolume.vsphereVolume.storagePolicyName.placeholder')" />
+        <LabeledInput
+          v-model="value.spec.vsphereVolume.storagePolicyName"
+          :mode="mode"
+          :label="t('persistentVolume.vsphereVolume.storagePolicyName.label')"
+          :placeholder="t('persistentVolume.vsphereVolume.storagePolicyName.placeholder')"
+        />
       </div>
     </div>
     <div class="row mb-20">
       <div class="col span-6">
-        <LabeledInput v-model="value.spec.vsphereVolume.storagePolicyID" :mode="mode" :label="t('persistentVolume.vsphereVolume.storagePolicyId.label')" :placeholder="t('persistentVolume.vsphereVolume.storagePolicyId.placeholder')" />
+        <LabeledInput
+          v-model="value.spec.vsphereVolume.storagePolicyID"
+          :mode="mode"
+          :label="t('persistentVolume.vsphereVolume.storagePolicyId.label')"
+          :placeholder="t('persistentVolume.vsphereVolume.storagePolicyId.placeholder')"
+        />
       </div>
       <div class="col span-6">
-        <LabeledInput v-model="value.spec.vsphereVolume.fsType" :mode="mode" :label="t('persistentVolume.shared.filesystemType.label')" :placeholder="t('persistentVolume.shared.filesystemType.placeholder')" />
+        <LabeledInput
+          v-model="value.spec.vsphereVolume.fsType"
+          :mode="mode"
+          :label="t('persistentVolume.shared.filesystemType.label')"
+          :placeholder="t('persistentVolume.shared.filesystemType.placeholder')"
+        />
       </div>
     </div>
   </div>

package/edit/persistentvolumeclaim.vue

@@ -41,7 +41,7 @@ export default {
   async fetch() {
     const storageClasses = await this.$store.dispatch('cluster/findAll', { type: STORAGE_CLASS });
 
-    if (this.$store.getters['management/canList'](PV)) {
+    if (this.$store.getters['cluster/canList'](PV)) {
       this.resourceManagerFetchSecondaryResources(this.secondaryResourceData);
     }
 
@@ -51,8 +51,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 canListPersistentVolumes = this.$store.getters['cluster/canList'](PV);
+    const canListStorageClasses = this.$store.getters['cluster/canList'](STORAGE_CLASS);
     const sourceOptions = [
       {
         label: this.t('persistentVolumeClaim.source.options.new'),
@@ -145,12 +145,16 @@ export default {
       set(value) {
         const persistentVolume = this.persistentVolumes.find(pv => pv.metadata.name === value);
 
+        this.$set(this.value.spec, 'storageClassName', '');
+
         if (persistentVolume) {
           this.$set(this.value.spec.resources.requests, 'storage', persistentVolume.spec.capacity?.storage);
+          if (persistentVolume.spec?.storageClassName) {
+            this.$set(this.value.spec, 'storageClassName', persistentVolume.spec?.storageClassName );
+          }
         }
 
         this.$set(this.value.spec, 'volumeName', value);
-        this.$set(this.value.spec, 'storageClassName', '');
       }
     },
     storageAmountMode() {
@@ -226,8 +230,17 @@ export default {
       :namespaced="true"
     />
 
-    <ResourceTabs v-model="value" :mode="mode" :side-tabs="true" :default-tab="defaultTab">
-      <Tab name="volumeclaim" :label="t('persistentVolumeClaim.volumeClaim.label')" :weight="4">
+    <ResourceTabs
+      v-model="value"
+      :mode="mode"
+      :side-tabs="true"
+      :default-tab="defaultTab"
+    >
+      <Tab
+        name="volumeclaim"
+        :label="t('persistentVolumeClaim.volumeClaim.label')"
+        :weight="4"
+      >
         <div class="row">
           <div class="col span-6">
             <RadioGroup
@@ -241,7 +254,10 @@ export default {
           </div>
           <div class="col span-6">
             <div class="row">
-              <div v-if="source === 'new'" class="col span-12">
+              <div
+                v-if="source === 'new'"
+                class="col span-12"
+              >
                 <LabeledSelect
                   v-if="canListStorageClasses"
                   v-model="value.spec.storageClassName"
@@ -257,7 +273,10 @@ export default {
                   :tooltip="t('persistentVolumeClaim.volumeClaim.tooltips.noStorageClass')"
                 />
               </div>
-              <div v-else class="col span-12">
+              <div
+                v-else
+                class="col span-12"
+              >
                 <LabeledSelect
                   v-if="canListPersistentVolumes"
                   v-model="persistentVolume"
@@ -289,10 +308,18 @@ export default {
                   :min="1"
                   :required="true"
                 />
-                <Banner v-if="isEdit && !value.expandable" color="info" class="mt-10">
+                <Banner
+                  v-if="isEdit && !value.expandable"
+                  color="info"
+                  class="mt-10"
+                >
                   {{ t('persistentVolumeClaim.expand.notSupported') }}
                 </Banner>
-                <Banner v-else-if="isEdit && !value.bound" color="info" class="mt-10">
+                <Banner
+                  v-else-if="isEdit && !value.bound"
+                  color="info"
+                  class="mt-10"
+                >
                   {{ t('persistentVolumeClaim.expand.notBound') }}
                 </Banner>
               </div>
@@ -300,16 +327,43 @@ export default {
           </div>
         </div>
       </Tab>
-      <Tab name="customize" :label="t('persistentVolumeClaim.customize.label')" :weight="3">
+      <Tab
+        name="customize"
+        :label="t('persistentVolumeClaim.customize.label')"
+        :weight="3"
+      >
         <div class="access">
           <h3>{{ t('persistentVolumeClaim.accessModes') }}</h3>
           <span class="text-error">*</span>
         </div>
-        <div><Checkbox v-model="readWriteOnce" :label="t('persistentVolumeClaim.customize.accessModes.readWriteOnce')" :mode="immutableMode" /></div>
-        <div><Checkbox v-model="readOnlyMany" :label="t('persistentVolumeClaim.customize.accessModes.readOnlyMany')" :mode="immutableMode" /></div>
-        <div><Checkbox v-model="readWriteMany" :label="t('persistentVolumeClaim.customize.accessModes.readWriteMany')" :mode="immutableMode" /></div>
+        <div>
+          <Checkbox
+            v-model="readWriteOnce"
+            :label="t('persistentVolumeClaim.customize.accessModes.readWriteOnce')"
+            :mode="immutableMode"
+          />
+        </div>
+        <div>
+          <Checkbox
+            v-model="readOnlyMany"
+            :label="t('persistentVolumeClaim.customize.accessModes.readOnlyMany')"
+            :mode="immutableMode"
+          />
+        </div>
+        <div>
+          <Checkbox
+            v-model="readWriteMany"
+            :label="t('persistentVolumeClaim.customize.accessModes.readWriteMany')"
+            :mode="immutableMode"
+          />
+        </div>
       </Tab>
-      <Tab v-if="isView" name="status" :label="t('persistentVolumeClaim.status.label')" :weight="2">
+      <Tab
+        v-if="isView"
+        name="status"
+        :label="t('persistentVolumeClaim.status.label')"
+        :weight="2"
+      >
         <StatusTable :resource="value" />
       </Tab>
       <Tab

package/edit/policy.poddisruptionbudget.vue

@@ -0,0 +1,149 @@
+<script>
+import CreateEditView from '@shell/mixins/create-edit-view';
+import CruResource from '@shell/components/CruResource';
+import NameNsDescription from '@shell/components/form/NameNsDescription';
+import Tab from '@shell/components/Tabbed/Tab';
+import ResourceTabs from '@shell/components/form/ResourceTabs';
+import Labels from '@shell/components/form/Labels';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import ResourceSelector from '@shell/components/form/ResourceSelector';
+import { POD } from '@shell/config/types';
+import FormValidation from '@shell/mixins/form-validation';
+
+export default {
+  name: 'PodDisruptionBudget',
+
+  components: {
+    ResourceSelector,
+    CruResource,
+    Labels,
+    LabeledInput,
+    NameNsDescription,
+    ResourceTabs,
+    Tab,
+  },
+
+  mixins: [CreateEditView, FormValidation],
+
+  data() {
+    if ( !this.value.spec ) {
+      this.$set(this.value, 'spec', {
+        selector: {
+          matchExpressions: [],
+          matchLabels:      {},
+        }
+      });
+    }
+
+    return { POD };
+  },
+
+  computed: {
+    minAvailable: {
+      get() {
+        return this.value.spec.minAvailable;
+      },
+      set(val) {
+        const isNumeric = /^\d+$/;
+
+        if (val && isNumeric.test(val)) {
+          this.$set(this.value.spec, 'minAvailable', Number.parseInt(val));
+        } else if (val) {
+          this.$set(this.value.spec, 'minAvailable', val);
+        } else {
+          this.$delete(this.value.spec, 'minAvailable');
+        }
+      }
+    },
+    maxUnavailable: {
+      get() {
+        return this.value.spec.maxUnavailable;
+      },
+      set(val) {
+        const isNumeric = /^\d+$/;
+
+        if (val && isNumeric.test(val)) {
+          this.$set(this.value.spec, 'maxUnavailable', Number.parseInt(val));
+        } else if (val) {
+          this.$set(this.value.spec, 'maxUnavailable', val);
+        } else {
+          this.$delete(this.value.spec, 'maxUnavailable');
+        }
+      }
+    },
+  }
+};
+</script>
+
+<template>
+  <CruResource
+    :done-route="doneRoute"
+    :mode="mode"
+    :resource="value"
+    :subtypes="[]"
+    :validation-passed="true"
+    :errors="errors"
+    @error="e=>errors = e"
+    @finish="save"
+    @cancel="done"
+  >
+    <NameNsDescription
+      :value="value"
+      :mode="mode"
+      :register-before-hook="registerBeforeHook"
+      :namespaced="true"
+    />
+
+    <ResourceTabs
+      v-model="value"
+      :mode="mode"
+      :side-tabs="true"
+    >
+      <Tab
+        name="volumeclaim"
+        :label="t('podDisruptionBudget.budget.label')"
+        :weight="4"
+      >
+        <div class="row">
+          <div class="col span-6">
+            <LabeledInput
+              v-model="minAvailable"
+              :mode="mode"
+              :label="t('podDisruptionBudget.minAvailable.label')"
+            />
+          </div>
+          <div class="col span-6">
+            <LabeledInput
+              v-model="maxUnavailable"
+              :mode="mode"
+              :label="t('podDisruptionBudget.maxUnavailable.label')"
+            />
+          </div>
+        </div>
+      </Tab>
+      <Tab
+        name="selectors"
+        :label="t('generic.selectors.label')"
+      >
+        <ResourceSelector
+          :type="POD"
+          :value="value.spec.selector"
+          :mode="mode"
+          :namespace="value.metadata.namespace"
+        />
+      </Tab>
+      <Tab
+        name="labels-and-annotations"
+        label-key="generic.labelsAndAnnotations"
+        :weight="-1"
+      >
+        <Labels
+          default-container-class="labels-and-annotations-container"
+          :value="value"
+          :mode="mode"
+          :display-side-by-side="false"
+        />
+      </Tab>
+    </ResourceTabs>
+  </CruResource>
+</template>

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

@@ -74,7 +74,12 @@ export default {
             type="multiline"
             :tooltip="t('cluster.rke2.address.caCerts.toolTip')"
           />
-          <FileSelector :mode="mode" class="btn btn-sm bg-primary mt-10" :label="t('generic.readFromFile')" @selected="onCertSelected" />
+          <FileSelector
+            :mode="mode"
+            class="btn btn-sm bg-primary mt-10"
+            :label="t('generic.readFromFile')"
+            @selected="onCertSelected"
+          />
         </div>
       </div>
     </template>

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

@@ -20,7 +20,10 @@ export default {
 </script>
 
 <template>
-  <Tab name="agentEnv" label-key="cluster.tabs.agentEnv">
+  <Tab
+    name="agentEnv"
+    label-key="cluster.tabs.agentEnv"
+  >
     <KeyValue
       v-model="value.spec.agentEnvVars"
       :mode="mode"

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

@@ -157,27 +157,52 @@ function sanitizeValue(v) {
 
 <template>
   <div>
-    <InfoBox :step="1" class="step-box">
+    <InfoBox
+      :step="1"
+      class="step-box"
+    >
       <h3 v-t="'cluster.custom.nodeRole.label'" />
       <h4 v-t="'cluster.custom.nodeRole.detail'" />
-      <Checkbox v-model="etcd" label-key="model.machine.role.etcd" />
-      <Checkbox v-model="controlPlane" label-key="model.machine.role.controlPlane" />
-      <Checkbox v-model="worker" label-key="model.machine.role.worker" />
+      <Checkbox
+        v-model="etcd"
+        label-key="model.machine.role.etcd"
+      />
+      <Checkbox
+        v-model="controlPlane"
+        label-key="model.machine.role.controlPlane"
+      />
+      <Checkbox
+        v-model="worker"
+        label-key="model.machine.role.worker"
+      />
     </InfoBox>
 
-    <InfoBox v-if="showAdvanced" :step="2" class="step-box">
+    <InfoBox
+      v-if="showAdvanced"
+      :step="2"
+      class="step-box"
+    >
       <h3 v-t="'cluster.custom.advanced.label'" />
       <h4 v-t="'cluster.custom.advanced.detail'" />
 
       <div class="row mb-10">
         <div class="col span-4">
-          <LabeledInput v-model="nodeName" label-key="cluster.custom.advanced.nodeName" />
+          <LabeledInput
+            v-model="nodeName"
+            label-key="cluster.custom.advanced.nodeName"
+          />
         </div>
         <div class="col span-4">
-          <LabeledInput v-model="address" label-key="cluster.custom.advanced.publicIp" />
+          <LabeledInput
+            v-model="address"
+            label-key="cluster.custom.advanced.publicIp"
+          />
         </div>
         <div class="col span-4">
-          <LabeledInput v-model="internalAddress" label-key="cluster.custom.advanced.privateIp" />
+          <LabeledInput
+            v-model="internalAddress"
+            label-key="cluster.custom.advanced.privateIp"
+          />
         </div>
       </div>
 
@@ -190,16 +215,33 @@ function sanitizeValue(v) {
         :read-allowed="false"
       />
 
-      <Taints v-model="taints" class="mb-10" mode="edit" :value="taints" />
+      <Taints
+        v-model="taints"
+        class="mb-10"
+        mode="edit"
+        :value="taints"
+      />
 
-      <a v-t="'generic.hideAdvanced'" @click="toggleAdvanced" />
+      <a
+        v-t="'generic.hideAdvanced'"
+        @click="toggleAdvanced"
+      />
     </InfoBox>
 
-    <div v-else class="mb-20">
-      <a v-t="'generic.showAdvanced'" @click="toggleAdvanced" />
+    <div
+      v-else
+      class="mb-20"
+    >
+      <a
+        v-t="'generic.showAdvanced'"
+        @click="toggleAdvanced"
+      />
     </div>
 
-    <InfoBox :step="showAdvanced ? 3 : 2" class="step-box">
+    <InfoBox
+      :step="showAdvanced ? 3 : 2"
+      class="step-box"
+    >
       <h3 v-t="'cluster.custom.registrationCommand.label'" />
       <h4 v-t="'cluster.custom.registrationCommand.linuxDetail'" />
       <CopyCode
@@ -208,10 +250,14 @@ function sanitizeValue(v) {
       >
         {{ linuxCommand }}
       </CopyCode>
-      <Checkbox v-if="clusterToken.insecureNodeCommand" v-model="insecure" label-key="cluster.custom.registrationCommand.insecure" />
+      <Checkbox
+        v-if="clusterToken.insecureNodeCommand"
+        v-model="insecure"
+        label-key="cluster.custom.registrationCommand.insecure"
+      />
 
       <template v-if="cluster.supportsWindows">
-        <hr class="mt-20 mb-20" />
+        <hr class="mt-20 mb-20">
         <h4 v-t="'cluster.custom.registrationCommand.windowsDetail'" />
         <Banner
           v-if="cluster.isRke1"

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

@@ -88,11 +88,27 @@ export default {
 
     <template v-if="enabled">
       <div class="mt-20">
-        <Checkbox v-model="deleteEmptyDirData" label="Delete pods using emptyDir volumes" tooltip="emptyDir volumes are often used for ephemeral data, but the data will be permanently deleted.  Draining will fail if this is not set and there are pods using emptyDir." @input="update" />
+        <Checkbox
+          v-model="deleteEmptyDirData"
+          label="Delete pods using emptyDir volumes"
+          tooltip="emptyDir volumes are often used for ephemeral data, but the data will be permanently deleted.  Draining will fail if this is not set and there are pods using emptyDir."
+          @input="update"
+        />
+      </div>
+      <div>
+        <Checkbox
+          v-model="force"
+          label="Delete standalone pods"
+          tooltip="Delete standalone pods which are not managed by a Workload controller (Deployment, Job, etc).  Draining will fail if this is not set and there are standalone pods."
+          @input="update"
+        />
       </div>
-      <div><Checkbox v-model="force" label="Delete standalone pods" tooltip="Delete standalone pods which are not managed by a Workload controller (Deployment, Job, etc).  Draining will fail if this is not set and there are standalone pods." @input="update" /></div>
       <div>
-        <Checkbox v-model="customGracePeriod" label="Override pod termination grace periods" @input="update" />
+        <Checkbox
+          v-model="customGracePeriod"
+          label="Override pod termination grace periods"
+          @input="update"
+        />
         <UnitInput
           v-if="customGracePeriod"
           v-model="gracePeriod"
@@ -103,7 +119,11 @@ export default {
         />
       </div>
       <div>
-        <Checkbox v-model="customTimeout" label="Timeout after" @input="update" />
+        <Checkbox
+          v-model="customTimeout"
+          label="Timeout after"
+          @input="update"
+        />
         <UnitInput
           v-if="customTimeout"
           v-model="timeout"

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

@@ -20,7 +20,10 @@ export default {
 </script>
 
 <template>
-  <Tab name="labels" label-key="generic.labelsAndAnnotations">
+  <Tab
+    name="labels"
+    label-key="generic.labelsAndAnnotations"
+  >
     <Labels
       v-model="value"
       :mode="mode"

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

@@ -205,7 +205,7 @@ export default {
         />
       </div>
     </div>
-    <hr class="mt-10" />
+    <hr class="mt-10">
     <component
       :is="configComponent"
       v-if="value.config"
@@ -220,18 +220,35 @@ export default {
       :machine-pools="machinePools"
       @error="e=>errors = e"
     />
-    <Banner v-else-if="value.configMissing" color="error" label-key="cluster.machinePool.configNotFound" />
-    <Banner v-else color="info" label-key="cluster.machinePool.noAccessBanner" />
+    <Banner
+      v-else-if="value.configMissing"
+      color="error"
+      label-key="cluster.machinePool.configNotFound"
+    />
+    <Banner
+      v-else
+      color="info"
+      label-key="cluster.machinePool.noAccessBanner"
+    />
 
-    <AdvancedSection :mode="mode" class="advanced">
-      <portal-target :name="'advanced-' + uuid" multiple />
+    <AdvancedSection
+      :mode="mode"
+      class="advanced"
+    >
+      <portal-target
+        :name="'advanced-' + uuid"
+        multiple
+      />
 
       <div class="spacer" />
       <div class="row">
         <div class="col span-4">
           <h3>
             {{ t('cluster.machinePool.autoReplace.label') }}
-            <i v-tooltip="t('cluster.machinePool.autoReplace.toolTip')" class="icon icon-info icon-lg" />
+            <i
+              v-tooltip="t('cluster.machinePool.autoReplace.toolTip')"
+              class="icon icon-info icon-lg"
+            />
           </h3>
           <UnitInput
             v-model.number="unhealthyNodeTimeoutInteger"
@@ -266,9 +283,15 @@ export default {
 
       <div class="spacer" />
 
-      <Taints v-model="value.pool.taints" :mode="mode" />
+      <Taints
+        v-model="value.pool.taints"
+        :mode="mode"
+      />
 
-      <portal-target :name="'advanced-footer-' + uuid" multiple />
+      <portal-target
+        :name="'advanced-footer-' + uuid"
+        multiple
+      />
     </AdvancedSection>
   </div>
 </template>