Set default configuration container type annotation to sandbox

This allows podman to provide sufficient hints to
start containers with Intel Clear Containers:
https://github.com/clearcontainers/runtime/blob/master/docs/architecture/architecture.md#oci-annotations

Signed-off-by: Naadir Jeewa <naadir@randomvariable.co.uk>
This commit is contained in:
Naadir Jeewa 2018-02-01 07:15:13 +00:00
parent 7f6a141839
commit 21482ad1a8
No known key found for this signature in database
GPG Key ID: 3E6CB2D09DC4D5D0
2 changed files with 7 additions and 1 deletions

View File

@ -439,7 +439,7 @@ func getDefaultAnnotations() map[string]string {
annotations[ann.Annotations] = ""
annotations[ann.ContainerID] = ""
annotations[ann.ContainerName] = ""
annotations[ann.ContainerType] = ""
annotations[ann.ContainerType] = "sandbox"
annotations[ann.Created] = ""
annotations[ann.HostName] = ""
annotations[ann.IP] = ""

View File

@ -23,6 +23,12 @@ func TestCreateConfig_GetVolumeMounts(t *testing.T) {
assert.True(t, reflect.DeepEqual(data, specMount[0]))
}
func TestCreateConfig_GetAnnotations(t *testing.T) {
config := createConfig{}
annotations := config.GetAnnotations()
assert.True(t, reflect.DeepEqual("sandbox", annotations["io.kubernetes.cri-o.ContainerType"]))
}
func TestCreateConfig_GetTmpfsMounts(t *testing.T) {
data := spec.Mount{
Destination: "/homer",