fix(core): add missing blockdev to cdi-importer and cdi-controller (#820)

add missing blockdev to cdi-importer and cdi-controller
-----------------
Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>

Author: universal-itengineer

images/cdi-controller/werf.inc.yaml

@@ -10,7 +10,18 @@ docker:
   ENTRYPOINT: ["/usr/bin/cdi-controller", "-alsologtostderr"]
   USER: 64535
 ---
-{{- $binaries := "/usr/bin/cat /usr/bin/bash /usr/bin/echo /usr/bin/cdi-controller" }}
+{{- define "cdi-controller-deps" -}}
+binaries:
+  - /usr/bin/cat
+  - /usr/bin/bash
+  - /usr/bin/echo
+  - /usr/bin/cdi-controller
+  - /usr/sbin/blockdev
+packages:
+  - tar
+{{- end -}}
+
+{{ $cdiClonerDependencies := include "cdi-controller-deps" . | fromYaml }}
 
 image: {{ $.ImageName }}-bins
 final: false
@@ -24,10 +35,17 @@ import:
   before: setup
 # Source https://github.com/kubevirt/containerized-data-importer/blob/v1.58.0/cmd/cdi-controller/BUILD.bazel
 shell:
+  install:
+  - |
+    apt-get update && apt-get install --yes \
+      {{ $cdiClonerDependencies.packages | join " " }}
+  - |
+    apt-get clean
+    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 "{{ $cdiClonerDependencies.binaries | join " " }}" -o /relocate
 # tmp folder need for ready file
 # https://github.com/kubevirt/containerized-data-importer/blob/v1.60.3/pkg/operator/resources/namespaced/controller.go#L243
   - |
-    mkdir -p /relocate/tmp
-    chown 64535:64535 /relocate/tmp
+    mkdir -p /relocate/{tmp,var/run/certs/cdi-uploadserver-signer,var/run/certs/cdi-uploadserver-client-signer}
+    chown -R 64535:64535 /relocate/

images/cdi-importer/werf.inc.yaml

@@ -27,13 +27,15 @@ binaries:
   - /usr/bin/qemu-img
   - /usr/bin/qemu-io
   - /usr/bin/qemu-nbd
-  # All nbd bins
+  # All nbd binaries
   - /usr/bin/nbd*
   # Mount
   - /usr/bin/mount /usr/bin/umount
+  # Block device binaries
+  - /usr/sbin/blockdev
   # Sqlite3
   - /usr/bin/sqldiff /usr/bin/sqlite3 /usr/bin/sqlite3_analyzer
-  # CDI bind
+  # CDI binaries
   - /usr/bin/cdi-containerimage-server /usr/bin/cdi-image-size-detection /usr/bin/cdi-importer /usr/bin/cdi-source-update-poller
 {{- end -}}