controllers: Validates kata version with version.json

For the s390x case, the addon image will include a version json which contains the kata version

Signed-off-by: ANJANA-A-R-K <[email protected]>

Author: ANJANA-A-R-K

config/baremetal/kata-addon-artifacts.yaml

@@ -8,6 +8,3 @@ data:
 
   # Path within the container image where kernel is located
   kernelPath: "/artifacts/kernel/vmlinuz"
-
-  # Kata version
-  kataVersion: "3.21.0"

controllers/daemonset_reconcile.go

@@ -704,7 +704,6 @@ func (r *KataConfigOpenShiftReconciler) getAddonEnvVars() []corev1.EnvVar {
 	}{
 		{"addonImage", "ADDON_IMAGE"},
 		{"kernelPath", "ADDON_KERNEL_PATH"},
-		{"kataVersion", "KATA_VERSION"},
 	}
 
 	var envs []corev1.EnvVar
@@ -719,7 +718,6 @@ func (r *KataConfigOpenShiftReconciler) getAddonEnvVars() []corev1.EnvVar {
 	r.Log.Info("Addon artifacts configured",
 		"image", data["addonImage"],
 		"kernelPath", data["kernelPath"],
-		"kataVersion", data["kataVersion"],
 	)
 
 	return envs

scripts/kata-install/osc-kata-addons-install.sh

@@ -47,51 +47,29 @@ update_config() {
 #   0 on success
 #######################################
 install_addons() {
-    local addon_image="${ADDON_IMAGE:?}"
-    
-    echo "Installing addon artifacts from: $addon_image"
-    
     local kernel_src="${ADDON_KERNEL_PATH:?}"
+	local kernel_file
+    kernel_file="$(basename "$kernel_src")"
 
-    if [ -z "$kernel_src" ]; then
-        echo "ERROR: ADDON_KERNEL_PATH is mandatory but was not provided." >&2
+    local staged_dir="/host/var/lib/kata/addons"
+    local staged_kernel="${staged_dir}/${kernel_src}"
+
+    if [[ ! -f "$staged_kernel" ]]; then
+        echo "ERROR: Staged kernel not found: $staged_kernel" >&2
         exit 1
     fi
 
-    # Standard installation directory
     local install_dir="/host/etc/kata-containers"
-    local temp_dir="/tmp/kata-addons-$$"
-    local auth_file="/tmp/regauth/auth.json"
-    
-    mkdir -p "$install_dir"
-    mkdir -p "$temp_dir"
-    
-    local kernel_installed=""
-    local kernel_path=""
-    
-    # Extract and install kernel
-	echo "Extracting kernel from: $kernel_src"
-	
-	# Reuse extract_container_image from lib.sh
-	if extract_container_image "$addon_image" "$kernel_src" "$temp_dir" "$auth_file"; then
-		local kernel_file=$(basename "$kernel_src")
-		if [ -f "$temp_dir/$kernel_file" ]; then
-			kernel_installed="$install_dir/$kernel_file"
-			kernel_path="/etc/kata-containers/$kernel_file"
-			cp "$temp_dir/$kernel_file" "$kernel_installed"
-			chmod 644 "$kernel_installed"
-			echo "Kernel installed: $kernel_installed"
+	local kernel_installed="${install_dir}/${kernel_file}"
+    local kernel_path="/etc/kata-containers/${kernel_file}"
 
-			# Print checksum of the installed kernel
-			echo "Kernel image $kernel_file checksum (sha256):"
-			sha256sum "$kernel_installed"
-		fi
-	fi
+	cp "$staged_kernel" "$kernel_installed"
 
+    echo "Kernel installed: $kernel_installed"
+    echo "Kernel image $kernel_file checksum (sha256):"
+    sha256sum "$kernel_installed"
 
-    # Cleanup
-    rm -rf "$temp_dir"
-    
+	# Update kata configuration
     update_config "$kernel_path"
 
     echo "Addon installation completed"

scripts/kata-install/osc-kata-install.sh

@@ -88,6 +88,37 @@ extract_kata_version_from_rpm() {
     basename "$rpm" | sed -E 's/^kata-containers-([0-9]+\.[0-9]+(\.[0-9]+)?).*/\1/'
 }
 
+extract_kata_addon_image() {
+    local addon_image="$1"
+	local addon_stage_dir="/host/var/lib/kata/addons"
+
+	mkdir -p $addon_stage_dir
+
+    extract_container_image \
+        "$addon_image" \
+        "/artifacts" \
+        "$addon_stage_dir" \
+        "/tmp/regauth/auth.json" >/dev/null
+
+
+    if [[ ! -f "$addon_stage_dir/artifacts/version.json" ]]; then
+        echo "ERROR: version.json not found in addon image"
+        exit 1
+    fi
+
+	dnf install -y jq >/dev/null 2>&1
+
+    local kata_version
+	kata_version=$(jq -r '.kata_version' "$addon_stage_dir/artifacts/version.json")
+
+    if [[ -z "$kata_version" || "$kata_version" == "null" ]]; then
+        echo "ERROR: kata_version missing in version.json"
+        exit 1
+    fi
+
+    echo "$kata_version"
+}
+
 install() {
 	# Initial wait: avoid doing anything if a previous staged update is pending
 	wait_for_reboot_clear
@@ -109,17 +140,18 @@ install() {
 			continue
 		fi
 
-		if [[ "$package" == "kata-containers" && -n "${KATA_VERSION:-}" ]]; then
-			rpm_kata_version=$(extract_kata_version_from_rpm "$rpm_path")
+		if [[ "$package" == "kata-containers" && -n "${ADDON_IMAGE:-}" ]]; then
+            rpm_kata_version=$(extract_kata_version_from_rpm "$rpm_path")
+			addon_kata_version=$(extract_kata_addon_image "$ADDON_IMAGE")
 
-			if [[ "$rpm_kata_version" != "$KATA_VERSION" ]]; then
-				echo "ERROR: Kata version mismatch for OSC"
-				echo "Expected: ${KATA_VERSION}"
-				echo "Found:    ${rpm_kata_version}"
+			if [[ "$addon_kata_version" != "$rpm_kata_version" ]]; then
+				echo "ERROR: Kata version mismatch between addon image and host RPM"
+				echo "Addon image kata version: $addon_kata_version"
+				echo "Host kata RPM version:    $rpm_kata_version"
 				exit 1
 			fi
 
-			echo "Kata version validation passed: ${rpm_kata_version}"
+			echo "Addon image kata version validated: $addon_kata_version"
 		fi
 
 		# Get available version