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-pick annotation fixes for 1.6 #420

Merged
merged 3 commits into from
Jun 10, 2024

Conversation

bpradipt
Copy link
Contributor

@bpradipt bpradipt commented Jun 7, 2024

No description provided.

bpradipt added 3 commits June 7, 2024 09:15
There are scenarios where an annotation may exist and adding a new
annotation will fail if we don't use overwrite.
Additionally delete the annotation on image deletion

Fixes: #KATA-3117

Signed-off-by: Pradipta Banerjee <[email protected]>
(cherry picked from commit f4c4eb9)
There are scenarios where an annotation may exist and adding a new
annotation will fail if we don't use overwrite.

Fixes: #KATA-3117
Signed-off-by: Pradipta Banerjee <[email protected]>
(cherry picked from commit 2216229)
Use AMI instead of image where relevant as AWS uses AMI.

Signed-off-by: Pradipta Banerjee <[email protected]>
(cherry picked from commit 9c111b3)
@openshift-ci openshift-ci bot requested review from littlejawa and pmores June 7, 2024 03:46
@bpradipt bpradipt requested review from snir911 and gkurz and removed request for littlejawa and pmores June 7, 2024 03:46
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.

Cherry picked commits are identical to the original version as expected. No merge conflict.

/lgtm

Thanks @bpradipt !

Was this pre-merge tested already ?

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 7, 2024
@bpradipt
Copy link
Contributor Author

pre-merge testing completed successfully by @vvoronko

@bpradipt bpradipt merged commit fa95700 into openshift:release-1.6 Jun 10, 2024
@bpradipt bpradipt deleted the annotation-1.6 branch June 10, 2024 10: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