refactor(core): add binaries, remove unnecessary, change build images

images/bounder/static_binaries/hello_bounder.c

@@ -0,0 +1,6 @@
+#include <stdio.h>
+
+int main() {
+    printf("Hello, my name is Bounder. I’m here to fulfill my destiny… to mount PVCs and vanish into the void.\n");
+    return 0;
+}

images/bounder/werf.inc.yaml

@@ -2,19 +2,31 @@
 image: {{ $.ImageName }}
 fromImage: distroless
 import:
-  - image: {{ $.ImageName }}-binaries
-    add: /relocate
-    to: /
+  - image: {{ $.ImageName }}-cbuilder
+    add: /bins
+    to: /usr/local/bin
     after: setup
 imageSpec:
   config:
-    cmd: ["echo", "Hi, my name is Bounder. I’m here to fulfill my destiny… to mount PVCs and vanish into the void."]
+    cmd: ["hello_bounder"]
 ---
-{{- $binaries := "/usr/bin/echo" }}
-
-image: {{ $.ImageName }}-binaries
+image: {{ $.ImageName }}-cbuilder
 final: false
-fromImage: base-alt-p11-binaries
+from: {{ .Images.BASE_DEBIAN_BOOKWORM_SLIM }}
+git:
+  - add: /images/{{ $.ImageName }}/static_binaries
+    to: /
+    stageDependencies:
+      install:
+        - '*.c'
 shell:
-  setup:
-    - ./relocate_binaries.sh -i "{{ $binaries }}" -o /relocate
+  beforeInstall:
+  - |
+    apt-get update && apt-get install --yes gcc musl-dev musl-tools
+    apt-get clean
+  install:
+  - |    
+    echo "Building simple app that prints hello cdi"
+    mkdir -p /bins
+    musl-gcc -static -Os -o /bins/hello_bounder hello_bounder.c
+    strip /bins/hello_bounder

images/cdi-artifact/werf.inc.yaml

@@ -82,7 +82,6 @@ shell:
     - go build -ldflags="-s -w" -o /cdi-binaries/csv-generator ./tools/csv-generator
 
     - strip /cdi-binaries/*
-    - cp cmd/cdi-cloner/cloner_startup.sh /cdi-binaries
     - chmod +x /cdi-binaries/*
     - chown -R 64535:64535 /cdi-binaries/*
     - ls -la /cdi-binaries

images/cdi-cloner/werf.inc.yaml

@@ -6,44 +6,46 @@ import:
   add: /relocate
   to: /
   before: setup
+imageSpec:
+  config:
+    entrypoint: ["/usr/bin/cloner-startup"]
+    user: 64535
+---
+{{- $name := print $.ImageName "-dependencies" -}}
+{{- define "$name" -}}
+binaries:
+- /usr/bin/cloner-startup
+- /usr/bin/hello
+- /usr/bin/cdi-cloner
+{{- end -}}
+
+{{ $virtCDIClonerDependencies := include "$name" . | fromYaml }}
+
+image: {{ $.ImageName }}-bins
+final: false
+fromImage: base-alt-p11-binaries
+import:
 - image: {{ $.ImageName }}-gobuild
   add: /cdi-binaries
   to: /usr/bin
   includePaths:
   - cloner-startup
-  before: setup
+  before: install
 - image: cdi-artifact-cbuilder
   add: /bins
   to: /usr/bin
-  before: setup
+  before: install
   includePaths:
   - hello
 - image: cdi-artifact
   add: /cdi-binaries
   to: /usr/bin
   includePaths:
   - cdi-cloner
-  before: setup
+  before: install
 # Source https://github.com/kubevirt/containerized-data-importer/blob/v1.60.3/cmd/cdi-cloner/BUILD.bazel
-imageSpec:
-  config:
-    entrypoint: ["/usr/bin/cloner-startup"]
-    user: 64535
----
-{{- $name := print $.ImageName "-dependencies" -}}
-{{- define "$name" -}}
-binaries:
-- /usr/bin/mount
-- /usr/bin/umount
-{{- end -}}
-
-{{ $virtCDIClonerDependencies := include "$name" . | fromYaml }}
-
-image: {{ $.ImageName }}-bins
-final: false
-fromImage: base-alt-p11-binaries
 shell:
-  beforeInstall:
+  install:
   - |
     /relocate_binaries.sh -i "{{ $virtCDIClonerDependencies.binaries | join " " }}" -o /relocate
 ---

images/cdi-importer/werf.inc.yaml

@@ -6,36 +6,33 @@ import:
   add: /relocate
   to: /
   before: setup
-# Source https://github.com/kubevirt/containerized-data-importer/blob/v1.58.0/cmd/cdi-importer/BUILD.bazel
+# Source https://github.com/kubevirt/containerized-data-importer/blob/v1.60.3/cmd/cdi-importer/BUILD.bazel
 imageSpec:
   config:
     entrypoint: ["/usr/bin/cdi-importer", "-alsologtostderr"]
     user: 64535
 
 ---
 {{- define "cdi-importer-deps" -}}
+libraries:
+- libsqlite3
 packages:
   - qemu-img
-  - sqlite3
   - libnbd
   - nbd-client
   - nbd-server
 binaries:
-  - /usr/bin/sh
-  - /usr/bin/rm
-  - /usr/bin/grep
   # Qemu-img
   - /usr/bin/qemu-img
-  - /usr/bin/qemu-io
   - /usr/bin/qemu-nbd
   # All nbd binaries
   - /usr/bin/nbd*
   # Mount
   - /usr/bin/mount /usr/bin/umount
+  # Sqlite libs
+  - /usr/lib64/libsqlite3.so.0 
   # Block device binaries
   - /usr/sbin/blockdev
-  # Sqlite3
-  - /usr/bin/sqldiff /usr/bin/sqlite3 /usr/bin/sqlite3_analyzer
   # CDI binaries
   - /usr/bin/cdi-containerimage-server /usr/bin/cdi-image-size-detection /usr/bin/cdi-importer /usr/bin/cdi-source-update-poller
 {{- end -}}
@@ -59,7 +56,8 @@ shell:
   install:
   - |
     apt-get update && apt-get install --yes \
-      {{ $cdiImporterDependencies.packages | join " " }}
+      {{ $cdiImporterDependencies.packages | join " " }} \
+      {{ $cdiImporterDependencies.libraries | join " " }}
   - apt-get clean
   - rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin
   setup:

images/dvcr-artifact/werf.inc.yaml

@@ -31,7 +31,24 @@ shell:
   - chown -R 64535:64535 /out
 
 ---
-{{- $binaries := "/usr/bin/sh /usr/bin/rm /usr/bin/grep /usr/local/bin/dvcr-importer /usr/bin/qemu-img /usr/bin/qemu-io /usr/bin/qemu-nbd /usr/bin/nbd* /usr/bin/file /usr/share/file/magic /usr/share/file/magic.mgc /etc/magic /usr/bin/mount /usr/bin/umount /usr/local/bin/dvcr-uploader /usr/local/bin/dvcr-cleaner" }}
+{{- $name := print $.ImageName "-dependencies" -}}
+{{- define "$name" -}}
+binaries:
+- /usr/local/bin/dvcr-importer
+- /usr/bin/qemu-img
+- /usr/bin/qemu-nbd
+- /usr/bin/nbd*
+- /usr/bin/file
+- /usr/share/file/magic
+- /usr/share/file/magic.mgc
+- /etc/magic
+- /usr/bin/mount
+- /usr/bin/umount
+- /usr/local/bin/dvcr-uploader
+- /usr/local/bin/dvcr-cleaner
+{{- end -}}
+
+{{ $dvcrDependencies := include "$name" . | fromYaml }}
 
 image: {{ $.ImageName }}-bins
 final: false
@@ -50,4 +67,4 @@ shell:
   - rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin
   setup:
   - |
-    /relocate_binaries.sh -i "{{ $binaries }}" -o /relocate
+    /relocate_binaries.sh -i "{{ $dvcrDependencies.binaries | join " " }}" -o /relocate

images/dvcr/werf.inc.yaml

@@ -5,17 +5,14 @@ import:
 - image: {{ $.ImageName }}-builder
   add: /container-registry-binary
   to: /usr/bin
-  after: install
+  before: setup
   includePaths:
   - registry
 # Registry configuration is stored in configmap: templates/dvcr/configmap.yaml
 - image: {{ $.ImageName }}-artifact-bins
-  add: /relocate
-  to: /
-  after: install
-  excludePaths:
-  - '**/dvcr-uploader'
-  - '**/dvcr-importer'
+  add: /relocate/usr/local/bin/dvcr-cleaner
+  to: /usr/local/bin/dvcr-cleaner
+  before: setup
 imageSpec:
   config:
     user: 64535

images/libvirt/install-libvirt.sh

@@ -185,7 +185,7 @@ $SRC_BUILD/src/libvirt_functions.stp to /usr/share/systemtap/tapset
 $SRC_BUILD/tools/virt-host-validate to /usr/bin
 # $SRC_BUILD/tools/virt-login-shell to /usr/bin
 # $SRC_BUILD/tools/virt-login-shell-helper to /usr/libexec
-$SRC_BUILD/tools/virsh to /usr/bin
+# $SRC_BUILD/tools/virsh to /usr/bin
 # $SRC_BUILD/tools/virt-admin to /usr/bin
 $SRC_BUILD/tools/virt-pki-validate to /usr/bin
 $SRC_BUILD/tools/virt-pki-query-dn to /usr/bin

images/virt-artifact/Taskfile.yaml

@@ -34,6 +34,7 @@ tasks:
         read -p "Delete these directories? [y/N] " answer
 
         if [[ "${answer}" != "${answer#[Yy]}" ]] ; then
+          echo "remove $PATH_KUBEVIRT"
           rm -rf $PATH_KUBEVIRT
         fi
 

images/virt-artifact/patches/041-rename-node-labeller-virt-launcher-init.patch

@@ -1,5 +1,5 @@
 diff --git a/pkg/virt-operator/resource/generate/components/daemonsets.go b/pkg/virt-operator/resource/generate/components/daemonsets.go
-index 8fa14e93b5..001fd05bcd 100644
+index 8fa14e93b5..93c55c1619 100644
 --- a/pkg/virt-operator/resource/generate/components/daemonsets.go
 +++ b/pkg/virt-operator/resource/generate/components/daemonsets.go
 @@ -52,7 +52,6 @@ func RenderPrHelperContainer(image string, pullPolicy corev1.PullPolicy) corev1.
@@ -10,16 +10,23 @@ index 8fa14e93b5..001fd05bcd 100644
  	deploymentName := VirtHandlerName
  	imageName := fmt.Sprintf("%s%s", imagePrefix, deploymentName)
  	env := operatorutil.NewEnvVarMap(extraEnv)
-@@ -123,7 +122,7 @@ func NewHandlerDaemonSet(namespace, repository, imagePrefix, version, launcherVe
+@@ -117,14 +116,10 @@ func NewHandlerDaemonSet(namespace, repository, imagePrefix, version, launcherVe
+ 	pod.InitContainers = []corev1.Container{
+ 		{
+ 			Command: []string{
+-				"/bin/sh",
+-				"-c",
++				"node-labeller",
+ 			},
  			Image: launcherImage,
  			Name:  "virt-launcher",
- 			Args: []string{
+-			Args: []string{
 -				"node-labeller.sh",
-+				"node-labeller",
- 			},
+-			},
  			SecurityContext: &corev1.SecurityContext{
  				Privileged: pointer.Bool(true),
-@@ -350,5 +349,4 @@ func NewHandlerDaemonSet(namespace, repository, imagePrefix, version, launcherVe
+ 			},
+@@ -350,5 +345,4 @@ func NewHandlerDaemonSet(namespace, repository, imagePrefix, version, launcherVe
  		pod.Containers = append(pod.Containers, RenderPrHelperContainer(prHelperImage, pullPolicy))
  	}
  	return daemonset, nil

images/virt-artifact/patches/043-virt-launcher-image-holder-command-sleep.patch

@@ -0,0 +1,15 @@
+diff --git a/pkg/virt-operator/resource/generate/components/daemonsets.go b/pkg/virt-operator/resource/generate/components/daemonsets.go
+index 93c55c1619..ebc1e790bf 100644
+--- a/pkg/virt-operator/resource/generate/components/daemonsets.go
++++ b/pkg/virt-operator/resource/generate/components/daemonsets.go
+@@ -145,8 +145,8 @@ func NewHandlerDaemonSet(namespace, repository, imagePrefix, version, launcherVe
+ 			Name:            "virt-launcher-image-holder",
+ 			Image:           launcherImage,
+ 			ImagePullPolicy: corev1.PullIfNotPresent,
+-			Command:         []string{"/bin/sh", "-c"},
+-			Args:            []string{"sleep infinity"},
++			Command:         []string{"sleep"},
++			Args:            []string{"infinity"},
+ 			Resources: corev1.ResourceRequirements{
+ 				Limits: map[corev1.ResourceName]resource.Quantity{
+ 					corev1.ResourceCPU:    resource.MustParse("100m"),

images/virt-artifact/patches/044-hotplug-attachment-trigger-pod-remove-bash.patch

@@ -0,0 +1,60 @@
+diff --git a/pkg/virt-controller/services/template.go b/pkg/virt-controller/services/template.go
+index 1221448946..7e2519d129 100644
+--- a/pkg/virt-controller/services/template.go
++++ b/pkg/virt-controller/services/template.go
+@@ -382,9 +382,7 @@ func (t *templateService) renderLaunchManifest(vmi *v1.VirtualMachineInstance, i
+ 	if tempPod {
+ 		logger := log.DefaultLogger()
+ 		logger.Infof("RUNNING doppleganger pod for %s", vmi.Name)
+-		command = []string{"/bin/bash",
+-			"-c",
+-			"echo", "bound PVCs"}
++		command = []string{"temp_pod"}
+ 	} else {
+ 		command = []string{"/usr/bin/virt-launcher-monitor",
+ 			"--qemu-timeout", generateQemuTimeoutWithJitter(t.launcherQemuTimeout),
+@@ -921,7 +919,7 @@ func (t *templateService) RenderHotplugAttachmentPodTemplate(volumes []*v1.Volum
+ 	zero := int64(0)
+ 	runUser := int64(util.NonRootUID)
+ 	sharedMount := k8sv1.MountPropagationHostToContainer
+-	command := []string{"/bin/sh", "-c", "/usr/bin/container-disk --copy-path /path/hp"}
++	command := []string{"/usr/bin/container-disk", "--copy-path", "/path/hp"}
+
+ 	tmpTolerations := make([]k8sv1.Toleration, len(ownerPod.Spec.Tolerations))
+ 	copy(tmpTolerations, ownerPod.Spec.Tolerations)
+@@ -1076,11 +1074,9 @@ func (t *templateService) RenderHotplugAttachmentTriggerPodTemplate(volume *v1.V
+ 	sharedMount := k8sv1.MountPropagationHostToContainer
+ 	var command []string
+ 	if tempPod {
+-		command = []string{"/bin/bash",
+-			"-c",
+-			"exit", "0"}
++		command = []string{"temp_pod"}
+ 	} else {
+-		command = []string{"/bin/sh", "-c", "/usr/bin/container-disk --copy-path /path/hp"}
++		command = []string{"/usr/bin/container-disk", "--copy-path", "/path/hp"}
+ 	}
+
+ 	annotationsList := make(map[string]string)
+diff --git a/pkg/virt-controller/watch/vmi_test.go b/pkg/virt-controller/watch/vmi_test.go
+index b4b76bd73e..9fb2c56118 100644
+--- a/pkg/virt-controller/watch/vmi_test.go
++++ b/pkg/virt-controller/watch/vmi_test.go
+@@ -400,7 +400,7 @@ var _ = Describe("VirtualMachineInstance watcher", func() {
+
+ 					return ""
+ 				},
+-				Equal("/bin/bash -c echo bound PVCs"),
++				Equal("temp_pod"),
+ 			)
+
+ 			controller.Execute()
+@@ -676,7 +676,7 @@ var _ = Describe("VirtualMachineInstance watcher", func() {
+
+ 					return ""
+ 				},
+-				Equal("/bin/bash -c echo bound PVCs"))
++				Equal("temp_pod"))
+ 			expectMatchingPodCreation(vmi, IsPodWithoutVmPayload)
+ 			expectVMIWithMatcherConditions(vmi.Namespace, vmi.Name, ContainElement(MatchFields(IgnoreExtras,
+ 				Fields{"Type": Equal(virtv1.VirtualMachineInstanceProvisioning)})),

images/virt-artifact/patches/045-node-labeller-rereplace-sysctl-readfile.patch

@@ -0,0 +1,28 @@
+diff --git a/pkg/virt-handler/node-labeller/node_labeller.go b/pkg/virt-handler/node-labeller/node_labeller.go
+index e5ddaf3784..8de36d72c9 100644
+--- a/pkg/virt-handler/node-labeller/node_labeller.go
++++ b/pkg/virt-handler/node-labeller/node_labeller.go
+@@ -23,7 +23,7 @@ import (
+ 	"context"
+ 	"encoding/json"
+ 	"fmt"
+-	"os/exec"
++	"os"
+ 	"runtime"
+ 	"strings"
+ 	"time"
+@@ -327,11 +327,12 @@ const kernelSchedRealtimeRuntimeInMicrosecods = "kernel.sched_rt_runtime_us"
+ // workloads at peak performance.
+
+ func isNodeRealtimeCapable() (bool, error) {
+-	ret, err := exec.Command("sysctl", kernelSchedRealtimeRuntimeInMicrosecods).CombinedOutput()
++	ret, err := os.ReadFile("/proc/sys/kernel/sched_rt_runtime_us")
+ 	if err != nil {
+ 		return false, err
+ 	}
+-	st := strings.Trim(string(ret), "\n")
++	sched_rt_runtime_us := strings.Trim(string(ret), "\n")
++	st := fmt.Sprintf("%s = %s", kernelSchedRealtimeRuntimeInMicrosecods, sched_rt_runtime_us)
+ 	return fmt.Sprintf("%s = -1", kernelSchedRealtimeRuntimeInMicrosecods) == st, nil
+ }
+