mirror of
				https://github.com/apache/cloudstack.git
				synced 2025-10-26 08:42:29 +01:00 
			
		
		
		
	* Support for live patching systemVMs and deprecating systemVM.iso. Includes: - fix systemVM template version - Include agent.zip, cloud-scripts.tgz to the commons package - Support for live-patching systemVMs - CPVM, SSVM, Routers - Fix Unit test - Remove systemvm.iso dependency * The following commit: - refactors logic added to support SystemVM deployment on KVM - Adds support to copy specific files (required for patching) to the hosts on Xenserver - Modifies vmops method - createFileInDomr to take cleanup param - Adds configuratble sleep param to CitrixResourceBase::connect() used to verify if telnet to specifc port is possible (if sleep is 0, then default to _sleep = 10000ms) - Adds Command/Answer for patch systemVMs on XenServer/Xcp * - Support to patch SystemVMs - VMWare - Remove attaching systemvm.iso to systemVMs - Modify / Refactor VMware start command to copy patch related files to the systemvms - cleanup * Commit comprises of: - remove docker from systemvm template - use containerd as container runtime - update create-k8s-binaries script to use ctr for all docker operations - Update userdata sent to the k8s nodes - update cksnode script, run during patching of the cks/k8s nodes * Add ssh to k8s nodes details in the Access tab on the UI * test * Refactor ca/cert patching logic * Commit comprises of the following changes: - Use restart network/VPC API to patch routers - use livePatch API support patching of only cpvm/ssvm - add timeout to the keystore setup/import script * remove all references of systemvm.iso * Fix keystore-cert-import invocation + refactor cert timeout in CP/SS VMs * fix script timeout * Refactor cert patching for systemVMs + update keystore-cert-import script + patch-sysvms script + remove patchSysvmCommand from networkelementcommand * remove commented code + change core user to cloud for cks nodes * Update ownership of ssh directory * NEED TO DISCUSS - add on the fly template conversion as an ExecStartPre action (systemd) * Add UI changes + move changes from patch file to runcmd * test: validate performance for template modification during seeding * create vms folder in cloudstack-commons directory - debian rules * remove logic for on the fly template convert + update k8s test * fix syntax issue - causing issue with shared network tests * Code cleanup * refactor patching logic - certs * move logic of fixing rootdiskcontroller from upgrade to kubernetes service * add livepatch option to restart network & vpc * smooth upgrade of cks clusters * Support for live patching systemVMs and deprecating systemVM.iso. Includes: - fix systemVM template version - Include agent.zip, cloud-scripts.tgz to the commons package - Support for live-patching systemVMs - CPVM, SSVM, Routers - Fix Unit test - Remove systemvm.iso dependency * The following commit: - refactors logic added to support SystemVM deployment on KVM - Adds support to copy specific files (required for patching) to the hosts on Xenserver - Modifies vmops method - createFileInDomr to take cleanup param - Adds configuratble sleep param to CitrixResourceBase::connect() used to verify if telnet to specifc port is possible (if sleep is 0, then default to _sleep = 10000ms) - Adds Command/Answer for patch systemVMs on XenServer/Xcp * - Support to patch SystemVMs - VMWare - Remove attaching systemvm.iso to systemVMs - Modify / Refactor VMware start command to copy patch related files to the systemvms - cleanup * Commit comprises of: - remove docker from systemvm template - use containerd as container runtime - update create-k8s-binaries script to use ctr for all docker operations - Update userdata sent to the k8s nodes - update cksnode script, run during patching of the cks/k8s nodes * Add ssh to k8s nodes details in the Access tab on the UI * test * Refactor ca/cert patching logic * Commit comprises of the following changes: - Use restart network/VPC API to patch routers - use livePatch API support patching of only cpvm/ssvm - add timeout to the keystore setup/import script * remove all references of systemvm.iso * Fix keystore-cert-import invocation + refactor cert timeout in CP/SS VMs * fix script timeout * Refactor cert patching for systemVMs + update keystore-cert-import script + patch-sysvms script + remove patchSysvmCommand from networkelementcommand * remove commented code + change core user to cloud for cks nodes * Update ownership of ssh directory * NEED TO DISCUSS - add on the fly template conversion as an ExecStartPre action (systemd) * Add UI changes + move changes from patch file to runcmd * test: validate performance for template modification during seeding * create vms folder in cloudstack-commons directory - debian rules * remove logic for on the fly template convert + update k8s test * fix syntax issue - causing issue with shared network tests * Code cleanup * add cgroup config for containerd * add systemd config for kubelet * add additional info during image registry config * address comments * add temp links of download.cloudstack.org * address part of the comments * address comments * update containerd config - as version has upgraded to 1.5 from 1.4.12 in 4.17.0 * address comments - simplify * fix vue3 related icon changes * allow network commands when router template version is lower but is patched * add internal LB to the list of routers to be patched on network restart with live patch * add unit tests for API param validations and new helper utilities - file scp & checksum validations * perform patching only for non-user i.e., system VMs * add test to validate params * remove unused import * add column to domain_router to display software version and support networkrestart with livePatch from router view * Requires upgrade column to consider package (cloud-scripts) checksum to identify if true/false * use router software version instead of checksum * show N/A if no software version reported i.e., in upgraded envs * fix deb failure * update pom to official links of systemVM template
		
			
				
	
	
		
			138 lines
		
	
	
		
			5.3 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			138 lines
		
	
	
		
			5.3 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
| #!/bin/bash
 | |
| # Licensed to the Apache Software Foundation (ASF) under one
 | |
| # or more contributor license agreements.  See the NOTICE file
 | |
| # distributed with this work for additional information
 | |
| # regarding copyright ownership.  The ASF licenses this file
 | |
| # to you under the Apache License, Version 2.0 (the
 | |
| # "License"); you may not use this file except in compliance
 | |
| # with the License.  You may obtain a copy of the License at
 | |
| #
 | |
| #   http://www.apache.org/licenses/LICENSE-2.0
 | |
| #
 | |
| # Unless required by applicable law or agreed to in writing,
 | |
| # software distributed under the License is distributed on an
 | |
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 | |
| # KIND, either express or implied.  See the License for the
 | |
| # specific language governing permissions and limitations
 | |
| # under the License.
 | |
| 
 | |
| PROPS_FILE="$1"
 | |
| KS_PASS="$2"
 | |
| KS_FILE="$3"
 | |
| MODE="$4"
 | |
| CERT_FILE="$5"
 | |
| CERT=$(echo "$6" | tr '^' '\n' | tr '~' ' ')
 | |
| CACERT_FILE="$7"
 | |
| CACERT=$(echo "$8" | tr '^' '\n' | tr '~' ' ')
 | |
| PRIVKEY_FILE="$9"
 | |
| PRIVKEY=$(echo "${10}" | tr '^' '\n' | tr '~' ' ')
 | |
| 
 | |
| ALIAS="cloud"
 | |
| SYSTEM_FILE="/var/cache/cloud/cmdline"
 | |
| LIBVIRTD_FILE="/etc/libvirt/libvirtd.conf"
 | |
| 
 | |
| if [ ! -f "$LIBVIRTD_FILE" ]; then
 | |
|   # Re-use existing password or use the one provided
 | |
|   while [ ! -d /usr/local/cloud/systemvm/conf ]; do sleep 1; done
 | |
|   if [ -f "$PROPS_FILE" ]; then
 | |
|       OLD_PASS=$(sed -n '/keystore.passphrase/p' "$PROPS_FILE" 2>/dev/null  | sed 's/keystore.passphrase=//g' 2>/dev/null)
 | |
|       if [ ! -z "${OLD_PASS// }" ]; then
 | |
|           KS_PASS="$OLD_PASS"
 | |
|       else
 | |
|           sed -i "/keystore.passphrase.*/d" $PROPS_FILE 2> /dev/null || true
 | |
|           echo "keystore.passphrase=$KS_PASS" >> $PROPS_FILE
 | |
|       fi
 | |
|   fi
 | |
| fi
 | |
| 
 | |
| # Find keystore password
 | |
| KS_PASS=$(sed -n '/keystore.passphrase/p' "$PROPS_FILE" 2>/dev/null  | sed 's/keystore.passphrase=//g' 2>/dev/null)
 | |
| 
 | |
| if [ -z "${KS_PASS// }" ]; then
 | |
|     echo "Failed to find keystore passphrase from file: $PROPS_FILE, quiting!"
 | |
|     exit 1
 | |
| fi
 | |
| 
 | |
| # Import certificate
 | |
| if [ ! -z "${CERT// }" ]; then
 | |
|     echo "$CERT" > "$CERT_FILE"
 | |
| elif [ ! -f "$CERT_FILE" ]; then
 | |
|    echo "Cannot find certificate file: $CERT_FILE, exiting"
 | |
|    exit
 | |
| fi
 | |
| 
 | |
| # Import ca certs
 | |
| if [ ! -z "${CACERT// }" ]; then
 | |
|     echo "$CACERT" > "$CACERT_FILE"
 | |
| elif [ ! -f "$CACERT_FILE" ]; then
 | |
|     echo "Cannot find ca certificate file: $CACERT_FILE, exiting!"
 | |
|     exit
 | |
| fi
 | |
| 
 | |
| # Import cacerts into the keystore
 | |
| awk '/-----BEGIN CERTIFICATE-----?/{n++}{print > "cloudca." n }' "$CACERT_FILE"
 | |
| for caChain in $(ls cloudca.*); do
 | |
|     keytool -delete -noprompt -alias "$caChain" -keystore "$KS_FILE" -storepass "$KS_PASS" > /dev/null 2>&1 || true
 | |
|     keytool -import -noprompt -storepass "$KS_PASS" -trustcacerts -alias "$caChain" -file "$caChain" -keystore "$KS_FILE" > /dev/null 2>&1
 | |
| done
 | |
| rm -f cloudca.*
 | |
| 
 | |
| # Stop cloud service in systemvm
 | |
| if [ "$MODE" == "ssh" ] && [ -f $SYSTEM_FILE ]; then
 | |
|     systemctl stop cloud > /dev/null 2>&1
 | |
| fi
 | |
| 
 | |
| # Import private key if available
 | |
| if [ ! -z "${PRIVKEY// }" ]; then
 | |
|     echo "$PRIVKEY" > "$PRIVKEY_FILE"
 | |
| else
 | |
|     > "$PRIVKEY_FILE"
 | |
| fi
 | |
| 
 | |
| if [ -f "$PRIVKEY_FILE" ] && [ -s "$PRIVKEY_FILE" ]; then
 | |
|     # Re-initialize keystore when private key is provided
 | |
|     keytool -delete -noprompt -alias "$ALIAS" -keystore "$KS_FILE" -storepass "$KS_PASS" 2>/dev/null || true
 | |
|     openssl pkcs12 -export -name "$ALIAS" -in "$CERT_FILE" -inkey "$PRIVKEY_FILE" -out "$KS_FILE.p12" -password pass:"$KS_PASS" > /dev/null 2>&1
 | |
|     keytool -importkeystore -srckeystore "$KS_FILE.p12" -destkeystore "$KS_FILE" -srcstoretype PKCS12 -alias "$ALIAS" -deststorepass "$KS_PASS" -destkeypass "$KS_PASS" -srcstorepass "$KS_PASS" -srckeypass "$KS_PASS" > /dev/null 2>&1
 | |
| else
 | |
|     # Import certificate into the keystore
 | |
|     keytool -import -storepass "$KS_PASS" -alias "$ALIAS" -file "$CERT_FILE" -keystore "$KS_FILE" > /dev/null 2>&1 || true
 | |
|     # Export private key from keystore
 | |
|     rm -f "$PRIVKEY_FILE"
 | |
|     keytool -importkeystore -srckeystore "$KS_FILE" -destkeystore "$KS_FILE.p12" -deststoretype PKCS12 -srcalias "$ALIAS" -deststorepass "$KS_PASS" -destkeypass "$KS_PASS" -srcstorepass "$KS_PASS" -srckeypass "$KS_PASS" > /dev/null 2>&1
 | |
|     openssl pkcs12 -in "$KS_FILE.p12" -nodes -nocerts -nomac -password pass:"$KS_PASS" 2>/dev/null | openssl rsa -out "$PRIVKEY_FILE" > /dev/null 2>&1
 | |
| fi
 | |
| 
 | |
| rm -f "$KS_FILE.p12"
 | |
| 
 | |
| # Secure libvirtd on cert import
 | |
| if [ -f "$LIBVIRTD_FILE" ]; then
 | |
|     mkdir -p /etc/pki/CA
 | |
|     mkdir -p /etc/pki/libvirt/private
 | |
|     ln -sf /etc/cloudstack/agent/cloud.ca.crt /etc/pki/CA/cacert.pem
 | |
|     ln -sf /etc/cloudstack/agent/cloud.crt /etc/pki/libvirt/clientcert.pem
 | |
|     ln -sf /etc/cloudstack/agent/cloud.crt /etc/pki/libvirt/servercert.pem
 | |
|     ln -sf /etc/cloudstack/agent/cloud.key /etc/pki/libvirt/private/clientkey.pem
 | |
|     ln -sf /etc/cloudstack/agent/cloud.key /etc/pki/libvirt/private/serverkey.pem
 | |
|     cloudstack-setup-agent -s > /dev/null
 | |
| fi
 | |
| 
 | |
| # Update ca-certs if we're in systemvm
 | |
| if [ -f "$SYSTEM_FILE" ]; then
 | |
|     mkdir -p /usr/local/share/ca-certificates/cloudstack
 | |
|     cp "$CACERT_FILE" /usr/local/share/ca-certificates/cloudstack/ca.crt
 | |
|     chmod 755 /usr/local/share/ca-certificates/cloudstack
 | |
|     chmod 644 /usr/local/share/ca-certificates/cloudstack/ca.crt
 | |
|     update-ca-certificates > /dev/null 2>&1 || true
 | |
| 
 | |
|     # Ensure cloud service is running in systemvm
 | |
|     if [ "$MODE" == "ssh" ]; then
 | |
|         systemctl start cloud > /dev/null 2>&1
 | |
|     fi
 | |
| fi
 | |
| 
 | |
| # Fix file permission
 | |
| chmod 600 $CACERT_FILE
 | |
| chmod 600 $CERT_FILE
 | |
| chmod 600 $PRIVKEY_FILE
 |