github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-21 09:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3921 from Jakob-Naucke/agent-config-dir

Browse Source 
CCv0 | github: Use `/etc/kata-containers/agent.toml`
This commit is contained in:
James O. D. Hunt 2022-03-25 09:33:37 +00:00 committed by GitHub
commit da10350d9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/deploy-ccv0-demo.yaml vendored
View File

@ -57,8 +57,11 @@ jobs:
- name: Prepare confidential container rootfs - name: Prepare confidential container rootfs
if: ${{ matrix.asset == 'rootfs-initrd' }} if: ${{ matrix.asset == 'rootfs-initrd' }}
run: | run: |
wget -P include_rootfs/etc/ https://raw.githubusercontent.com/confidential-containers/documentation/main/demos/ssh-demo/aa-offline_fs_kbc-keys.json pushd include_rootfs/etc
envsubst < docs/how-to/data/confidential-agent-config.toml.in > include_rootfs/etc/kata-config.toml curl -LO https://raw.githubusercontent.com/confidential-containers/documentation/main/demos/ssh-demo/aa-offline_fs_kbc-keys.json
mkdir kata-containers
envsubst < docs/how-to/data/confidential-agent-config.toml.in > kata-containers/agent.toml
popd
env: env:
AA_KBC_PARAMS: offline_fs_kbc::null AA_KBC_PARAMS: offline_fs_kbc::null

2
tools/packaging/kata-deploy/scripts/kata-deploy.sh
View File

@ -222,7 +222,7 @@ function configure_kata() {
if [ "${CONFIGURE_CC:-}" == "yes" ]; then if [ "${CONFIGURE_CC:-}" == "yes" ]; then
sed -E \ sed -E \
-e 's#^image = .+#initrd = "/opt/kata/share/kata-containers/kata-containers-initrd.img"#' \ -e 's#^image = .+#initrd = "/opt/kata/share/kata-containers/kata-containers-initrd.img"#' \
-e 's#^(kernel_params = .+)"#\1 agent.config_file=/etc/kata-config.toml"#' \ -e 's#^(kernel_params = .+)"#\1 agent.config_file=/etc/kata-containers/agent.toml"#' \
-e 's#.*service_offload = .+#service_offload = true#' \ -e 's#.*service_offload = .+#service_offload = true#' \
"/opt/kata/share/defaults/kata-containers/configuration-qemu.toml" > \ "/opt/kata/share/defaults/kata-containers/configuration-qemu.toml" > \
"/opt/kata/share/defaults/kata-containers/configuration-cc.toml" "/opt/kata/share/defaults/kata-containers/configuration-cc.toml"