github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-09 11:58:16 +00:00
Code Issues Projects Releases Wiki Activity

ci.ocp: Always replace the kata-deploy image in OCP pipeline

Browse Source 
previously we only replaced the image when the previously defined one
matched the "old_img". This is good to avoid modifying developers custom
changes, but it might lead to hard-to-debug issues when the image stays
different. Let's ensure we always replace the image with the one we
asked for.

Signed-off-by: Lukáš Doktor <ldoktor@redhat.com>
This commit is contained in:
Lukáš Doktor 2024-03-06 11:18:18 +01:00
parent 6525c94065
commit 2936503b24
No known key found for this signature in database
GPG Key ID: 26B362E47FCF22C1
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ci/openshift-ci/cluster/install_kata.sh
View File

@ -35,12 +35,11 @@ WORKAROUND_9206_CRIO=${WORKAROUND_9206_CRIO:-no}
# #
apply_kata_deploy() { apply_kata_deploy() {
local deploy_file="tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml" local deploy_file="tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml"
local old_img="quay.io/kata-containers/kata-deploy:latest"
# Use the kata-deploy CI image which is built for each pull request merged # Use the kata-deploy CI image which is built for each pull request merged
local new_img="quay.io/kata-containers/kata-deploy-ci:kata-containers-latest" local new_img="quay.io/kata-containers/kata-deploy-ci:kata-containers-latest"
pushd "$katacontainers_repo_dir" pushd "$katacontainers_repo_dir"
sed -i "s#${old_img}#${new_img}#" "$deploy_file" sed -ri "s#(\s+image:) .*#\1 ${new_img}#" "$deploy_file"
info "Applying kata-deploy" info "Applying kata-deploy"
oc apply -f tools/packaging/kata-deploy/kata-rbac/base/kata-rbac.yaml oc apply -f tools/packaging/kata-deploy/kata-rbac/base/kata-rbac.yaml