From f6f4023508eee4331141ae7b76e77388dbc26dab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
Date: Thu, 18 Feb 2021 11:54:20 +0100
Subject: [PATCH] kata-deploy: Get rid of references to the docker script
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The docker script has been removed as part of
62cbaf4de4e301fe14644b80e977cf07b0007f7e, but references to it were left
behind in the artifact-list.sh, release/kata-deploy-binaries.sh, and
kata-deploy/Dockerfile.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
---
 tools/packaging/artifact-list.sh                |  1 -
 tools/packaging/kata-deploy/Dockerfile          |  1 -
 tools/packaging/release/kata-deploy-binaries.sh | 13 -------------
 3 files changed, 15 deletions(-)

diff --git a/tools/packaging/artifact-list.sh b/tools/packaging/artifact-list.sh
index 75714c132b..4366b67279 100755
--- a/tools/packaging/artifact-list.sh
+++ b/tools/packaging/artifact-list.sh
@@ -11,7 +11,6 @@ set -o nounset
 
 supported_artifacts=(
   "install_clh"
-  "install_docker_config_script"
   "install_experimental_kernel"
   "install_firecracker"
   "install_image"
diff --git a/tools/packaging/kata-deploy/Dockerfile b/tools/packaging/kata-deploy/Dockerfile
index 3c64305465..74fa653d9f 100644
--- a/tools/packaging/kata-deploy/Dockerfile
+++ b/tools/packaging/kata-deploy/Dockerfile
@@ -24,5 +24,4 @@ chmod +x /bin/kubectl
 
 COPY scripts ${DESTINATION}/scripts
 RUN \
-ln -s ${DESTINATION}/scripts/kata-deploy-docker.sh /usr/bin/kata-deploy-docker && \
 ln -s ${DESTINATION}/scripts/kata-deploy.sh /usr/bin/kata-deploy
diff --git a/tools/packaging/release/kata-deploy-binaries.sh b/tools/packaging/release/kata-deploy-binaries.sh
index 591d5e1551..a7f2b97a50 100755
--- a/tools/packaging/release/kata-deploy-binaries.sh
+++ b/tools/packaging/release/kata-deploy-binaries.sh
@@ -175,18 +175,6 @@ install_clh() {
 	popd
 }
 
-install_docker_config_script() {
-	local docker_config_script_name="kata-configure-docker.sh"
-	local docker_config_script="${pkg_root_dir}/static-build/scripts/${docker_config_script_name}"
-
-	local script_dest_dir="${destdir}/opt/kata/share/scripts"
-
-	mkdir -p "$script_dest_dir"
-
-	sudo install --owner root --group root --mode 0755 \
-		"$docker_config_script" "$script_dest_dir"
-}
-
 #Install all components that are not assets
 install_kata_components() {
 	kata_version=${1:-$kata_version}
@@ -273,7 +261,6 @@ main() {
 	install_qemu
 	install_firecracker
 	install_image
-	install_docker_config_script
 
 	untar_qemu_binaries