From 84da771b594b9f3307ca9be9da475ce94cc78278 Mon Sep 17 00:00:00 2001
From: davidjumani <dj.davidjumani1994@gmail.com>
Date: Mon, 28 Sep 2020 16:06:30 +0530
Subject: [PATCH 1/9] Adding warning to scaleKubernetesCluster

---
 src/config/section/compute.js                | 2 +-
 src/locales/en.json                          | 1 +
 src/views/compute/ScaleKubernetesCluster.vue | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/config/section/compute.js b/src/config/section/compute.js
index d485772e2..786d48b83 100644
--- a/src/config/section/compute.js
+++ b/src/config/section/compute.js
@@ -450,7 +450,7 @@ export default {
           api: 'scaleKubernetesCluster',
           icon: 'swap',
           label: 'label.kubernetes.cluster.scale',
-          message: 'message.kubernetes.cluster.scale',
+          message: 'message.action.scale.kubernetes.cluster.warning',
           docHelp: 'plugins/cloudstack-kubernetes-service.html#scaling-kubernetes-cluster',
           dataView: true,
           show: (record) => { return ['Created', 'Running'].includes(record.state) },
diff --git a/src/locales/en.json b/src/locales/en.json
index 096355312..f255d01df 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -2415,6 +2415,7 @@
 "message.action.revert.snapshot": "Please confirm that you want to revert the owning volume to this snapshot.",
 "message.action.router.health.checks": "Health checks result will be fetched from router.",
 "message.action.router.health.checks.disabled.warning": "Please enable router health checks.",
+"message.action.scale.kubernetes.cluster.warning": "Please do not manually scale the cluster if cluster autoscaling is enabled",
 "message.action.secure.host": "This will restart the host agent and libvirtd process after applying new X509 certificates, please confirm?",
 "message.action.settings.warning.vm.running": "Please stop the virtual machine to access settings",
 "message.action.settings.warning.vm.started": "Virtual machine has been started. It needs to be stopped to access settings",
diff --git a/src/views/compute/ScaleKubernetesCluster.vue b/src/views/compute/ScaleKubernetesCluster.vue
index 8ebc1fb29..6ccefa766 100644
--- a/src/views/compute/ScaleKubernetesCluster.vue
+++ b/src/views/compute/ScaleKubernetesCluster.vue
@@ -19,7 +19,7 @@
   <div class="form-layout">
     <a-spin :spinning="loading">
       <a-alert type="warning">
-        <span slot="message" v-html="$t('message.kubernetes.cluster.scale')" />
+        <span slot="message" v-html="$t('message.action.scale.kubernetes.cluster.warning')" />
       </a-alert>
       <br />
       <a-form

From e852ec13b6d0abf19293eeb3a589716109a9e40f Mon Sep 17 00:00:00 2001
From: davidjumani <dj.davidjumani1994@gmail.com>
Date: Fri, 9 Oct 2020 15:23:11 +0530
Subject: [PATCH 2/9] Adding option to delete nodes

---
 src/locales/en.json                        |  4 ++
 src/views/compute/KubernetesServiceTab.vue | 58 +++++++++++++++++++++-
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index f255d01df..3bf96c6dc 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -113,6 +113,7 @@
 "label.action.delete.network.processing": "Deleting Network....",
 "label.action.delete.nexusvswitch": "Delete Nexus 1000v",
 "label.action.delete.nic": "Remove NIC",
+"label.action.delete.node": "Delete node",
 "label.action.delete.physical.network": "Delete physical network",
 "label.action.delete.pod": "Delete Pod",
 "label.action.delete.pod.processing": "Deleting Pod....",
@@ -2364,6 +2365,7 @@
 "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.physical.network": "Please confirm that you want to delete this physical network",
@@ -2648,6 +2650,7 @@
 "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...",
@@ -3102,6 +3105,7 @@
 "message.success.delete": "Delete success",
 "message.success.delete.acl.rule": "Successfully removed ACL rule",
 "message.success.delete.backup.schedule": "Successfully deleted Configure VM backup schedule",
+"message.success.delete.node": "Successfully Deleted Node",
 "message.success.delete.snapshot.policy": "Successfully deleted snapshot policy",
 "message.success.delete.static.route": "Successfully deleted static route",
 "message.success.delete.tag": "Successfully deleted tag",
diff --git a/src/views/compute/KubernetesServiceTab.vue b/src/views/compute/KubernetesServiceTab.vue
index 20a7fe7f0..0c55c434f 100644
--- a/src/views/compute/KubernetesServiceTab.vue
+++ b/src/views/compute/KubernetesServiceTab.vue
@@ -93,8 +93,8 @@
         <a-table
           class="table"
           size="small"
-          :columns="this.vmColumns"
-          :dataSource="this.virtualmachines"
+          :columns="vmColumns"
+          :dataSource="virtualmachines"
           :rowKey="item => item.id"
           :pagination="false"
         >
@@ -106,6 +106,25 @@
           </template>
           <template slot="port" slot-scope="text, record, index">
             {{ cksSshStartingPort + index }}
+          <template slot="action" slot-scope="text, record">
+            <a-tooltip placement="bottom" >
+              <template slot="title">
+                {{ $t('label.action.delete.node') }}
+              </template>
+              <a-popconfirm
+                :title="$t('message.action.delete.node')"
+                @confirm="deleteNode(record)"
+                :okText="$t('label.yes')"
+                :cancelText="$t('label.no')"
+                :disabled="!['Created', 'Running'].includes(resource.state)"
+              >
+                <a-button
+                  type="danger"
+                  icon="delete"
+                  shape="circle"
+                  :disabled="!['Created', 'Running'].includes(resource.state)" />
+              </a-popconfirm>
+            </a-tooltip>
           </template>
         </a-table>
       </a-tab-pane>
@@ -141,6 +160,7 @@ export default {
     Status
   },
   mixins: [mixinDevice],
+  inject: ['parentFetchData'],
   props: {
     resource: {
       type: Object,
@@ -194,6 +214,11 @@ export default {
       {
         title: this.$t('label.zonename'),
         dataIndex: 'zonename'
+      },
+      {
+        title: this.$t('label.action'),
+        dataIndex: 'action',
+        scopedSlots: { customRender: 'action' }
       }
     ]
     if (!this.isAdmin()) {
@@ -332,6 +357,35 @@ export default {
         elem.click()
         document.body.removeChild(elem)
       }
+    },
+    deleteNode (node) {
+      const params = {
+        id: this.resource.id,
+        nodeids: node.id
+      }
+      api('scaleKubernetesCluster', params).then(json => {
+        const jobId = json.scalekubernetesclusterresponse.jobid
+        console.log(jobId)
+        this.$store.dispatch('AddAsyncJob', {
+          title: this.$t('label.action.delete.node'),
+          jobid: jobId,
+          description: node.name,
+          status: 'progress'
+        })
+        this.$pollJob({
+          jobId,
+          loadingMessage: `${this.$t('message.deleting.node')} ${node.name}`,
+          catchMessage: this.$t('error.fetching.async.job.result'),
+          successMessage: `${this.$t('message.success.delete.node')} ${node.name}`,
+          successMethod: () => {
+            this.parentFetchData()
+          }
+        })
+      }).catch(error => {
+        this.$notifyError(error)
+      }).finally(() => {
+        this.parentFetchData()
+      })
     }
   }
 }

From 1755ff10ef42725b2e2c2e42321e6967a7739407 Mon Sep 17 00:00:00 2001
From: davidjumani <dj.davidjumani1994@gmail.com>
Date: Wed, 30 Sep 2020 12:41:26 +0530
Subject: [PATCH 3/9] Fixing ip tabs

---
 src/components/view/ResourceView.vue   | 23 +-------
 src/views/network/PublicIpResource.vue | 77 ++++++++++++++++++--------
 2 files changed, 57 insertions(+), 43 deletions(-)

diff --git a/src/components/view/ResourceView.vue b/src/components/view/ResourceView.vue
index 2147f0bc2..3bd335ea9 100644
--- a/src/components/view/ResourceView.vue
+++ b/src/components/view/ResourceView.vue
@@ -113,27 +113,8 @@ export default {
       this.activeTab = key
     },
     showTab (tab) {
-      if ('networkServiceFilter' in tab) {
-        if (this.resource && this.resource.virtualmachineid && !this.resource.vpcid && tab.name !== 'firewall') {
-          return false
-        }
-        if (this.resource && this.resource.virtualmachineid && this.resource.vpcid) {
-          return false
-        }
-        // dont display any option for source NAT IP of VPC
-        if (this.resource && this.resource.vpcid && !this.resource.issourcenat && tab.name !== 'firewall') {
-          return true
-        }
-        // display LB and PF options for isolated networks if static nat is disabled
-        if (this.resource && !this.resource.vpcid) {
-          if (!this.resource.isstaticnat) {
-            return true
-          } else if (tab.name === 'firewall') {
-            return true
-          }
-        }
-        return this.networkService && this.networkService.service &&
-          tab.networkServiceFilter(this.networkService.service)
+      if (this.networkService && this.networkService.service && tab.networkServiceFilter) {
+        return tab.networkServiceFilter(this.networkService.service)
       } else if ('show' in tab) {
         return tab.show(this.resource, this.$route, this.$store.getters.userInfo)
       } else {
diff --git a/src/views/network/PublicIpResource.vue b/src/views/network/PublicIpResource.vue
index 84c62eb4c..0096c0aaf 100644
--- a/src/views/network/PublicIpResource.vue
+++ b/src/views/network/PublicIpResource.vue
@@ -63,6 +63,10 @@ export default {
       tabs: [{
         name: 'details',
         component: () => import('@/components/view/DetailsTab.vue')
+      }],
+      defaultTabs: [{
+        name: 'details',
+        component: () => import('@/components/view/DetailsTab.vue')
       }]
     }
   },
@@ -97,39 +101,68 @@ export default {
       }
 
       this.loading = true
-      this.portFWRuleCount = await this.fetchPortFWRule()
+      await this.filterTabs()
+      await this.fetchAction()
+      this.loading = false
+    },
+    async filterTabs () {
+      // VPC IPs with source nat have only VPN
+      if (this.resource && this.resource.vpcid && this.resource.issourcenat) {
+        this.tabs = this.defaultTabs.concat(this.$route.meta.tabs.filter(tab => tab.name === 'vpn'))
+        return
+      }
+
+      // VPC IPs with vpnenabled have only VPN
+      if (this.resource && this.resource.vpcid && this.resource.vpnenabled) {
+        this.tabs = this.defaultTabs.concat(this.$route.meta.tabs.filter(tab => tab.name === 'vpn'))
+        return
+      }
+
+      // VPC IPs with static nat have nothing
+      if (this.resource && this.resource.vpcid && this.resource.isstaticnat) {
+        return
+      }
+
+      if (this.resource && this.resource.vpcid) {
+        // VPC IPs don't have firewall
+        let tabs = this.$route.meta.tabs.filter(tab => tab.name !== 'firewall')
 
-      // disable load balancing rules only if port forwarding is enabled and
-      // network belongs to VPC
-      if (this.portFWRuleCount > 0 && this.resource.vpcid) {
-        this.tabs = this.$route.meta.tabs.filter(tab => tab.name !== 'loadbalancing')
-      } else {
+        this.portFWRuleCount = await this.fetchPortFWRule()
         this.loadBalancerRuleCount = await this.fetchLoadBalancerRule()
 
-        // for isolated networks, display both LB and PF
-        // for VPC they are mutually exclusive
+        // VPC IPs with PF only have PF
+        if (this.portFWRuleCount > 0) {
+          tabs = this.defaultTabs.concat(this.$route.meta.tabs.filter(tab => tab.name === 'portforwarding'))
+        }
+
+        // VPC IPs with LB rules only have LB
         if (this.loadBalancerRuleCount > 0) {
-          this.tabs =
-            this.resource.vpcid ? this.$route.meta.tabs.filter(tab => tab.name !== 'portforwarding') : this.$route.meta.tabs
-          this.loading = false
-        } else {
-          this.tabs = this.$route.meta.tabs
+          tabs = this.defaultTabs.concat(this.$route.meta.tabs.filter(tab => tab.name === 'loadbalancing'))
         }
+        this.tabs = tabs
+        return
       }
 
-      await this.fetchAction()
-      this.loading = false
-    },
-    fetchAction () {
-      this.actions = []
-      if (this.$route.meta.actions) {
-        this.actions = this.$route.meta.actions
+      // Regular guest networks with Source Nat have everything
+      if (this.resource && !this.resource.vpcid && this.resource.issourcenat) {
+        this.tabs = this.$route.meta.tabs
+        return
+      }
+
+      // Regular guest networks with Static Nat only have Firewall
+      if (this.resource && !this.resource.vpcid && this.resource.isstaticnat) {
+        this.tabs = this.defaultTabs.concat(this.$route.meta.tabs.filter(tab => tab.name === 'firewall'))
+        return
       }
 
-      if (this.portFWRuleCount > 0 || this.loadBalancerRuleCount > 0) {
-        this.actions = this.actions.filter(action => action.api !== 'enableStaticNat')
+      // Regular guest networks have all tabs
+      if (this.resource && !this.resource.vpcid) {
+        this.tabs = this.$route.meta.tabs
       }
     },
+    fetchAction () {
+      this.actions = this.$route.meta.actions || []
+    },
     fetchPortFWRule () {
       return new Promise((resolve, reject) => {
         api('listPortForwardingRules', {

From 2a3e8e5b1cac7fe07e83847dd1441e76d990c59e Mon Sep 17 00:00:00 2001
From: davidjumani <dj.davidjumani1994@gmail.com>
Date: Thu, 22 Oct 2020 18:19:23 +0530
Subject: [PATCH 4/9] Tweaking ScaleKubernetesCluster to support new fields

---
 src/config/section/compute.js                |   2 +-
 src/locales/en.json                          |  22 ++-
 src/views/compute/KubernetesServiceTab.vue   |   4 +-
 src/views/compute/ScaleKubernetesCluster.vue | 157 ++++++++++++++-----
 4 files changed, 133 insertions(+), 52 deletions(-)

diff --git a/src/config/section/compute.js b/src/config/section/compute.js
index 786d48b83..5ac50b1f7 100644
--- a/src/config/section/compute.js
+++ b/src/config/section/compute.js
@@ -413,7 +413,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')
diff --git a/src/locales/en.json b/src/locales/en.json
index 3bf96c6dc..faf2e63f6 100644
--- a/src/locales/en.json
+++ b/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",
@@ -2365,9 +2371,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.",
@@ -2632,10 +2638,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...",
@@ -2650,7 +2656,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...",
@@ -2664,6 +2669,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.",
@@ -2978,8 +2984,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.",
diff --git a/src/views/compute/KubernetesServiceTab.vue b/src/views/compute/KubernetesServiceTab.vue
index 0c55c434f..fe1a07f5e 100644
--- a/src/views/compute/KubernetesServiceTab.vue
+++ b/src/views/compute/KubernetesServiceTab.vue
@@ -116,13 +116,13 @@
                 @confirm="deleteNode(record)"
                 :okText="$t('label.yes')"
                 :cancelText="$t('label.no')"
-                :disabled="!['Created', 'Running'].includes(resource.state)"
+                :disabled="!['Created', 'Running'].includes(resource.state) || resource.autoscalingenabled"
               >
                 <a-button
                   type="danger"
                   icon="delete"
                   shape="circle"
-                  :disabled="!['Created', 'Running'].includes(resource.state)" />
+                  :disabled="!['Created', 'Running'].includes(resource.state) || resource.autoscalingenabled" />
               </a-popconfirm>
             </a-tooltip>
           </template>
diff --git a/src/views/compute/ScaleKubernetesCluster.vue b/src/views/compute/ScaleKubernetesCluster.vue
index 6ccefa766..883cfad2f 100644
--- a/src/views/compute/ScaleKubernetesCluster.vue
+++ b/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', {

From 048ed96a8a1f26cbce1f45d178df34a31617c0d0 Mon Sep 17 00:00:00 2001
From: davidjumani <dj.davidjumani1994@gmail.com>
Date: Wed, 28 Oct 2020 22:35:03 +0530
Subject: [PATCH 5/9] Adding autoscalingenabled to ListView

---
 src/components/view/ListView.vue | 5 +++++
 src/config/section/compute.js    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/view/ListView.vue b/src/components/view/ListView.vue
index 7ff0b34c9..ce8121535 100644
--- a/src/components/view/ListView.vue
+++ b/src/components/view/ListView.vue
@@ -224,6 +224,11 @@
     <a slot="readonly" slot-scope="text, record">
       <status :text="record.readonly ? 'ReadOnly' : 'ReadWrite'" />
     </a>
+    <span slot="autoscalingenabled" slot-scope="text, record">
+      <status :text="record.autoscalingenabled ? 'Enabled' : 'Disabled'" />
+      {{ record.autoscalingenabled ? 'Enabled' : 'Disabled' }}
+    </span>
+
     <div slot="order" slot-scope="text, record" class="shift-btns">
       <a-tooltip placement="top">
         <template slot="title">{{ $t('label.move.to.top') }}</template>
diff --git a/src/config/section/compute.js b/src/config/section/compute.js
index 5ac50b1f7..ba7d5d104 100644
--- a/src/config/section/compute.js
+++ b/src/config/section/compute.js
@@ -406,7 +406,7 @@ export default {
       docHelp: 'plugins/cloudstack-kubernetes-service.html',
       permission: ['listKubernetesClusters'],
       columns: () => {
-        var fields = ['name', 'state', 'size', 'cpunumber', 'memory']
+        var fields = ['name', 'state', 'autoscalingenabled', 'size', 'cpunumber', 'memory']
         if (['Admin', 'DomainAdmin'].includes(store.getters.userInfo.roletype)) {
           fields.push('account')
         }

From 89317e948abadfa6bb279140b55d8004d05d68e7 Mon Sep 17 00:00:00 2001
From: davidjumani <dj.davidjumani1994@gmail.com>
Date: Thu, 29 Oct 2020 13:07:55 +0530
Subject: [PATCH 6/9] Fix

---
 src/views/compute/KubernetesServiceTab.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/compute/KubernetesServiceTab.vue b/src/views/compute/KubernetesServiceTab.vue
index fe1a07f5e..53856d8a2 100644
--- a/src/views/compute/KubernetesServiceTab.vue
+++ b/src/views/compute/KubernetesServiceTab.vue
@@ -106,6 +106,7 @@
           </template>
           <template slot="port" slot-scope="text, record, index">
             {{ cksSshStartingPort + index }}
+          </template>
           <template slot="action" slot-scope="text, record">
             <a-tooltip placement="bottom" >
               <template slot="title">

From 570d88e67efd06face5279007aff5a865e3df12a Mon Sep 17 00:00:00 2001
From: davidjumani <dj.davidjumani1994@gmail.com>
Date: Mon, 2 Nov 2020 15:41:22 +0530
Subject: [PATCH 7/9] Adding backward compatibility

---
 src/config/section/compute.js                | 11 +++++++----
 src/config/section/image.js                  |  2 +-
 src/locales/en.json                          |  3 ++-
 src/views/AutogenView.vue                    |  2 +-
 src/views/compute/KubernetesServiceTab.vue   | 12 +++++++-----
 src/views/compute/ScaleKubernetesCluster.vue |  4 +++-
 6 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/config/section/compute.js b/src/config/section/compute.js
index ba7d5d104..04a428300 100644
--- a/src/config/section/compute.js
+++ b/src/config/section/compute.js
@@ -405,11 +405,14 @@ export default {
       icon: kubernetes,
       docHelp: 'plugins/cloudstack-kubernetes-service.html',
       permission: ['listKubernetesClusters'],
-      columns: () => {
-        var fields = ['name', 'state', 'autoscalingenabled', 'size', 'cpunumber', 'memory']
-        if (['Admin', 'DomainAdmin'].includes(store.getters.userInfo.roletype)) {
+      columns: (store) => {
+        var fields = ['name', 'state', 'size', 'cpunumber', 'memory']
+        if (['Admin', 'DomainAdmin'].includes(store.userInfo.roletype)) {
           fields.push('account')
         }
+        if (store.apis.scaleKubernetesCluster.params.filter(x => x.name === 'autoscalingenabled').length > 0) {
+          fields.splice(2, 0, 'autoscalingenabled')
+        }
         fields.push('zonename')
         return fields
       },
@@ -450,7 +453,7 @@ export default {
           api: 'scaleKubernetesCluster',
           icon: 'swap',
           label: 'label.kubernetes.cluster.scale',
-          message: 'message.action.scale.kubernetes.cluster.warning',
+          message: 'message.kubernetes.cluster.scale',
           docHelp: 'plugins/cloudstack-kubernetes-service.html#scaling-kubernetes-cluster',
           dataView: true,
           show: (record) => { return ['Created', 'Running'].includes(record.state) },
diff --git a/src/config/section/image.js b/src/config/section/image.js
index cba21248d..212c9566d 100644
--- a/src/config/section/image.js
+++ b/src/config/section/image.js
@@ -297,7 +297,7 @@ export default {
       docHelp: 'plugins/cloudstack-kubernetes-service.html#kubernetes-supported-versions',
       permission: ['listKubernetesSupportedVersions'],
       columns: ['name', 'state', 'semanticversion', 'isostate', 'mincpunumber', 'minmemory', 'zonename'],
-      details: ['name', 'semanticversion', 'zoneid', 'zonename', 'isoid', 'isoname', 'isostate', 'mincpunumber', 'minmemory', 'supportsha', 'state'],
+      details: ['name', 'semanticversion', 'supportsautoscaling', 'zoneid', 'zonename', 'isoid', 'isoname', 'isostate', 'mincpunumber', 'minmemory', 'supportsha', 'state'],
       actions: [
         {
           api: 'addKubernetesSupportedVersion',
diff --git a/src/locales/en.json b/src/locales/en.json
index faf2e63f6..e13ff3429 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -451,7 +451,7 @@
 "label.author.name": "Author name",
 "label.autoscale": "AutoScale",
 "label.autoscale.configuration.wizard": "AutoScale Configuration Wizard",
-"label.autoscalingenabled": "Autoscaling enabled",
+"label.autoscalingenabled": "Autoscaling",
 "label.availability": "Availability",
 "label.availabilityzone": "Availability Zone",
 "label.available": "Available",
@@ -2047,6 +2047,7 @@
 "label.summary": "Summary",
 "label.sunday": "Sunday",
 "label.supportedservices": "Supported Services",
+"label.supportsautoscaling": "Supports Autoscaling",
 "label.supportsha": "Supports HA",
 "label.supportspublicaccess": "Supports Public Access",
 "label.supportsregionlevelvpc": "Supports Region Level VPC",
diff --git a/src/views/AutogenView.vue b/src/views/AutogenView.vue
index 3f6bf5e12..4ada8a8e0 100644
--- a/src/views/AutogenView.vue
+++ b/src/views/AutogenView.vue
@@ -544,7 +544,7 @@ export default {
         if (this.$route.meta.columns) {
           const columns = this.$route.meta.columns
           if (columns && typeof columns === 'function') {
-            this.columnKeys = columns()
+            this.columnKeys = columns(this.$store.getters)
           } else {
             this.columnKeys = columns
           }
diff --git a/src/views/compute/KubernetesServiceTab.vue b/src/views/compute/KubernetesServiceTab.vue
index 53856d8a2..bd971cdbf 100644
--- a/src/views/compute/KubernetesServiceTab.vue
+++ b/src/views/compute/KubernetesServiceTab.vue
@@ -215,11 +215,6 @@ export default {
       {
         title: this.$t('label.zonename'),
         dataIndex: 'zonename'
-      },
-      {
-        title: this.$t('label.action'),
-        dataIndex: 'action',
-        scopedSlots: { customRender: 'action' }
       }
     ]
     if (!this.isAdmin()) {
@@ -227,6 +222,13 @@ export default {
     }
   },
   mounted () {
+    if (this.$store.getters.apis.scaleKubernetesCluster.params.filter(x => x.name === 'nodeids').length > 0) {
+      this.vmColumns.push({
+        title: this.$t('label.action'),
+        dataIndex: 'action',
+        scopedSlots: { customRender: 'action' }
+      })
+    }
     this.handleFetchData()
   },
   watch: {
diff --git a/src/views/compute/ScaleKubernetesCluster.vue b/src/views/compute/ScaleKubernetesCluster.vue
index 883cfad2f..46db09ae0 100644
--- a/src/views/compute/ScaleKubernetesCluster.vue
+++ b/src/views/compute/ScaleKubernetesCluster.vue
@@ -19,7 +19,9 @@
   <div class="form-layout">
     <a-spin :spinning="loading">
       <a-alert type="warning">
-        <span slot="message" v-html="$t('message.action.scale.kubernetes.cluster.warning')" />
+        <span
+          slot="message"
+          v-html="resource.autoscalingenabled ? $t('message.action.scale.kubernetes.cluster.warning') : $t('message.kubernetes.cluster.scale')" />
       </a-alert>
       <br />
       <a-form

From 8a88159aa33a5686e90dd5b44289ec8dfdeb62a3 Mon Sep 17 00:00:00 2001
From: davidjumani <dj.davidjumani1994@gmail.com>
Date: Tue, 3 Nov 2020 17:38:04 +0530
Subject: [PATCH 8/9] Adding message to deleteKubernetesSupportedVersion

---
 src/config/section/image.js | 1 +
 src/locales/en.json         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/config/section/image.js b/src/config/section/image.js
index 212c9566d..c560bedba 100644
--- a/src/config/section/image.js
+++ b/src/config/section/image.js
@@ -319,6 +319,7 @@ export default {
           api: 'deleteKubernetesSupportedVersion',
           icon: 'delete',
           label: 'label.kubernetes.version.delete',
+          message: 'message.kubernetes.version.delete',
           dataView: true
         }
       ]
diff --git a/src/locales/en.json b/src/locales/en.json
index e13ff3429..c1221215e 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -2908,6 +2908,7 @@
 "message.kubernetes.cluster.start": "Please confirm that you want to start the cluster",
 "message.kubernetes.cluster.stop": "Please confirm that you want to stop the cluster",
 "message.kubernetes.cluster.upgrade": "Please select new kubernetes version",
+"message.kubernetes.version.delete": "Please confirm that you want to delete this kubernetes version",
 "message.launch.vm.on.private.network": "Do you wish to launch your instance on your own private dedicated network?",
 "message.launch.zone": "Zone is ready to launch; please proceed to the next step.",
 "message.launch.zone.description": "Zone is ready to launch; please proceed to the next step.",

From 5bc673e5c2f2c79b3e121f75b624ab64ec894fb6 Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl.dsilva@shapeblue.com>
Date: Wed, 11 Nov 2020 10:25:49 +0530
Subject: [PATCH 9/9] Fix minimum node root disk size

---
 src/views/compute/CreateKubernetesCluster.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/compute/CreateKubernetesCluster.vue b/src/views/compute/CreateKubernetesCluster.vue
index 9759a5d90..ac56b0432 100644
--- a/src/views/compute/CreateKubernetesCluster.vue
+++ b/src/views/compute/CreateKubernetesCluster.vue
@@ -131,10 +131,11 @@
           </span>
           <a-input
             v-decorator="['noderootdisksize', {
+              initialValue: '8',
               rules: [{
                 validator: (rule, value, callback) => {
-                  if (value && (isNaN(value) || value <= 0)) {
-                    callback(this.$t('message.validate.number'))
+                  if (value && (isNaN(value) || value < 8)) {
+                    callback(this.$t('messgae.validate.min').replace('{0}', '8GB'))
                   }
                   callback()
                 }