Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry picking of commits from devel to release-1.6 branch #411

Merged
merged 6 commits into from
May 30, 2024

Conversation

bpradipt
Copy link
Contributor

No description provided.

bpradipt added 6 commits May 30, 2024 15:35
If IMAGE_GALLERY_NAME in azure-podvm-image-cm is empty, then a
gallery name will be created with the pattern
"PodVMGallery_$clusterid. Note that only the first 8 chars of the
clusterid is used.
IMAGE_GALLERY_NAME annotation is added to peer-pods-cm configMap
if gallery is created by OSC job

FIXES: #KATA-2958

Signed-off-by: Pradipta Banerjee <[email protected]>
(cherry picked from commit 435a80b)
Signed-off-by: Pradipta Banerjee <[email protected]>
PodVM image deletion function has been extended to also support
deletion of gallery via a CLI option. This is used by OSC to ensure
deletion of the OSC created gallery during podvm image deletion. This
ensures if gallery is created as part of kataconfig creation, then
the same gallery is deleted as well during kataconfig deletion

Fixes: #KATA-2958

Signed-off-by: Pradipta Banerjee <[email protected]>
(cherry picked from commit 9d81311)
Signed-off-by: Pradipta Banerjee <[email protected]>
az cli doesn't delete image with version ids using the
az image delete command. Instead we need to use
az sig image-version delete command for sig images.

Ref:
https://learn.microsoft.com/en-us/cli/azure/sig/image-version?view=azure-cli-latest#az-sig-image-version-delete

Fixes: #KATA-2962

Signed-off-by: Pradipta Banerjee <[email protected]>
(cherry picked from commit 1d2c919)
Signed-off-by: Pradipta Banerjee <[email protected]>
Signed-off-by: Pradipta Banerjee <[email protected]>
(cherry picked from commit b15bb27)
Signed-off-by: Pradipta Banerjee <[email protected]>
This is not used anywhere

Signed-off-by: Pradipta Banerjee <[email protected]>
(cherry picked from commit 60d5805)
Signed-off-by: Pradipta Banerjee <[email protected]>
Signed-off-by: Pradipta Banerjee <[email protected]>
(cherry picked from commit 23616f9)
Signed-off-by: Pradipta Banerjee <[email protected]>
@bpradipt bpradipt requested a review from gkurz May 30, 2024 10:09
@openshift-ci openshift-ci bot requested review from littlejawa and pmores May 30, 2024 10:11
Copy link
Member

@gkurz gkurz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

Thanks @bpradipt !

Fixes: #KATA-2958 #KATA-2962

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 30, 2024
@bpradipt bpradipt merged commit bca97bf into openshift:release-1.6 May 30, 2024
@bpradipt bpradipt deleted the pvm-fix-cherry-pick branch May 30, 2024 11:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants