github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-20 00:07:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9632 from BbolroC/do-not-build-agent-policy-for-s390x

Browse Source 
local-build: Ensure the default rootfs is built with AGENT_POLICY=yes
This commit is contained in:
Hyounggyu Choi
2024-05-15 06:56:22 +02:00
committed by GitHub
parent 9a3392993d 92bb235723
commit 6a4ff08156
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/osbuilder/rootfs-builder/rootfs.sh
View File

@@ -706,6 +706,7 @@ EOF
fi fi
if [ "${AGENT_POLICY}" == "yes" ]; then if [ "${AGENT_POLICY}" == "yes" ]; then
info "Install the default policy"
# Install default settings for the kata-opa service. # Install default settings for the kata-opa service.
local kata_opa_in_dir="${script_dir}/../../../src/kata-opa" local kata_opa_in_dir="${script_dir}/../../../src/kata-opa"
local opa_settings_dir="/etc/kata-opa" local opa_settings_dir="/etc/kata-opa"

9
tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View File

@@ -186,7 +186,7 @@ install_cached_tarball_component() {
fi fi
local component="${1}" local component="${1}"
local current_version="${2}" local current_version="${2}-$(git log -1 --pretty=format:"%h" ${repo_root_dir}/tools/packaging/kata-deploy/local-build)"
local current_image_version="${3}" local current_image_version="${3}"
local component_tarball_name="${4}" local component_tarball_name="${4}"
local component_tarball_path="${5}" local component_tarball_path="${5}"
@@ -326,13 +326,13 @@ install_image() {
fi fi
export AGENT_TARBALL=$(get_agent_tarball_path) export AGENT_TARBALL=$(get_agent_tarball_path)
export AGENT_POLICY=yes
"${rootfs_builder}" --osname="${os_name}" --osversion="${os_version}" --imagetype=image --prefix="${prefix}" --destdir="${destdir}" --image_initrd_suffix="${variant}" "${rootfs_builder}" --osname="${os_name}" --osversion="${os_version}" --imagetype=image --prefix="${prefix}" --destdir="${destdir}" --image_initrd_suffix="${variant}"
} }
#Install guest image for confidential guests #Install guest image for confidential guests
install_image_confidential() { install_image_confidential() {
export AGENT_POLICY=yes
export MEASURED_ROOTFS=yes export MEASURED_ROOTFS=yes
export PULL_TYPE=default export PULL_TYPE=default
install_image "confidential" install_image "confidential"
@@ -396,13 +396,13 @@ install_initrd() {
fi fi
export AGENT_TARBALL=$(get_agent_tarball_path) export AGENT_TARBALL=$(get_agent_tarball_path)
export AGENT_POLICY=yes
"${rootfs_builder}" --osname="${os_name}" --osversion="${os_version}" --imagetype=initrd --prefix="${prefix}" --destdir="${destdir}" --image_initrd_suffix="${variant}" "${rootfs_builder}" --osname="${os_name}" --osversion="${os_version}" --imagetype=initrd --prefix="${prefix}" --destdir="${destdir}" --image_initrd_suffix="${variant}"
} }
#Install guest initrd for confidential guests #Install guest initrd for confidential guests
install_initrd_confidential() { install_initrd_confidential() {
export AGENT_POLICY=yes
export MEASURED_ROOTFS=yes export MEASURED_ROOTFS=yes
export PULL_TYPE=default export PULL_TYPE=default
install_initrd "confidential" install_initrd "confidential"
@@ -410,7 +410,6 @@ install_initrd_confidential() {
#Install Mariner guest initrd #Install Mariner guest initrd
install_initrd_mariner() { install_initrd_mariner() {
export AGENT_POLICY=yes
install_initrd "mariner" install_initrd "mariner"
} }
@@ -1077,7 +1076,7 @@ handle_build() {
esac esac
pushd ${workdir} pushd ${workdir}
echo "${latest_artefact}" > ${build_target}-version echo "${latest_artefact}-$(git log -1 --pretty=format:"%h" ${repo_root_dir}/tools/packaging/kata-deploy/local-build)" > ${build_target}-version
echo "${latest_builder_image}" > ${build_target}-builder-image-version echo "${latest_builder_image}" > ${build_target}-builder-image-version
sha256sum "${final_tarball_name}" > ${build_target}-sha256sum sha256sum "${final_tarball_name}" > ${build_target}-sha256sum