commit addresses systemvm iso not getting attached during bootup

Author: Pearl Dsilva

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

@@ -41,13 +41,11 @@
 import com.cloud.kubernetes.cluster.KubernetesCluster;
 import com.cloud.kubernetes.cluster.KubernetesClusterDetailsVO;
 import com.cloud.kubernetes.cluster.KubernetesClusterManagerImpl;
-import com.cloud.kubernetes.cluster.KubernetesClusterService;
 import com.cloud.kubernetes.cluster.KubernetesClusterVO;
 import com.cloud.kubernetes.cluster.KubernetesClusterVmMapVO;
 import com.cloud.kubernetes.cluster.dao.KubernetesClusterDao;
 import com.cloud.kubernetes.cluster.dao.KubernetesClusterDetailsDao;
 import com.cloud.kubernetes.cluster.dao.KubernetesClusterVmMapDao;
-import com.cloud.kubernetes.cluster.utils.KubernetesClusterUtil;
 import com.cloud.kubernetes.version.KubernetesSupportedVersion;
 import com.cloud.kubernetes.version.dao.KubernetesSupportedVersionDao;
 import com.cloud.network.IpAddress;
@@ -319,7 +317,7 @@ protected Pair<String, Integer> getKubernetesClusterServerIpSshPort(UserVm maste
     }
 
     protected void attachIsoKubernetesVMs(List<UserVm> clusterVMs, final KubernetesSupportedVersion kubernetesSupportedVersion) throws CloudRuntimeException {
-        final long startTimeoutTime = System.currentTimeMillis() + KubernetesClusterService.KubernetesClusterStartTimeout.value() * 1000;
+        //final long startTimeoutTime = System.currentTimeMillis() + KubernetesClusterService.KubernetesClusterStartTimeout.value() * 1000;
         KubernetesSupportedVersion version = kubernetesSupportedVersion;
         if (kubernetesSupportedVersion == null) {
             version = kubernetesSupportedVersionDao.findById(kubernetesCluster.getKubernetesVersionId());
@@ -342,16 +340,16 @@ protected void attachIsoKubernetesVMs(List<UserVm> clusterVMs, final KubernetesS
         if (!iso.getState().equals(VirtualMachineTemplate.State.Active)) {
             logTransitStateAndThrow(Level.ERROR, String.format("Unable to attach ISO to Kubernetes cluster ID: %s. Binaries ISO not active.",  kubernetesCluster.getUuid()), kubernetesCluster.getId(), failedEvent);
         }
-        Pair<String, Integer> clusterServerIpSshPort = getKubernetesClusterServerIpSshPort(null);
-        long i = 0;
-
-        if (!containsMasterNode(clusterVMs)) {
-            i = kubernetesCluster.getTotalNodeCount();
-        }
+        //Pair<String, Integer> clusterServerIpSshPort = getKubernetesClusterServerIpSshPort(null);
+//        long i = 0;
+//
+//        if (!containsMasterNode(clusterVMs)) {
+//            i = kubernetesCluster.getTotalNodeCount();
+//        }
         for (UserVm vm : clusterVMs) {
             try {
-                while (!KubernetesClusterUtil.isKubernetesClusterMasterVmRunning(kubernetesCluster, clusterServerIpSshPort.first(), (int) (CLUSTER_NODES_DEFAULT_START_SSH_PORT + i), startTimeoutTime));
-                i++;
+//                while (!KubernetesClusterUtil.isKubernetesClusterMasterVmRunning(kubernetesCluster, clusterServerIpSshPort.first(), (int) (CLUSTER_NODES_DEFAULT_START_SSH_PORT + i), startTimeoutTime));
+//                i++;
                 templateService.attachIso(iso.getId(), vm.getId());
                 if (LOGGER.isInfoEnabled()) {
                     LOGGER.info(String.format("Attached binaries ISO for VM: %s in cluster: %s", vm.getUuid(), kubernetesCluster.getName()));

server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java

@@ -1483,7 +1483,6 @@ public boolean finalizeCommandsOnStart(Commands cmds, VirtualMachineProfile prof
         if(profile.getHypervisorType() == HypervisorType.Hyperv) {
             controlNic = managementNic;
         }
-
         CheckSshCommand check = new CheckSshCommand(profile.getInstanceName(), controlNic.getIPv4Address(), 3922);
         cmds.addCommand("checkSsh", check);
 

systemvm/debian/opt/cloud/bin/setup/CKSNode.sh

@@ -51,7 +51,9 @@ setup_k8s_node() {
     rm -f /etc/logrotate.d/cloud
 
     log_it "Starting cloud-init services"
-    systemctl enable --now --no-block docker
+    systemctl enable --now --no-block containerd
+    systemctl enable --now --no-block docker.socket
+    systemctl enable --now --no-block docker.service
     systemctl enable --now --no-block cloud-init
     systemctl enable --now --no-block cloud-config
     systemctl enable --now --no-block cloud-final

systemvm/debian/opt/cloud/bin/setup/bootstrap.sh

@@ -171,7 +171,6 @@ patch_systemvm() {
 patch() {
   local PATCH_MOUNT=/media/cdrom
   local logfile="/var/log/patchsystemvm.log"
-  ls -lrt ${PATCH_MOUNT}
 
   if [ "$TYPE" == "consoleproxy" ] || [ "$TYPE" == "secstorage" ]  && [ -f ${PATCH_MOUNT}/agent.zip ] && [ -f /var/cache/cloud/patch.required ]
   then

systemvm/debian/opt/cloud/bin/setup/cloud-early-config

@@ -15,7 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-set -x
+
 PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
 
 # Clear boot up flag, it would be created by rc.local after boot up done
@@ -61,7 +61,6 @@ patch() {
     [ -f ${md5file} ] && oldmd5=$(cat ${md5file})
     local newmd5=
     [ -f ${patchfile} ] && newmd5=$(md5sum ${patchfile} | awk '{print $1}')
-
     log_it "Scripts checksum detected: oldmd5=$oldmd5 newmd5=$newmd5"
     if [ "$oldmd5" != "$newmd5" ] && [ -f ${patchfile} ] && [ "$newmd5" != "" ]
     then

systemvm/debian/opt/cloud/bin/setup/common.sh

@@ -544,7 +544,7 @@ setup_system_rfc1918_internal() {
   public_ip=`getPublicIp`
   echo "$public_ip" | grep -E "^((127\.)|(10\.)|(172\.1[6-9]\.)|(172\.2[0-9]\.)|(172\.3[0-1]\.)|(192\.168\.))"
   if [ "$?" == "0" ]; then
-     log_it "Not setting up route of RFC1918 space to $LOCAL_GW befause $public_ip is RFC1918."
+     log_it "Not setting up route of RFC1918 space to $LOCAL_GW because $public_ip is RFC1918."
   else
      log_it "Setting up route of RFC1918 space to $LOCAL_GW"
      # Setup general route for RFC 1918 space, as otherwise it will be sent to

systemvm/debian/opt/cloud/bin/setup/postinit.sh

@@ -20,8 +20,18 @@
 
 set -x
 
+log_it() {
+  echo "$(date) $@" >> /var/log/cloud.log
+  log_action_msg "$@"
+}
+
 # Eject cdrom if any
-eject || true
+CMDLINE=/var/cache/cloud/cmdline
+export TYPE=$(grep -Po 'type=\K[a-zA-Z]*' $CMDLINE)
+if [ "$TYPE" -ne "CKSNode" ]; then
+  log_it "ejecting iso!!!"
+  eject || true
+fi
 
 # Restart journald for setting changes to apply
 systemctl restart systemd-journald

tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh

@@ -129,7 +129,11 @@ function configure_services() {
   systemctl disable qemu-guest-agent
 
   # Disable docker service
-  systemctl disable docker
+  systemctl disable containerd
+  systemctl disable docker.service
+  systemctl stop docker.service
+  systemctl disable docker.socket
+  systemctl stop docker.socket
 
   # Disable cloud init by default
 cat <<EOF > /etc/cloud/cloud.cfg.d/cloudstack.cfg

tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh

@@ -96,10 +96,6 @@ function install_packages() {
     stable"
     apt-get update
     ${apt_get} install docker-ce docker-ce-cli containerd.io
-    # Also tried:
-    # apt-get install --install-recommends docker-ce
-    # and the below option, removing the addition of the repo step
-    # curl -fsSL https://get.docker.com/ | sh
   fi
   apt_clean