Skip to content

Commit 92d56be

Browse files
authored
chore(core): fix run with ro rootfs (port to upstream from #1526) (#1576)
chore(core): fix run with ro rootfs (#1526) - Fix /var/log/libvirt mount point in virt-launcher image to run it as node-labeller. - Fix build for p11-kit: rewrite for submodule. Signed-off-by: Ivan Mikheykin <[email protected]>
1 parent cbe74f0 commit 92d56be

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

images/packages/p11-kit/werf.inc.yaml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,21 @@ secrets:
2020
value: {{ $.SOURCE_REPO_GIT }}
2121
shell:
2222
install:
23-
- git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
23+
- |
24+
git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
25+
26+
# Download subprojects/pkcs11-json
27+
cd /src
28+
if [[ "$(cat /run/secrets/SOURCE_REPO)" =~ "github.com" ]] ; then
29+
echo "Checkout submodules"
30+
git submodule update --init --recursive --depth=1
31+
else
32+
echo "Checkout submodules with URL rewrite"
33+
git \
34+
-c url."$(cat /run/secrets/SOURCE_REPO)/".insteadOf=https://github.com/ \
35+
submodule update --init --recursive --depth=1
36+
fi
37+
2438
---
2539

2640
{{- $name := print $.ImageName "-dependencies" -}}

images/virt-launcher/mount-points.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ dirs:
4343
- /var/lib/libvirt/qemu/nvram
4444
- /var/lib/kubevirt-node-labeller
4545
- /var/lib/swtpm-localca
46-
- /var/log
46+
- /var/log/libvirt
4747
- /path # For hot-plugged disks, used in "hp Pods".
4848
- /init/usr/bin # For attaching images as "container disks".

0 commit comments

Comments
 (0)