Merge pull request #22019 from saschagrunert/cri-o-annotations

Remove CRI-O related annotations

libpod/kube.go

@@ -17,7 +17,6 @@ import (
 	"github.com/containers/common/libnetwork/types"
 	"github.com/containers/common/pkg/config"
 	"github.com/containers/podman/v5/libpod/define"
-	"github.com/containers/podman/v5/pkg/annotations"
 	"github.com/containers/podman/v5/pkg/domain/entities"
 	"github.com/containers/podman/v5/pkg/env"
 	v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1"
@@ -515,7 +514,7 @@ func (p *Pod) podWithContainers(ctx context.Context, containers []*Container, po
 	for _, ctr := range containers {
 		if !ctr.IsInfra() {
 			for k, v := range ctr.config.Spec.Annotations {
-				if !podmanOnly && (define.IsReservedAnnotation(k) || annotations.IsReservedAnnotation(k)) {
+				if !podmanOnly && (define.IsReservedAnnotation(k)) {
 					continue
 				}
 				podAnnotations[fmt.Sprintf("%s/%s", k, removeUnderscores(ctr.Name()))] = v
@@ -680,7 +679,7 @@ func simplePodWithV1Containers(ctx context.Context, ctrs []*Container, getServic
 	for _, ctr := range ctrs {
 		ctrNames = append(ctrNames, removeUnderscores(ctr.Name()))
 		for k, v := range ctr.config.Spec.Annotations {
-			if !podmanOnly && (define.IsReservedAnnotation(k) || annotations.IsReservedAnnotation(k)) {
+			if !podmanOnly && define.IsReservedAnnotation(k) {
 				continue
 			}
 			kubeAnnotations[fmt.Sprintf("%s/%s", k, removeUnderscores(ctr.Name()))] = v

pkg/annotations/annotations.go

@@ -1,108 +1,9 @@
 package annotations
 
 const (
-	// Annotations carries the received Kubelet annotations.
-	Annotations = "io.kubernetes.cri-o.Annotations"
-
-	// ContainerID is the container ID annotation.
-	ContainerID = "io.kubernetes.cri-o.ContainerID"
-
-	// ContainerName is the container name annotation.
-	ContainerName = "io.kubernetes.cri-o.ContainerName"
-
-	// ContainerType is the container type (sandbox or container) annotation.
-	ContainerType = "io.kubernetes.cri-o.ContainerType"
-
-	// Created is the container creation time annotation.
-	Created = "io.kubernetes.cri-o.Created"
-
-	// HostName is the container host name annotation.
-	HostName = "io.kubernetes.cri-o.HostName"
-
-	// CgroupParent is the sandbox cgroup parent.
-	CgroupParent = "io.kubernetes.cri-o.CgroupParent"
-
-	// IP is the container ipv4 or ipv6 address.
-	IP = "io.kubernetes.cri-o.IP"
-
-	// NamespaceOptions store the options for namespaces.
-	NamespaceOptions = "io.kubernetes.cri-o.NamespaceOptions"
-
-	// SeccompProfilePath is the node seccomp profile path.
-	SeccompProfilePath = "io.kubernetes.cri-o.SeccompProfilePath"
-
-	// Image is the container image ID annotation.
-	Image = "io.kubernetes.cri-o.Image"
-
-	// ImageName is the container image name annotation.
-	ImageName = "io.kubernetes.cri-o.ImageName"
-
-	// ImageRef is the container image ref annotation.
-	ImageRef = "io.kubernetes.cri-o.ImageRef"
-
-	// KubeName is the kubernetes name annotation.
-	KubeName = "io.kubernetes.cri-o.KubeName"
-
-	// PortMappings holds the port mappings for the sandbox.
-	PortMappings = "io.kubernetes.cri-o.PortMappings"
-
-	// Labels are the kubernetes labels annotation.
-	Labels = "io.kubernetes.cri-o.Labels"
-
-	// LogPath is the container logging path annotation.
-	LogPath = "io.kubernetes.cri-o.LogPath"
-
-	// Metadata is the container metadata annotation.
-	Metadata = "io.kubernetes.cri-o.Metadata"
-
-	// Name is the pod name annotation.
-	Name = "io.kubernetes.cri-o.Name"
-
-	// Namespace is the pod namespace annotation.
-	Namespace = "io.kubernetes.cri-o.Namespace"
-
-	// PrivilegedRuntime is the annotation for the privileged runtime path.
-	PrivilegedRuntime = "io.kubernetes.cri-o.PrivilegedRuntime"
-
-	// ResolvPath is the resolver configuration path annotation.
-	ResolvPath = "io.kubernetes.cri-o.ResolvPath"
-
-	// HostnamePath is the path to /etc/hostname to bind mount annotation.
-	HostnamePath = "io.kubernetes.cri-o.HostnamePath"
-
 	// SandboxID is the sandbox ID annotation.
 	SandboxID = "io.kubernetes.cri-o.SandboxID"
 
-	// SandboxName is the sandbox name annotation.
-	SandboxName = "io.kubernetes.cri-o.SandboxName"
-
-	// ShmPath is the shared memory path annotation.
-	ShmPath = "io.kubernetes.cri-o.ShmPath"
-
-	// MountPoint is the mount point of the container rootfs.
-	MountPoint = "io.kubernetes.cri-o.MountPoint"
-
-	// RuntimeHandler is the annotation for runtime handler.
-	RuntimeHandler = "io.kubernetes.cri-o.RuntimeHandler"
-
-	// TTY is the terminal path annotation.
-	TTY = "io.kubernetes.cri-o.TTY"
-
-	// Stdin is the stdin annotation.
-	Stdin = "io.kubernetes.cri-o.Stdin"
-
-	// StdinOnce is the stdin_once annotation.
-	StdinOnce = "io.kubernetes.cri-o.StdinOnce"
-
-	// Volumes is the volumes annotation.
-	Volumes = "io.kubernetes.cri-o.Volumes"
-
-	// HostNetwork indicates whether the host network namespace is used or not.
-	HostNetwork = "io.kubernetes.cri-o.HostNetwork"
-
-	// CNIResult is the JSON string representation of the Result from CNI.
-	CNIResult = "io.kubernetes.cri-o.CNIResult"
-
 	// ContainerManager is the annotation key for indicating the creator and
 	// manager of the container.
 	ContainerManager = "io.container.manager"
@@ -120,15 +21,3 @@ const (
 // ContainerManagerLibpod indicates that libpod created and manages the
 // container.
 const ContainerManagerLibpod = "libpod"
-
-// IsReservedAnnotation returns true if the specified value corresponds to an
-// already reserved annotation that Podman sets during container creation.
-func IsReservedAnnotation(value string) bool {
-	switch value {
-	case Annotations, ContainerID, ContainerName, ContainerType, Created, HostName, CgroupParent, IP, NamespaceOptions, SeccompProfilePath, Image, ImageName, ImageRef, KubeName, PortMappings, Labels, LogPath, Metadata, Name, Namespace, PrivilegedRuntime, ResolvPath, HostnamePath, SandboxID, SandboxName, ShmPath, MountPoint, RuntimeHandler, TTY, Stdin, StdinOnce, Volumes, HostNetwork, CNIResult, ContainerManager:
-		return true
-
-	default:
-		return false
-	}
-}

test/e2e/generate_kube_test.go

@@ -184,7 +184,7 @@ var _ = Describe("Podman kube generate", func() {
 		err := yaml.Unmarshal(kube.Out.Contents(), pod)
 		Expect(err).ToNot(HaveOccurred())
 		Expect(pod.Spec).To(HaveField("HostNetwork", false))
-		Expect(pod.Annotations).To(BeEmpty())
+		Expect(pod.Annotations).To(HaveLen(1))
 
 		numContainers := 0
 		for range pod.Spec.Containers {
@@ -1819,7 +1819,7 @@ EXPOSE 2004-2005/tcp`, CITEST_IMAGE)
 		pod := new(v1.Pod)
 		err := yaml.Unmarshal(kube.Out.Contents(), pod)
 		Expect(err).ToNot(HaveOccurred())
-		Expect(pod.Annotations).To(BeEmpty())
+		Expect(pod.Annotations).To(HaveLen(1))
 	})
 
 	It("on pod with --stop-timeout set for ctr", func() {