Update createdisk script to create microshift bundle

Author: praveenkumar

createdisk-library.sh

@@ -383,3 +383,18 @@ function download_podman() {
       mv podman-remote/windows/podman-${version}/usr/bin/podman.exe  podman-remote/windows
     fi
 }
+
+# As of now sparsify helper is very specific to OCP/OKD kind of bundle where we get the
+# partition for the root label and then mount it with guestfish to cleanup /boot. With
+# microshift vm we are using lvm and guestfish error out during mount
+# mount /dev/sda3 /
+# libguestfs: error: mount: mount exited with status 32: mount: /sysroot: unknown filesystem type 'LVM2_member'
+# There might be other way for guestfish to mount lvm but as of now using a seperate helper is easy.
+function sparsify_lvm() {
+    local destDir=$1
+    sudo cp /var/lib/libvirt/images/${SNC_PRODUCT_NAME}.qcow2 ${destDir}
+    sudo chown $USER:$USER -R ${destDir}
+    export LIBGUESTFS_BACKEND=direct
+    virt-sparsify --in-place ${destDir}/${SNC_PRODUCT_NAME}.qcow2
+    chmod 0644 ${destDir}/${SNC_PRODUCT_NAME}.qcow2
+}

createdisk.sh

@@ -15,36 +15,61 @@ INSTALL_DIR=${1:-crc-tmp-install-data}
 
 # If the user set OKD_VERSION in the environment, then use it to set BASE_OS
 OKD_VERSION=${OKD_VERSION:-none}
-destDirPrefix="crc"
 if [[ ${OKD_VERSION} != "none" ]]
 then
     BASE_OS=fedora-coreos
     destDirPrefix="crc_okd"
 fi
 BASE_OS=${BASE_OS:-rhcos}
 OPENSHIFT_VERSION=$(${JQ} -r .clusterInfo.openshiftVersion $INSTALL_DIR/crc-bundle-info.json)
+BUNDLE_TYPE=$(${JQ} -r .type $INSTALL_DIR/crc-bundle-info.json)
+destDirPrefix="crc"
+if [ ${BUNDLE_TYPE} == "microshift" ]; then
+    destDirPrefix="crc_${BUNDLE_TYPE}"
+    BASE_OS=rhel
+fi
 
 # SNC_PRODUCT_NAME: If user want to use other than default product name (crc)
 # VM_PREFIX: short VM name (set by SNC_PRODUCT_NAME) + random string generated by openshift-installer
 SNC_PRODUCT_NAME=${SNC_PRODUCT_NAME:-crc}
-VM_PREFIX=$(get_vm_prefix ${SNC_PRODUCT_NAME})
-VM_NAME="${VM_PREFIX}-master-0"
+if [ ${BUNDLE_TYPE} == "microshift" ]; then
+    VM_NAME=${SNC_PRODUCT_NAME}
+else
+    VM_PREFIX=$(get_vm_prefix ${SNC_PRODUCT_NAME})
+    VM_NAME="${VM_PREFIX}-master-0"
+fi
 
-# Get the IP of the VM
 VM_IP=$(sudo virsh domifaddr ${VM_NAME} | tail -2 | head -1 | awk '{print $4}' | cut -d/ -f1)
 
-# Remove unused images from container storage
-${SSH} core@${VM_IP} -- 'sudo crictl rmi --prune'
-
-# Disable kubelet service
-${SSH} core@${VM_IP} -- sudo systemctl disable kubelet
-
-# Stop the kubelet service so it will not reprovision the pods
-${SSH} core@${VM_IP} -- sudo systemctl stop kubelet
+if [ ${BUNDLE_TYPE} != "microshift" ]; then
+    # Remove unused images from container storage
+    ${SSH} core@${VM_IP} -- 'sudo crictl rmi --prune'
+    
+    # Disable kubelet service
+    ${SSH} core@${VM_IP} -- sudo systemctl disable kubelet
+    
+    # Stop the kubelet service so it will not reprovision the pods
+    ${SSH} core@${VM_IP} -- sudo systemctl stop kubelet
+fi
 
 # Enable the podman.socket service for API V2
 ${SSH} core@${VM_IP} -- sudo systemctl enable podman.socket
 
+if [ ${BUNDLE_TYPE} == "microshift" ]; then
+    # Pull openshift release images because as part of microshift bundle creation we
+    # don't run microshift service which fetch these image but instead service is run
+    # as part of crc so user have a fresh cluster instead something already provisioned
+    # but images we cache it as part of bundle.
+    ${SSH} core@${VM_IP} 'sudo bash -x -s' <<EOF
+     jq --raw-output '.images | to_entries | map(.value) | join("\n")' /usr/share/microshift/release/release-$(uname -i).json | xargs -n1 podman pull --authfile /etc/crio/openshift-pull-secret
+EOF
+    # Disable firewalld otherwise generated bundle have it running and each podman container
+    # which try to expose a port need to added to firewalld rule manually
+    # also in case of microshift the ports like 2222, 443, 80 ..etc need to be manually added
+    # and OCP/OKD/podman bundles have it disabled by default.
+    ${SSH} core@${VM_IP} -- sudo systemctl disable firewalld
+fi
+
 # Remove audit logs
 ${SSH} core@${VM_IP} -- 'sudo find /var/log/ -iname "*.log" -exec rm -f {} \;'
 
@@ -76,7 +101,7 @@ cat crio-wipe.service | ${SSH} core@${VM_IP} "sudo tee -a /etc/systemd/system/cr
 # Preload routes controller
 ${SSH} core@${VM_IP} -- "sudo podman pull quay.io/crcont/routes-controller:${image_tag}"
 
-if [ "${ARCH}" == "aarch64" ]; then
+if [ "${ARCH}" == "aarch64" ] && [ ${BUNDLE_TYPE} != "okd" ]; then
    # aarch64 support is mainly used on Apple M1 machines which can't run a rhel8 kernel
    # https://access.redhat.com/solutions/6545411
    install_rhel9_kernel ${VM_IP}
@@ -107,12 +132,14 @@ if [ -n "${SNC_GENERATE_MACOS_BUNDLE}" ]; then
     ${SSH} core@${VM_IP} -- "sudo rm -fr /tmp/kernel"
 fi
 
-# Add internalIP as node IP for kubelet systemd unit file
-# More details at https://bugzilla.redhat.com/show_bug.cgi?id=1872632
-${SSH} core@${VM_IP} 'sudo bash -x -s' <<EOF
+if [ ${BUNDLE_TYPE} == "snc" ]; then
+    # Add internalIP as node IP for kubelet systemd unit file
+    # More details at https://bugzilla.redhat.com/show_bug.cgi?id=1872632
+    ${SSH} core@${VM_IP} 'sudo bash -x -s' <<EOF
     echo '[Service]' > /etc/systemd/system/kubelet.service.d/80-nodeip.conf
     echo 'Environment=KUBELET_NODE_IP="${VM_IP}"' >> /etc/systemd/system/kubelet.service.d/80-nodeip.conf
 EOF
+fi
 
 podman_version=$(${SSH} core@${VM_IP} -- 'rpm -q --qf %{version} podman')
 
@@ -136,8 +163,12 @@ libvirtDestDir="${destDirPrefix}_libvirt_${destDirSuffix}"
 rm -fr ${libvirtDestDir} ${libvirtDestDir}.crcbundle
 mkdir "$libvirtDestDir"
 
-create_qemu_image "$libvirtDestDir" "${VM_PREFIX}-base" "${VM_NAME}"
-mv "${libvirtDestDir}/${VM_NAME}" "${libvirtDestDir}/${SNC_PRODUCT_NAME}.qcow2"
+if [ $BUNDLE_TYPE != "microshift" ]; then
+    create_qemu_image "$libvirtDestDir" "${VM_PREFIX}-base" "${VM_NAME}"
+    mv "${libvirtDestDir}/${VM_NAME}" "${libvirtDestDir}/${SNC_PRODUCT_NAME}.qcow2"
+else
+    sparsify_lvm "${libvirtDestDir}"
+fi
 copy_additional_files "$INSTALL_DIR" "$libvirtDestDir" "${VM_NAME}"
 create_tarball "$libvirtDestDir"