feature: compatible with both k8s and cri-o annotations

write both of these two annotations
1. compatible with old container
2. enable runtime recognize the container type
using popular annotation
3. these two annotation is only read by runtime, not used by pouch

Signed-off-by: zhuangqh <zhuangqhc@gmail.com>

cri/annotations/annotations.go

@@ -8,14 +8,20 @@ const (
 	// ContainerTypeContainer represents a container running within a pod
 	ContainerTypeContainer = "container"
 
+	// CRIOContainerType is the container type (sandbox or container) annotation
+	CRIOContainerType = "io.kubernetes.cri-o.ContainerType"
+
 	// ContainerType is the container type (sandbox or container) annotation
-	ContainerType = "io.kubernetes.cri-o.ContainerType"
+	ContainerType = "io.kubernetes.cri.container-type"
+
+	// CRIOSandboxName is the sandbox name annotation
+	CRIOSandboxName = "io.kubernetes.cri-o.SandboxName"
 
-	// SandboxName is the sandbox name annotation
-	SandboxName = "io.kubernetes.cri-o.SandboxName"
+	// CRIOSandboxID is the sandbox id annotation
+	CRIOSandboxID = "io.kubernetes.cri-o.SandboxID"
 
-	// SandboxID is the sandbox id annotation
-	SandboxID = "io.kubernetes.cri-o.SandboxID"
+	// SandboxID is the sandbox ID annotation
+	SandboxID = "io.kubernetes.cri.sandbox-id"
 
 	// KubernetesRuntime is the runtime
 	KubernetesRuntime = "io.kubernetes.runtime"

cri/v1alpha2/cri.go

@@ -714,9 +714,12 @@ func (c *CriManager) CreateContainer(ctx context.Context, r *runtime.CreateConta
 		image = iSpec.Image
 	}
 
+	// compatible with both kubernetes and cri-o annotations
 	specAnnotation := make(map[string]string)
+	specAnnotation[anno.CRIOContainerType] = anno.ContainerTypeContainer
 	specAnnotation[anno.ContainerType] = anno.ContainerTypeContainer
-	specAnnotation[anno.SandboxName] = podSandboxID
+	specAnnotation[anno.CRIOSandboxName] = podSandboxID
+	specAnnotation[anno.CRIOSandboxID] = podSandboxID
 	specAnnotation[anno.SandboxID] = podSandboxID
 
 	resources := r.GetConfig().GetLinux().GetResources()

cri/v1alpha2/cri_utils.go

@@ -338,6 +338,10 @@ func makeSandboxPouchConfig(config *runtime.PodSandboxConfig, sandboxMeta *metat
 	// Apply a label to distinguish sandboxes from regular containers.
 	labels[containerTypeLabelKey] = containerTypeLabelSandbox
 
+	specAnnotation := make(map[string]string)
+	specAnnotation[anno.CRIOContainerType] = anno.ContainerTypeSandbox
+	specAnnotation[anno.ContainerType] = anno.ContainerTypeSandbox
+
 	hc := &apitypes.HostConfig{}
 
 	if sandboxMeta.NetNS == "" {
@@ -352,9 +356,10 @@ func makeSandboxPouchConfig(config *runtime.PodSandboxConfig, sandboxMeta *metat
 
 	createConfig := &apitypes.ContainerCreateConfig{
 		ContainerConfig: apitypes.ContainerConfig{
-			Hostname: strfmt.Hostname(config.Hostname),
-			Image:    image,
-			Labels:   labels,
+			Hostname:       strfmt.Hostname(config.Hostname),
+			Image:          image,
+			Labels:         labels,
+			SpecAnnotation: specAnnotation,
 		},
 		HostConfig:       hc,
 		NetworkingConfig: &apitypes.NetworkingConfig{},