@rancher/shell 2.0.0 → 3.0.0-rc.1

package/machine-config/azure.vue

@@ -179,7 +179,7 @@ export default {
       if (this.mode === _EDIT && !this.value?.location) {
         for (const key in this.defaultConfig) {
           if (this.value[key] === undefined) {
-            this.$set(this.value, key, this.defaultConfig[key]);
+            this.value[key] = this.defaultConfig[key];
           }
         }
       }
@@ -410,7 +410,7 @@ export default {
     if (this.mode === 'create') {
       for (const key in this.defaultConfig) {
         if (this.value[key] === undefined) {
-          this.$set(this.value, key, this.defaultConfig[key]);
+          this.value[key] = this.defaultConfig[key];
         }
       }
       merge(this.value, this.defaultConfig);
@@ -485,7 +485,7 @@ export default {
         ary.push(k, tags[k]);
       }
 
-      this.$set(this.value, 'tags', ary.join(','));
+      this.value['tags'] = ary.join(',');
     },
     handleAzChange() {
       if (this.value.availabilitySet) {
@@ -529,7 +529,7 @@ export default {
           :label="t('cluster.machineConfig.azure.location.label')"
           :disabled="disabled"
           data-testid="machineConfig-azure-location"
-          @input="setLocation"
+          @update:value="setLocation"
         />
       </div>
       <div data-testid="machineConfig-azure-environment-value">
@@ -547,7 +547,7 @@ export default {
     <div class="row mt-20">
       <div class="col span-4">
         <LabeledInput
-          v-model="value.resourceGroup"
+          v-model:value="value.resourceGroup"
           :mode="mode"
           :label="t('cluster.machineConfig.azure.resourceGroup.label')"
           :disabled="disabled"
@@ -559,7 +559,7 @@ export default {
         class="col span-4"
       >
         <LabeledInput
-          v-model="value.availabilitySet"
+          v-model:value="value.availabilitySet"
           :mode="mode"
           :label="t('cluster.machineConfig.azure.availabilitySet.label')"
           :tooltip="t('cluster.machineConfig.azure.availabilitySet.description')"
@@ -576,13 +576,13 @@ export default {
         />
         <LabeledSelect
           v-else
-          v-model="value.availabilityZone"
+          v-model:value="value.availabilityZone"
           :mode="mode"
           :options="availableZones"
           :label="t('cluster.machineConfig.azure.availabilityZone.label')"
           :tooltip="t('cluster.machineConfig.azure.availabilityZone.description')"
           :disabled="disabled || !!vmAvailabilityZoneWarning"
-          @input="handleAzChange"
+          @update:value="handleAzChange"
         />
         <Banner
           v-if="vmAvailabilityZoneWarning"
@@ -592,7 +592,7 @@ export default {
       </div>
       <div class="col span-4">
         <RadioGroup
-          v-model="useAvailabilitySet"
+          v-model:value="useAvailabilitySet"
           name="etcd-s3"
           :options="[true, false]"
           :labels="[t('cluster.machineConfig.azure.availabilitySet.label'),t('cluster.machineConfig.azure.availabilityZone.label')]"
@@ -604,7 +604,7 @@ export default {
     <div class="row mt-20">
       <div class="col span-6">
         <LabeledInput
-          v-model="value.image"
+          v-model:value="value.image"
           :mode="mode"
           :label="t('cluster.machineConfig.azure.image.label')"
           :tooltip="t('cluster.machineConfig.azure.image.help')"
@@ -618,7 +618,7 @@ export default {
         />
         <LabeledSelect
           v-else
-          v-model="value.size"
+          v-model:value="value.size"
           :mode="mode"
           :options="vmSizeOptionsForDropdown"
           :get-option-label="getVmSizeOptionLabel"
@@ -648,7 +648,7 @@ export default {
         <div class="row mt-20">
           <div class="col span-6">
             <LabeledInput
-              v-model="value.faultDomainCount"
+              v-model:value="value.faultDomainCount"
               :mode="mode"
               :label="t('cluster.machineConfig.azure.faultDomainCount.label')"
               :tooltip="t('cluster.machineConfig.azure.faultDomainCount.help')"
@@ -657,7 +657,7 @@ export default {
           </div>
           <div class="col span-6">
             <LabeledInput
-              v-model="value.updateDomainCount"
+              v-model:value="value.updateDomainCount"
               :mode="mode"
               :label="t('cluster.machineConfig.azure.updateDomainCount.label')"
               :tooltip="t('cluster.machineConfig.azure.updateDomainCount.help')"
@@ -671,7 +671,7 @@ export default {
       <div class="row mt-20">
         <div class="col span-6">
           <LabeledInput
-            v-model="value.plan"
+            v-model:value="value.plan"
             :mode="mode"
             :label="t('cluster.machineConfig.azure.plan.label')"
             :placeholder="t('cluster.machineConfig.azure.plan.placeholder')"
@@ -684,7 +684,7 @@ export default {
       <div class="row mt-20 mb-20">
         <div class="col span-6">
           <LabeledInput
-            v-model="value.subnet"
+            v-model:value="value.subnet"
             :mode="mode"
             :label="t('cluster.machineConfig.azure.subnet.label')"
             :disabled="disabled"
@@ -692,7 +692,7 @@ export default {
         </div>
         <div class="col span-6">
           <LabeledInput
-            v-model="value.subnetPrefix"
+            v-model:value="value.subnetPrefix"
             :mode="mode"
             :label="t('cluster.machineConfig.azure.subnetPrefix.label')"
             :disabled="disabled"
@@ -702,7 +702,7 @@ export default {
       <div class="row mt-20">
         <div class="col span-6">
           <Checkbox
-            v-model="value.acceleratedNetworking"
+            v-model:value="value.acceleratedNetworking"
             :disabled="(!value.acceleratedNetworking && !selectedVmSizeSupportsAN)"
             :mode="mode"
             :label="t('cluster.machineConfig.azure.acceleratedNetworking.label')"
@@ -717,7 +717,7 @@ export default {
       <div class="row mt-20">
         <div class="col span-6">
           <LabeledInput
-            v-model="value.vnet"
+            v-model:value="value.vnet"
             :mode="mode"
             :label="t('cluster.machineConfig.azure.vnet.label')"
             :placeholder="t('cluster.machineConfig.azure.vnet.placeholder')"
@@ -727,17 +727,17 @@ export default {
         <div class="col span-6 inline-banner-container">
           <h3><t k="cluster.machineConfig.azure.publicIpOptions.header" /></h3>
           <Checkbox
-            v-model="value.noPublicIp"
+            v-model:value="value.noPublicIp"
             :mode="mode"
             :label="t('cluster.machineConfig.azure.publicIpOptions.noPublic.label')"
           />
           <Checkbox
-            v-model="value.staticPublicIp"
+            v-model:value="value.staticPublicIp"
             :mode="mode"
             :label="t('cluster.machineConfig.azure.publicIpOptions.staticPublicIp.label')"
           />
           <Checkbox
-            v-model="value.enablePublicIpStandardSku"
+            v-model:value="value.enablePublicIpStandardSku"
             :mode="mode"
             :label="t('cluster.machineConfig.azure.publicIpOptions.standardSKU.label')"
           />
@@ -766,12 +766,12 @@ export default {
       <div class="row mt-20">
         <div class="col span-6">
           <Checkbox
-            v-model="value.usePrivateIp"
+            v-model:value="value.usePrivateIp"
             :mode="mode"
             :label="t('cluster.machineConfig.azure.usePrivateIp.label')"
           />
           <LabeledInput
-            v-model="value.privateIpAddress"
+            v-model:value="value.privateIpAddress"
             :mode="mode"
             class="mt-10"
             :label="t('cluster.machineConfig.azure.privateIp.label')"
@@ -782,7 +782,7 @@ export default {
       <div class="row mt-20">
         <div class="col span-6">
           <LabeledInput
-            v-model="value.nsg"
+            v-model:value="value.nsg"
             :mode="mode"
             class="mt-10"
             :label="t('cluster.machineConfig.azure.nsg.label')"
@@ -792,7 +792,7 @@ export default {
         </div>
         <div class="col span-6">
           <LabeledInput
-            v-model="value.dns"
+            v-model:value="value.dns"
             :mode="mode"
             class="mt-10"
             :label="t('cluster.machineConfig.azure.dns.label')"
@@ -806,7 +806,7 @@ export default {
       <div class="row mt-20 mb-20">
         <div class="col span-6">
           <LabeledSelect
-            v-model="value.storageType"
+            v-model:value="value.storageType"
             :mode="mode"
             :options="storageTypes"
             :searchable="false"
@@ -824,7 +824,7 @@ export default {
         </div>
         <div class="col span-6 inline-banner-container">
           <Checkbox
-            v-model="value.managedDisks"
+            v-model:value="value.managedDisks"
             :mode="mode"
             :label="t('cluster.machineConfig.azure.managedDisks.label')"
             :disabled="disabled"
@@ -839,7 +839,7 @@ export default {
       <div class="row">
         <div class="col span-6">
           <LabeledInput
-            v-model="value.diskSize"
+            v-model:value="value.diskSize"
             :mode="mode"
             :label="t('cluster.machineConfig.azure.managedDisksSize.label')"
             :disabled="disabled"
@@ -847,7 +847,7 @@ export default {
         </div>
         <div class="col span-6">
           <LabeledInput
-            v-model="value.sshUser"
+            v-model:value="value.sshUser"
             :mode="mode"
             :label="t('cluster.machineConfig.azure.sshUser.label')"
             :disabled="disabled"
@@ -857,7 +857,7 @@ export default {
       <div class="row mt-20">
         <div class="col span-6">
           <ArrayList
-            v-model="value.openPort"
+            v-model:value="value.openPort"
             table-class="fixed"
             :mode="mode"
             :title="t('cluster.machineConfig.azure.openPort.label')"
@@ -880,7 +880,7 @@ export default {
             :add-label="t('labels.addTag')"
             :initial-empty-row="true"
             :disabled="disabled"
-            @input="updateTags"
+            @update:value="updateTags"
           />
         </div>
       </div>

package/machine-config/digitalocean.vue

@@ -130,7 +130,7 @@ export default {
     },
 
     updateTags() {
-      this.$set(this.value, 'tags', this.tags.join());
+      this.value.tags = this.tags.join();
     }
   },
 };
@@ -156,7 +156,7 @@ export default {
     <div class="row mt-20">
       <div class="col span-6">
         <LabeledSelect
-          v-model="value.region"
+          v-model:value="value.region"
           :mode="mode"
           :options="regionOptions"
           :searchable="true"
@@ -167,7 +167,7 @@ export default {
       </div>
       <div class="col span-6">
         <LabeledSelect
-          v-model="value.size"
+          v-model:value="value.size"
           :mode="mode"
           :options="instanceOptions"
           :searchable="true"
@@ -181,7 +181,7 @@ export default {
     <div class="row mt-20">
       <div class="col span-6">
         <LabeledSelect
-          v-model="value.image"
+          v-model:value="value.image"
           :mode="mode"
           :options="imageOptions"
           :searchable="true"
@@ -193,19 +193,19 @@ export default {
       <div class="col span-6 pt-5">
         <h3>Additional DigitalOcean Options</h3>
         <Checkbox
-          v-model="value.monitoring"
+          v-model:value="value.monitoring"
           :mode="mode"
           :disabled="disabled"
           label="Monitoring"
         />
         <Checkbox
-          v-model="value.ipv6"
+          v-model:value="value.ipv6"
           :mode="mode"
           :disabled="disabled"
           label="IPv6"
         />
         <Checkbox
-          v-model="value.privateNetworking"
+          v-model:value="value.privateNetworking"
           :mode="mode"
           :disabled="disabled"
           label="Private Networking"
@@ -215,7 +215,7 @@ export default {
     <div class="row mt-20">
       <div class="col span-6">
         <ArrayList
-          v-model="tags"
+          v-model:value="tags"
           :mode="mode"
           :protip="false"
           :title="t('cluster.machineConfig.digitalocean.tags.label')"

package/machine-config/generic.vue

@@ -88,13 +88,14 @@ export default {
   </div>
   <div v-else>
     <Questions
-      v-model="value"
+      :value="value"
       :mode="mode"
       :tabbed="false"
       :source="fields"
       :ignore-variables="cloudCredentialKeys"
       :target-namespace="value.metadata.namespace"
       :disabled="disabled"
+      @update:value="$emit('input', $event)"
     />
   </div>
 </template>

package/machine-config/linode.vue

@@ -142,7 +142,7 @@ export default {
     <div class="row mt-20">
       <div class="col span-6">
         <LabeledSelect
-          v-model="value.region"
+          v-model:value="value.region"
           :mode="mode"
           :options="regionOptions"
           :searchable="true"
@@ -153,7 +153,7 @@ export default {
       </div>
       <div class="col span-6">
         <LabeledSelect
-          v-model="value.instanceType"
+          v-model:value="value.instanceType"
           :mode="mode"
           :options="instanceOptions"
           :searchable="true"
@@ -166,7 +166,7 @@ export default {
     <div class="row mt-20">
       <div class="col span-6">
         <LabeledSelect
-          v-model="value.image"
+          v-model:value="value.image"
           :mode="mode"
           :options="imageOptions"
           :searchable="true"
@@ -178,7 +178,7 @@ export default {
       <div class="col span-6 pt-5">
         <h3>Additional Linode Options</h3>
         <Checkbox
-          v-model="value.createPrivateIp"
+          v-model:value="value.createPrivateIp"
           :mode="mode"
           :disabled="disabled"
           label="Private Networking"

package/machine-config/pnap.vue

@@ -38,7 +38,7 @@ export default {
           type: NORMAN.CLOUD_CREDENTIAL,
           id:   this.credentialId,
         });
-        this.$set(this.value, 'clientIdentifier', this.credential.decodedData.clientIdentifier);
+        this.value['clientIdentifier'] = this.credential.decodedData.clientIdentifier;
       }
     } catch (e) {
       this.credential = null;
@@ -192,7 +192,7 @@ export default {
     <div class="row mt-20">
       <div class="col span-6">
         <LabeledSelect
-          v-model="value.serverLocation"
+          v-model:value="value.serverLocation"
           :mode="mode"
           :options="locationChoices"
           :searchable="true"
@@ -203,7 +203,7 @@ export default {
       </div>
       <div class="col span-6">
         <LabeledSelect
-          v-model="value.serverType"
+          v-model:value="value.serverType"
           :mode="mode"
           :options="typeChoices"
           :searchable="true"
@@ -216,7 +216,7 @@ export default {
     <div class="row mt-20">
       <div class="col span-3">
         <LabeledInput
-          v-model="type.metadata.cpu"
+          v-model:value="type.metadata.cpu"
           :mode="mode"
           :disabled="true"
           :label="t('cluster.machineConfig.pnap.serverCpu.label')"
@@ -224,7 +224,7 @@ export default {
       </div>
       <div class="col span-3">
         <LabeledInput
-          v-model="type.metadata.coresPerCpu"
+          v-model:value="type.metadata.coresPerCpu"
           :mode="mode"
           :disabled="true"
           :label="t('cluster.machineConfig.pnap.serverCoresPerCpu.label')"
@@ -232,7 +232,7 @@ export default {
       </div>
       <div class="col span-3">
         <LabeledInput
-          v-model="type.metadata.cpuCount"
+          v-model:value="type.metadata.cpuCount"
           :mode="mode"
           :disabled="true"
           :label="t('cluster.machineConfig.pnap.serverCpuCount.label')"
@@ -240,7 +240,7 @@ export default {
       </div>
       <div class="col span-3">
         <LabeledInput
-          v-model="type.metadata.cpuFrequency"
+          v-model:value="type.metadata.cpuFrequency"
           :mode="mode"
           :disabled="true"
           :label="t('cluster.machineConfig.pnap.serverCpuFrequency.label')"
@@ -250,7 +250,7 @@ export default {
     <div class="row mt-20">
       <div class="col span-3">
         <LabeledInput
-          v-model="type.metadata.ramInGb"
+          v-model:value="type.metadata.ramInGb"
           :mode="mode"
           :disabled="true"
           :label="t('cluster.machineConfig.pnap.serverRam.label')"
@@ -258,7 +258,7 @@ export default {
       </div>
       <div class="col span-3">
         <LabeledInput
-          v-model="type.metadata.storage"
+          v-model:value="type.metadata.storage"
           :mode="mode"
           :disabled="true"
           :label="t('cluster.machineConfig.pnap.serverStorage.label')"
@@ -266,7 +266,7 @@ export default {
       </div>
       <div class="col span-3">
         <LabeledInput
-          v-model="type.metadata.network"
+          v-model:value="type.metadata.network"
           :mode="mode"
           :disabled="true"
           :label="t('cluster.machineConfig.pnap.serverNetwork.label')"
@@ -274,7 +274,7 @@ export default {
       </div>
       <div class="col span-3">
         <LabeledSelect
-          v-model="value.serverOs"
+          v-model:value="value.serverOs"
           :mode="mode"
           :options="osChoices"
           :searchable="true"

package/machine-config/vmwarevsphere-config.ts

@@ -0,0 +1,17 @@
+export const SENTINEL = '__SENTINEL__';
+
+export const OS_OPTIONS = [
+  'linux',
+  'windows'
+];
+
+export const DEFAULT_VALUES = {
+  cpuCount:                '2',
+  diskSize:                '20000',
+  memorySize:              '4096',
+  hostsystem:              '',
+  cloudConfig:             '#cloud-config\n\n',
+  gracefulShutdownTimeout: '0',
+  cfgparam:                ['disk.enableUUID=TRUE'],
+  os:                      OS_OPTIONS[0]
+};