From f444adb51b375edd271e784a7e399297ee87a2c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
Date: Thu, 8 Apr 2021 21:29:57 +0200
Subject: [PATCH 1/2] kata-cleanup: Explicitly add tag to the container image
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We have the tags explicitly set on kata-deploy, let's do the same for
kata-cleanup.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
---
 tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml b/tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml
index 5e80c0f890..ae5200531f 100644
--- a/tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml
+++ b/tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml
@@ -18,7 +18,7 @@ spec:
           katacontainers.io/kata-runtime: cleanup
       containers:
       - name: kube-kata-cleanup
-        image: katadocker/kata-deploy
+        image: katadocker/kata-deploy:2.1.0-alpha1
         imagePullPolicy: Always
         command: [ "bash", "-c", "/opt/kata-artifacts/scripts/kata-deploy.sh reset" ]
         env:

From 2b5f79d6850b800a95d330c09a0eb854cb8f3f09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
Date: Thu, 8 Apr 2021 21:33:28 +0200
Subject: [PATCH 2/2] release: automatically bump the version of the
 kata-deploy images
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Let's teach `update-repository-version.sh` to automatically bump the
version of the kata-deploy images to be used within that release, when
running against the `kata-containers` repo.

Fixes: #1665

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
---
 tools/packaging/release/update-repository-version.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tools/packaging/release/update-repository-version.sh b/tools/packaging/release/update-repository-version.sh
index 2b51a8afe9..84fbea77a9 100755
--- a/tools/packaging/release/update-repository-version.sh
+++ b/tools/packaging/release/update-repository-version.sh
@@ -110,6 +110,13 @@ bump_repo() {
 		fi
 	fi
 
+	if [ "${repo}" == "kata-containers" ]; then
+		info "Updating kata-deploy / kata-cleanup image tags"
+		sed -i "s#katadocker/kata-deploy:${current_version}#katadocker/kata-deploy:${new_version}#g" tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml
+		sed -i "s#katadocker/kata-deploy:${current_version}#katadocker/kata-deploy:${new_version}#g" tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml
+		git diff
+	fi
+
 	info "Creating PR message"
 	notes_file=notes.md
 	cat <<EOT >"${notes_file}"
@@ -128,6 +135,8 @@ EOT
 		info "OK"
 	fi
 
+	git add tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml
+	git add tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml
 	git add VERSION
 	info "Creating commit with new changes"
 	commit_msg="$(generate_commit $new_version $current_version)"