Tweaking ScaleKubernetesCluster to support new fields

Author: davidjumani

src/config/section/compute.js

@@ -419,7 +419,7 @@ export default {
         fields.push('zonename')
         return fields
       },
-      details: ['name', 'description', 'zonename', 'kubernetesversionname', 'size', 'masternodes', 'cpunumber', 'memory', 'keypair', 'associatednetworkname', 'account', 'domain', 'zonename'],
+      details: ['name', 'description', 'zonename', 'kubernetesversionname', 'autoscalingenabled', 'minsize', 'maxsize', 'size', 'masternodes', 'cpunumber', 'memory', 'keypair', 'associatednetworkname', 'account', 'domain', 'zonename'],
       tabs: [{
         name: 'k8s',
         component: () => import('@/views/compute/KubernetesServiceTab.vue')

src/locales/en.json

@@ -24,8 +24,8 @@
 "error.release.dedicate.pod": "Failed to release dedicated pod",
 "error.release.dedicate.zone": "Failed to release dedicated zone",
 "error.session.expired": "Your session has expired.",
-"error.unable.to.reach.management.server": "Unable to reach Management Server",
 "error.unable.to.proceed": "Unable to proceed. Please contact your administrator",
+"error.unable.to.reach.management.server": "Unable to reach Management Server",
 "error.unresolved.internet.name": "Your internet name cannot be resolved.",
 "firewall.close": "Firewall",
 "force.delete.domain.warning": "Warning: Choosing this option will cause the deletion of all child domains and all associated accounts and their resources.",
@@ -82,10 +82,10 @@
 "label.action.copy.iso.processing": "Copying ISO....",
 "label.action.copy.template": "Copy Template",
 "label.action.copy.template.processing": "Copying Template....",
+"label.action.create.snapshot.from.vmsnapshot": "Create Snapshot from VM Snapshot",
 "label.action.create.template.from.vm": "Create Template from VM",
 "label.action.create.template.from.volume": "Create Template from Volume",
 "label.action.create.template.processing": "Creating Template....",
-"label.action.create.snapshot.from.vmsnapshot": "Create Snapshot from VM Snapshot",
 "label.action.create.vm": "Create VM",
 "label.action.create.vm.processing": "Creating VM....",
 "label.action.create.volume": "Create Volume",
@@ -451,6 +451,7 @@
 "label.author.name": "Author name",
 "label.autoscale": "AutoScale",
 "label.autoscale.configuration.wizard": "AutoScale Configuration Wizard",
+"label.autoscalingenabled": "Autoscaling enabled",
 "label.availability": "Availability",
 "label.availabilityzone": "Availability Zone",
 "label.available": "Available",
@@ -543,6 +544,9 @@
 "label.cisco.nexus1000v.password": "Nexus 1000v Password",
 "label.cisco.nexus1000v.username": "Nexus 1000v Username",
 "label.ciscovnmc.resource.details": "CiscoVNMC resource details",
+"label.cks.cluster.autoscalingenabled": "Enable autoscaling on this cluster",
+"label.cks.cluster.maxsize": "Maximum cluster size (Worker nodes)",
+"label.cks.cluster.minsize": "Minimum cluster size (Worker nodes)",
 "label.cks.cluster.size": "Cluster size (Worker nodes)",
 "label.cleanup": "Clean up",
 "label.clear": "Clear",
@@ -1290,6 +1294,7 @@
 "label.maxproject": "Max. Projects",
 "label.maxpublicip": "Max. Public IPs",
 "label.maxsecondarystorage": "Max. Secondary Storage (GiB)",
+"label.maxsize": "Maximum size",
 "label.maxsnapshot": "Max. Snapshots",
 "label.maxtemplate": "Max. Templates",
 "label.maxuservm": "Max. User VMs",
@@ -1372,6 +1377,7 @@
 "label.miniops": "Min IOPS",
 "label.minmaxiops": "Min IOPS / Max IOPS",
 "label.minmemory": "Min Memory (in MB)",
+"label.minsize": "Minimum size",
 "label.minute.past.hour": "minute(s) past the hour",
 "label.minutes.past.hour": "minutes(s) past the hour",
 "label.monday": "Monday",
@@ -1843,8 +1849,8 @@
 "label.save.changes": "Save changes",
 "label.save.new.rule": "Save new Rule",
 "label.saving.processing": "Saving....",
-"label.scale.vm": "Scale VM",
 "label.scale.up.policy": "SCALE UP POLICY",
+"label.scale.vm": "Scale VM",
 "label.scaledown.policy": "ScaleDown Policy",
 "label.scaleup.policy": "ScaleUp Policy",
 "label.schedule": "Schedule",
@@ -2364,9 +2370,9 @@
 "message.action.delete.ingress.rule": "Please confirm that you want to delete this ingress rule.",
 "message.action.delete.iso": "Please confirm that you want to delete this ISO.",
 "message.action.delete.iso.for.all.zones": "The ISO is used by all zones. Please confirm that you want to delete it from all zones.",
-"message.action.delete.node": "Please confirm that you want to delete this node.",
 "message.action.delete.network": "Please confirm that you want to delete this network.",
 "message.action.delete.nexusvswitch": "Please confirm that you want to delete this nexus 1000v",
+"message.action.delete.node": "Please confirm that you want to delete this node.",
 "message.action.delete.physical.network": "Please confirm that you want to delete this physical network",
 "message.action.delete.pod": "Please confirm that you want to delete this pod.",
 "message.action.delete.primary.storage": "Please confirm that you want to delete this primary storage.",
@@ -2631,10 +2637,10 @@
 "message.creating.secondary.storage": "Creating secondary storage",
 "message.creating.systemvm": "Creating system VMs (this may take a while)",
 "message.creating.zone": "Creating zone",
-"message.datacenter.description": "Name of the datacenter on vCenter",
-"message.datastore.description": "Name of the datastore on vCenter",
 "message.data.migration": "Data Migration",
 "message.data.migration.progress": "Data Migration between image stores",
+"message.datacenter.description": "Name of the datacenter on vCenter",
+"message.datastore.description": "Name of the datastore on vCenter",
 "message.dedicate.zone": "Dedicating zone",
 "message.dedicated.zone.released": "Zone dedication released",
 "message.dedicating.cluster": "Dedicating Cluster...",
@@ -2649,7 +2655,6 @@
 "message.delete.backup": "Are you sure you want to delete the backup?",
 "message.delete.failed": "Delete fail",
 "message.delete.gateway": "Please confirm you want to delete the gateway",
-"message.deleting.node": "Deleting Node",
 "message.delete.port.forward.processing": "Deleting Port Forwarding rule...",
 "message.delete.project": "Are you sure you want to delete this project?",
 "message.delete.rule.processing": "Deleting rule...",
@@ -2663,6 +2668,7 @@
 "message.delete.vpn.connection": "Please confirm that you want to delete VPN connection",
 "message.delete.vpn.customer.gateway": "Please confirm that you want to delete this VPN Customer Gateway",
 "message.delete.vpn.gateway": "Please confirm that you want to delete this VPN Gateway",
+"message.deleting.node": "Deleting Node",
 "message.deleting.vm": "Deleting VM",
 "message.desc.add.new.lb.sticky.rule": "Add new LB sticky rule",
 "message.desc.advanced.zone": "For more sophisticated network topologies. This network model provides the most flexibility in defining guest networks and providing custom network offerings such as firewall, VPN, or load balancer support.",
@@ -2972,8 +2978,8 @@
 "message.pod.dedication.released": "Pod dedication released",
 "message.portable.ip.delete.confirm": "Please confirm you want to delete Portable IP Range",
 "message.processing.complete": "Processing complete!",
-"message.protocol.description": "For XenServer, choose NFS, iSCSI, or PreSetup. For KVM, choose NFS, SharedMountPoint, RDB, CLVM or Gluster. For vSphere, choose NFS, PreSetup (VMFS or iSCSI or FiberChannel or vSAN or vVols) or DatastoreCluster. For Hyper-V, choose SMB/CIFS. For LXC, choose NFS or SharedMountPoint. For OVM, choose NFS or ocfs2.",
 "message.project.invite.sent": "Invite sent to user; they will be added to the project once they accept the invitation",
+"message.protocol.description": "For XenServer, choose NFS, iSCSI, or PreSetup. For KVM, choose NFS, SharedMountPoint, RDB, CLVM or Gluster. For vSphere, choose NFS, PreSetup (VMFS or iSCSI or FiberChannel or vSAN or vVols) or DatastoreCluster. For Hyper-V, choose SMB/CIFS. For LXC, choose NFS or SharedMountPoint. For OVM, choose NFS or ocfs2.",
 "message.public.traffic.in.advanced.zone": "Public traffic is generated when VMs in the cloud access the internet. Publicly-accessible IPs must be allocated for this purpose. End users can use the CloudStack UI to acquire these IPs to implement NAT between their guest network and their public network.<br/><br/>Provide at least one range of IP addresses for internet traffic.",
 "message.public.traffic.in.basic.zone": "Public traffic is generated when VMs in the cloud access the Internet or provide services to clients over the Internet. Publicly accessible IPs must be allocated for this purpose. When a instance is created, an IP from this set of Public IPs will be allocated to the instance in addition to the guest IP address. Static 1-1 NAT will be set up automatically between the public IP and the guest IP. End users can also use the CloudStack UI to acquire additional IPs to implement static NAT between their instances and the public IP.",
 "message.publicip.state.allocated": "The IP address is in used.",

src/views/compute/ScaleKubernetesCluster.vue

@@ -26,49 +26,104 @@
         :form="form"
         @submit="handleSubmit"
         layout="vertical">
-        <a-form-item>
+        <a-form-item v-if="apiParams.autoscalingenabled">
           <span slot="label">
-            {{ $t('label.cks.cluster.size') }}
-            <a-tooltip :title="apiParams.size.description">
+            {{ $t('label.cks.cluster.autoscalingenabled') }}
+            <a-tooltip :title="apiParams.autoscalingenabled.description">
               <a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
             </a-tooltip>
           </span>
-          <a-input
-            v-decorator="['size', {
-              initialValue: originalSize,
-              rules: [{
-                validator: (rule, value, callback) => {
-                  if (value && (isNaN(value) || value <= 0)) {
-                    callback(this.$t('message.error.number'))
-                  }
-                  callback()
-                }
-              }]
-            }]"
-            :placeholder="apiParams.size.description"/>
-        </a-form-item>
-        <a-form-item>
-          <span slot="label">
-            {{ $t('label.serviceofferingid') }}
-            <a-tooltip :title="apiParams.serviceofferingid.description">
-              <a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
-            </a-tooltip>
-          </span>
-          <a-select
-            id="offering-selection"
-            v-decorator="['serviceofferingid', {}]"
-            showSearch
-            optionFilterProp="children"
-            :filterOption="(input, option) => {
-              return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-            }"
-            :loading="serviceOfferingLoading"
-            :placeholder="apiParams.serviceofferingid.description">
-            <a-select-option v-for="(opt, optIndex) in this.serviceOfferings" :key="optIndex">
-              {{ opt.name || opt.description }}
-            </a-select-option>
-          </a-select>
+          <a-switch :checked="this.autoscalingenabled" @change="val => { this.autoscalingenabled = val }" />
         </a-form-item>
+        <span v-if="this.autoscalingenabled">
+          <a-form-item>
+            <span slot="label">
+              {{ $t('label.cks.cluster.minsize') }}
+              <a-tooltip :title="apiParams.minsize.description">
+                <a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
+              </a-tooltip>
+            </span>
+            <a-input
+              v-decorator="['minsize', {
+                initialValue: minsize,
+                rules: [{
+                  validator: (rule, value, callback) => {
+                    if (value && (isNaN(value) || value <= 0)) {
+                      callback(this.$t('message.error.number'))
+                    }
+                    callback()
+                  }
+                }]
+              }]"
+              :placeholder="apiParams.minsize.description"/>
+          </a-form-item>
+          <a-form-item>
+            <span slot="label">
+              {{ $t('label.cks.cluster.maxsize') }}
+              <a-tooltip :title="apiParams.maxsize.description">
+                <a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
+              </a-tooltip>
+            </span>
+            <a-input
+              v-decorator="['maxsize', {
+                initialValue: maxsize,
+                rules: [{
+                  validator: (rule, value, callback) => {
+                    if (value && (isNaN(value) || value <= 0)) {
+                      callback(this.$t('message.error.number'))
+                    }
+                    callback()
+                  }
+                }]
+              }]"
+              :placeholder="apiParams.maxsize.description"/>
+          </a-form-item>
+        </span>
+        <span v-else>
+          <a-form-item>
+            <span slot="label">
+              {{ $t('label.serviceofferingid') }}
+              <a-tooltip :title="apiParams.serviceofferingid.description">
+                <a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
+              </a-tooltip>
+            </span>
+            <a-select
+              id="offering-selection"
+              v-decorator="['serviceofferingid', {}]"
+              showSearch
+              optionFilterProp="children"
+              :filterOption="(input, option) => {
+                return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+              }"
+              :loading="serviceOfferingLoading"
+              :placeholder="apiParams.serviceofferingid.description">
+              <a-select-option v-for="(opt, optIndex) in this.serviceOfferings" :key="optIndex">
+                {{ opt.name || opt.description }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+          <a-form-item>
+            <span slot="label">
+              {{ $t('label.cks.cluster.size') }}
+              <a-tooltip :title="apiParams.size.description">
+                <a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
+              </a-tooltip>
+            </span>
+            <a-input
+              v-decorator="['size', {
+                initialValue: originalSize,
+                rules: [{
+                  validator: (rule, value, callback) => {
+                    if (value && (isNaN(value) || value <= 0)) {
+                      callback(this.$t('message.error.number'))
+                    }
+                    callback()
+                  }
+                }]
+              }]"
+              :placeholder="apiParams.size.description"/>
+          </a-form-item>
+        </span>
 
         <div :span="24" class="action-button">
           <a-button @click="closeAction">{{ this.$t('label.cancel') }}</a-button>
@@ -96,7 +151,11 @@ export default {
       serviceOfferingLoading: false,
       minCpu: 2,
       minMemory: 2048,
-      loading: false
+      loading: false,
+      originalSize: 1,
+      autoscalingenabled: null,
+      minsize: null,
+      maxsize: null
     }
   },
   beforeCreate () {
@@ -108,7 +167,14 @@ export default {
     })
   },
   created () {
-    this.originalSize = !this.isObjectEmpty(this.resource) ? this.resource.size : 1
+    if (!this.isObjectEmpty(this.resource)) {
+      this.originalSize = this.resource.size
+      if (this.apiParams.autoscalingenabled) {
+        this.autoscalingenabled = this.resource.autoscalingenabled ? true : null
+        this.minsize = this.resource.minsize
+        this.maxsize = this.resource.maxsize
+      }
+    }
   },
   mounted () {
     this.fetchData()
@@ -179,12 +245,21 @@ export default {
         const params = {
           id: this.resource.id
         }
+        if (this.autoscalingenabled != null) {
+          params.autoscalingenabled = this.autoscalingenabled
+        }
         if (this.isValidValueForKey(values, 'size') && values.size > 0) {
           params.size = values.size
         }
-        if (this.isValidValueForKey(values, 'serviceofferingid') && this.arrayHasItems(this.serviceOfferings)) {
+        if (this.isValidValueForKey(values, 'serviceofferingid') && this.arrayHasItems(this.serviceOfferings) && this.autoscalingenabled == null) {
           params.serviceofferingid = this.serviceOfferings[values.serviceofferingid].id
         }
+        if (this.isValidValueForKey(values, 'minsize')) {
+          params.minsize = values.minsize
+        }
+        if (this.isValidValueForKey(values, 'maxsize')) {
+          params.maxsize = values.maxsize
+        }
         api('scaleKubernetesCluster', params).then(json => {
           const jobId = json.scalekubernetesclusterresponse.jobid
           this.$store.dispatch('AddAsyncJob', {