opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-19 00:06:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #282 from randomvariable/fix/sandbox

Browse Source 
Set default configuration container type annotation to sandbox
This commit is contained in:
Daniel J Walsh
2018-02-02 19:42:48 +00:00
committed by GitHub
parent d0eb1e0ed6 21482ad1a8
commit a01f708df5
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/spec.go
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] = ""

6
cmd/podman/spec_test.go
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",