diff --git a/build/components/versions.yml b/build/components/versions.yml index b045b68341..74fb184558 100644 --- a/build/components/versions.yml +++ b/build/components/versions.yml @@ -3,7 +3,7 @@ firmware: libvirt: v10.9.0 edk2: stable202411 core: - 3p-kubevirt: v1.6.2-v12n.12 + 3p-kubevirt: v1.6.2-v12n.13 3p-containerized-data-importer: v1.60.3-v12n.16 distribution: 2.8.3 package: diff --git a/images/virt-artifact/werf.inc.yaml b/images/virt-artifact/werf.inc.yaml index 3aea0aca59..45e1112e8d 100644 --- a/images/virt-artifact/werf.inc.yaml +++ b/images/virt-artifact/werf.inc.yaml @@ -9,7 +9,6 @@ image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact final: false fromImage: builder/src -fromCacheVersion: "hotplug-42" # TODO: remove this secrets: - id: SOURCE_REPO value: {{ $.SOURCE_REPO }} @@ -207,3 +206,8 @@ shell: {{- $_ := set $ "ProjectName" (list $.ImageName "virtctl" | join "/") }} - | {{- include "image-build.build" (set $ "BuildCommand" `go build -ldflags="-s -w" -o /kubevirt-binaries/virtctl ./cmd/virtctl/`) | nindent 6 }} + + - echo ============== Build virt-launcher-hook =============== + {{- $_ := set $ "ProjectName" (list $.ImageName "virt-launcher-hook" | join "/") }} + - | + {{- include "image-build.build" (set $ "BuildCommand" `go build -ldflags="-s -w" -o /kubevirt-binaries/virt-launcher-hook ./cmd/virt-launcher-hook/`) | nindent 6 }} diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml index e88a8199d3..130d960d2e 100644 --- a/images/virt-launcher/werf.inc.yaml +++ b/images/virt-launcher/werf.inc.yaml @@ -201,6 +201,10 @@ import: - virt-launcher-monitor - virt-probe - virt-tail +- image: {{ .ModuleNamePrefix }}virt-artifact + add: /kubevirt-binaries/virt-launcher-hook + to: /relocate/etc/libvirt/hooks/qemu + before: setup - image: {{ .ModuleNamePrefix }}{{ .ImageName }}-gobuilder add: /binaries to: /usr/bin