kube: alias OCI runtime annotations without underscores#28977
Open
jiwahn wants to merge 1 commit into
Open
Conversation
Honny1
reviewed
Jun 22, 2026
Honny1
left a comment
Contributor
There was a problem hiding this comment.
Thanks, I have some comments.
| cdiparser "tags.cncf.io/container-device-interface/pkg/parser" | ||
| ) | ||
|
|
||
| var kubeToOCIRuntimeAnnotations = map[string]string{ |
Contributor
There was a problem hiding this comment.
I don't like having two mapping tables.
Contributor
Author
There was a problem hiding this comment.
Hey @Honny1, thanks for the comments!
I was also unhappy with having these redundant mappings. But I don't see an adequate place to put a shared mapping table. Since this mapping is just for a narrow use case, kube generate and play, I thought putting it in libpod/define is a bit much.
Alternatively, I can do this for each conversion instead of having a table:
func kubeAnnotationAlias(annotationKey string) string {
switch annotationKey {
case define.RunOCIKeepOriginalGroups:
return define.KubeKeepOriginalGroupsAnnotation
case define.RunOCIMountContextType:
return define.KubeMountContextTypeAnnotation
default:
return annotationKey
}
}What do you think?
Fixes: podman-container-tools#26871 Signed-off-by: Jiwoo Ahn <ikwydls1314@gmail.com>
a5dd6fc to
e1b01ed
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Checklist
Ensure you have completed the following checklist for your pull request to be reviewed:
commits. (
git commit -s). (If needed, usegit commit -s --amend). The author email must matchthe sign-off email address. See CONTRIBUTING.md
for more information.
Fixes: #00000in commit message (if applicable)make validatepr(format/lint checks)Noneif no user-facing changes)Does this PR introduce a user-facing change?
Description
Fixes: #26871
podman kube generatecould emit OCI runtime annotations such asrun.oci.keep_original_groupsandrun.oci.mount_context_typedirectly into Pod YAML. Since these keys contain underscores, the generated YAML failed Kubernetes annotation validation when reused withpodman kube play.Use Kubernetes-valid Podman aliases in generated YAML and restore the original OCI runtime annotations during
podman kube play, preserving the runtime-facingrun.oci.*keys. Hope this makes sense.