github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-05-04 06:27:25 +00:00
Code Issues Projects Releases Wiki Activity

build: Fix RPM build fail due to AGENT_POLICY

Browse Source 
By checking for AGENT_POLICY we ensure we only try to read
allow-all.rego if AGENT_POLICY is set to "yes"

Signed-off-by: Emanuel Lima <emlima@redhat.com>
This commit is contained in:
Emanuel Lima 2024-10-07 15:23:02 -03:00
parent 5aaef8e6eb
commit e989e7ee4e
No known key found for this signature in database
1 changed files with 7 additions and 3 deletions

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

@ -39,7 +39,9 @@ PAUSE_IMAGE_TARBALL=${PAUSE_IMAGE_TARBALL:-""}
lib_file="${script_dir}/../scripts/lib.sh" lib_file="${script_dir}/../scripts/lib.sh"
source "$lib_file" source "$lib_file"
agent_policy_file="$(readlink -f -v "${AGENT_POLICY_FILE:-"${script_dir}/../../../src/kata-opa/allow-all.rego"}")" if [[ "${AGENT_POLICY}" == "yes" ]]; then
agent_policy_file="$(readlink -f -v "${AGENT_POLICY_FILE:-"${script_dir}/../../../src/kata-opa/allow-all.rego"}")"
fi
#For cross build #For cross build
CROSS_BUILD=${CROSS_BUILD:-false} CROSS_BUILD=${CROSS_BUILD:-false}
@ -361,7 +363,9 @@ check_env_variables()
[ -n "${KERNEL_MODULES_DIR}" ] && [ ! -d "${KERNEL_MODULES_DIR}" ] && die "KERNEL_MODULES_DIR defined but is not an existing directory" [ -n "${KERNEL_MODULES_DIR}" ] && [ ! -d "${KERNEL_MODULES_DIR}" ] && die "KERNEL_MODULES_DIR defined but is not an existing directory"
[ ! -f "${agent_policy_file}" ] && die "agent policy file not found in '${agent_policy_file}'" if [[ "${AGENT_POLICY}" == "yes" ]]; then
[ ! -f "${agent_policy_file}" ] && die "agent policy file not found in '${agent_policy_file}'"
fi
[ -n "${OSBUILDER_VERSION}" ] || die "need osbuilder version" [ -n "${OSBUILDER_VERSION}" ] || die "need osbuilder version"
} }
@ -724,7 +728,7 @@ EOF
fi fi
fi fi
if [ "${AGENT_POLICY}" == "yes" ]; then if [[ "${AGENT_POLICY}" == "yes" ]]; then
info "Install the default policy" info "Install the default policy"
# Install default settings for the kata-opa service. # Install default settings for the kata-opa service.
local opa_settings_dir="/etc/kata-opa" local opa_settings_dir="/etc/kata-opa"