diff --git a/build/components/versions.yml b/build/components/versions.yml index b438d5178e..0b3a2950db 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.10 + 3p-kubevirt: feat/network/ct-sync-live-migration 3p-containerized-data-importer: v1.60.3-v12n.15 distribution: 2.8.3 package: diff --git a/images/virt-artifact/werf.inc.yaml b/images/virt-artifact/werf.inc.yaml index 50ef78fb33..dd8a43e51d 100644 --- a/images/virt-artifact/werf.inc.yaml +++ b/images/virt-artifact/werf.inc.yaml @@ -9,6 +9,7 @@ image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact final: false fromImage: builder/src +fromCacheVersion: "{{ now | date "Mon Jan 2 15:04:05 MST 2006" }}" secrets: - id: SOURCE_REPO value: {{ $.SOURCE_REPO }} @@ -44,6 +45,7 @@ packages: image: {{ .ModuleNamePrefix }}{{ .ImageName }} final: false fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-alt-1.24" "builder/golang-alt-svace-1.24" }} +fromCacheVersion: "{{ now | date "Mon Jan 2 15:04:05 MST 2006" }}" mount: - fromPath: ~/go-pkg-cache to: /go/pkg @@ -206,3 +208,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-handler/werf.inc.yaml b/images/virt-handler/werf.inc.yaml index 3db87a474a..a1ef5567be 100644 --- a/images/virt-handler/werf.inc.yaml +++ b/images/virt-handler/werf.inc.yaml @@ -1,6 +1,7 @@ --- image: {{ .ModuleNamePrefix }}{{ .ImageName }} fromImage: {{ .ModuleNamePrefix }}distroless +fromCacheVersion: "{{ now | date "Mon Jan 2 15:04:05 MST 2006" }}" git: {{- include "image mount points" . }} import: @@ -81,6 +82,7 @@ packages: image: {{ .ModuleNamePrefix }}{{ .ImageName }}-bins final: false fromImage: {{ .ModuleNamePrefix }}base-alt-p11-binaries +fromCacheVersion: "{{ now | date "Mon Jan 2 15:04:05 MST 2006" }}" import: - image: tools/util-linux add: / diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml index c91eed764b..5153fdd2fc 100644 --- a/images/virt-launcher/werf.inc.yaml +++ b/images/virt-launcher/werf.inc.yaml @@ -137,6 +137,7 @@ packages: image: {{ .ModuleNamePrefix }}{{ .ImageName }}-binaries final: false +fromCacheVersion: "{{ now | date "Mon Jan 2 15:04:05 MST 2006" }}" fromImage: {{ .ModuleNamePrefix }}base-alt-p11-binaries git: # Add qemu and virtqemud configs @@ -200,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