CKS CoreOS EOL update

api/src/main/java/com/cloud/user/AccountService.java

@@ -121,4 +121,6 @@ UserAccount createUserAccount(String userName, String password, String firstName
     UserAccount getUserAccountById(Long userId);
 
     public Map<String, String> getKeys(GetUserKeysCmd cmd);
+
+    public Map<String, String> getKeys(Long userId);
 }

api/src/main/java/com/cloud/vm/UserVmService.java

@@ -379,7 +379,7 @@ UserVm createAdvancedVirtualMachine(DataCenter zone, ServiceOffering serviceOffe
         String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod, String userData,
         String sshKeyPair, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIps, Boolean displayVm, String keyboard, List<Long> affinityGroupIdList,
         Map<String, String> customParameters, String customId, Map<String, Map<Integer, String>> dhcpOptionMap, Map<Long, DiskOffering> dataDiskTemplateToDiskOfferingMap,
-        Map<String, String> templateOvfPropertiesMap)
+        Map<String, String> templateOvfPropertiesMap, String type)
 
         throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException;
 

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

@@ -818,10 +818,14 @@ public class ApiConstants {
     public static final String KUBERNETES_VERSION_ID = "kubernetesversionid";
     public static final String KUBERNETES_VERSION_NAME = "kubernetesversionname";
     public static final String MASTER_NODES = "masternodes";
+    public static final String NODE_IDS = "nodeids";
     public static final String MIN_SEMANTIC_VERSION = "minimumsemanticversion";
     public static final String MIN_KUBERNETES_VERSION_ID = "minimumkubernetesversionid";
     public static final String NODE_ROOT_DISK_SIZE = "noderootdisksize";
     public static final String SUPPORTS_HA = "supportsha";
+    public static final String AUTOSCALING_ENABLED = "autoscalingenabled";
+    public static final String MIN_SIZE = "minsize";
+    public static final String MAX_SIZE = "maxsize";
 
     public static final String BOOT_TYPE = "boottype";
     public static final String BOOT_MODE = "bootmode";

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -1674,8 +1674,10 @@ protected boolean sendStop(final VirtualMachineGuru guru, final VirtualMachinePr
                 guru.finalizeStop(profile, answer);
                 if (vm.getType() == VirtualMachine.Type.User) {
                     final UserVmVO userVm = _userVmDao.findById(vm.getId());
-                    userVm.setPowerState(PowerState.PowerOff);
-                    _userVmDao.update(userVm.getId(), userVm);
+                    if (userVm != null) {
+                        userVm.setPowerState(PowerState.PowerOff);
+                        _userVmDao.update(userVm.getId(), userVm);
+                    }
                 }
             } else {
                 s_logger.error("Invalid answer received in response to a StopCommand for " + vm.getInstanceName());

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java

@@ -824,7 +824,7 @@ public List<DiskProfile> allocateTemplatedVolumes(Type type, String name, DiskOf
         int volumesNumber = 1;
         List<DatadiskTO> templateAsIsDisks = null;
         String configurationId = null;
-        if (template.isDeployAsIs()) {
+        if (template.isDeployAsIs() && vm.getType() != VirtualMachine.Type.SecondaryStorageVm) {
             UserVmDetailVO configurationDetail = userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_AS_IS_CONFIGURATION);
             if (configurationDetail != null) {
                 configurationId = configurationDetail.getValue();
@@ -849,7 +849,7 @@ public List<DiskProfile> allocateTemplatedVolumes(Type type, String name, DiskOf
             String volumeName = name;
             Long volumeSize = rootDisksize;
             long deviceId = type.equals(Type.ROOT) ? 0L : 1L;
-            if (template.isDeployAsIs()) {
+            if (template.isDeployAsIs() && vm.getType() != VirtualMachine.Type.SecondaryStorageVm) {
                 int volumeNameSuffix = templateAsIsDisks.get(number).getDiskNumber();
                 volumeName = String.format("%s-%d", volumeName, volumeNameSuffix);
                 volumeSize = templateAsIsDisks.get(number).getVirtualSize();

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java

@@ -140,9 +140,9 @@ private void updateSystemVmTemplates(final Connection conn) {
 
         final Map<Hypervisor.HypervisorType, String> newTemplateChecksum = new HashMap<Hypervisor.HypervisorType, String>() {
             {
-                put(Hypervisor.HypervisorType.KVM, "81b3e48bb934784a13555a43c5ef5ffb");
-                put(Hypervisor.HypervisorType.XenServer, "1b178a5dbdbe090555515340144c6017");
-                put(Hypervisor.HypervisorType.VMware, "e6a88e518c57d6f36c096c4204c3417f");
+                put(Hypervisor.HypervisorType.KVM, "0d95bb3d9385097dec8b485e46eae34b");
+                put(Hypervisor.HypervisorType.XenServer, "8dd2df4eba815711e68cf204a8df7650");
+                put(Hypervisor.HypervisorType.VMware, "6d18a4e41589fa32217adb0d0be3d286");
                 put(Hypervisor.HypervisorType.Hyperv, "5c94da45337cf3e1910dcbe084d4b9ad");
                 put(Hypervisor.HypervisorType.LXC, "81b3e48bb934784a13555a43c5ef5ffb");
                 put(Hypervisor.HypervisorType.Ovm3, "875c5c65455fc06c4a012394410db375");

engine/schema/src/main/java/com/cloud/vm/UserVmVO.java

@@ -48,6 +48,9 @@ public class UserVmVO extends VMInstanceVO implements UserVm {
     @Column(name = "update_parameters", updatable = true)
     protected boolean updateParameters = true;
 
+    @Column(name = "user_vm_type", updatable = true)
+    private String userVmType;
+
     transient String password;
 
     @Override
@@ -125,4 +128,12 @@ public void setUpdateParameters(boolean updateParameters) {
     public boolean isUpdateParameters() {
         return updateParameters;
     }
+
+    public String getUserVmType() {
+        return userVmType;
+    }
+
+    public void setUserVmType(String userVmType) {
+        this.userVmType = userVmType;
+    }
 }

engine/schema/src/main/resources/META-INF/db/schema-41400to41500.sql

@@ -833,3 +833,15 @@ INSERT INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_vers
 
 -- Fix OS category for Guest OS 'Other PV Virtio-SCSI (64-bit)'
 UPDATE `cloud`.`guest_os` SET category_id = 7 WHERE id = 275 AND display_name = 'Other PV Virtio-SCSI (64-bit)';
+
+-- TODO : Move to 4.16
+ALTER TABLE `cloud`.`user_vm` ADD COLUMN `user_vm_type` varchar(255) DEFAULT "UserVM" COMMENT 'Defines the type of UserVM';
+
+UPDATE `cloud`.`vm_template` set deploy_as_is = 1 where id = 8;
+
+ALTER TABLE `cloud`.`kubernetes_cluster` ADD COLUMN `autoscaling_enabled` tinyint(1) unsigned NOT NULL DEFAULT 0;
+ALTER TABLE `cloud`.`kubernetes_cluster` ADD COLUMN `minsize` bigint;
+ALTER TABLE `cloud`.`kubernetes_cluster` ADD COLUMN `maxsize` bigint;
+
+ALTER TABLE `cloud`.`kubernetes_cluster_vm_map` ADD COLUMN `is_master` tinyint(1) unsigned NOT NULL DEFAULT 0;
+

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStartCommandWrapper.java

@@ -88,14 +88,7 @@ public Answer execute(final StartCommand command, final LibvirtComputingResource
             libvirtComputingResource.applyDefaultNetworkRules(conn, vmSpec, false);
 
             // pass cmdline info to system vms
-            if (vmSpec.getType() != VirtualMachine.Type.User) {
-                String controlIp = null;
-                for (final NicTO nic : vmSpec.getNics()) {
-                    if (nic.getType() == TrafficType.Control) {
-                        controlIp = nic.getIp();
-                        break;
-                    }
-                }
+            if (vmSpec.getType() != VirtualMachine.Type.User || (vmSpec.getBootArgs() != null && vmSpec.getBootArgs().contains("CKSNode"))) {
                 // try to patch and SSH into the systemvm for up to 5 minutes
                 for (int count = 0; count < 10; count++) {
                     // wait and try passCmdLine for 30 seconds at most for CLOUDSTACK-2823
@@ -104,12 +97,22 @@ public Answer execute(final StartCommand command, final LibvirtComputingResource
                     }
                 }
 
-                final VirtualRoutingResource virtRouterResource = libvirtComputingResource.getVirtRouterResource();
-                // check if the router is up?
-                for (int count = 0; count < 60; count++) {
-                    final boolean result = virtRouterResource.connect(controlIp, 1, 5000);
-                    if (result) {
-                        break;
+                if (vmSpec.getType() != VirtualMachine.Type.User) {
+                    String controlIp = null;
+                    for (final NicTO nic : vmSpec.getNics()) {
+                        if (nic.getType() == TrafficType.Control) {
+                            controlIp = nic.getIp();
+                            break;
+                        }
+                    }
+
+                    final VirtualRoutingResource virtRouterResource = libvirtComputingResource.getVirtRouterResource();
+                    // check if the router is up?
+                    for (int count = 0; count < 60; count++) {
+                        final boolean result = virtRouterResource.connect(controlIp, 1, 5000);
+                        if (result) {
+                            break;
+                        }
                     }
                 }
             }

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesCluster.java

@@ -37,6 +37,7 @@ enum Event {
         StopRequested,
         DestroyRequested,
         RecoveryRequested,
+        AutoscaleRequested,
         ScaleUpRequested,
         ScaleDownRequested,
         UpgradeRequested,
@@ -81,6 +82,7 @@ enum State {
 
             s_fsm.addTransition(State.Running, Event.FaultsDetected, State.Alert);
 
+            s_fsm.addTransition(State.Running, Event.AutoscaleRequested, State.Scaling);
             s_fsm.addTransition(State.Running, Event.ScaleUpRequested, State.Scaling);
             s_fsm.addTransition(State.Running, Event.ScaleDownRequested, State.Scaling);
             s_fsm.addTransition(State.Scaling, Event.OperationSucceeded, State.Running);
@@ -131,4 +133,7 @@ enum State {
     @Override
     State getState();
     Date getCreated();
+    boolean getAutoscalingEnabled();
+    Long getMinSize();
+    Long getMaxSize();
 }