diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-02-02 19:42:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-02 19:42:48 +0000 |
| commit | a01f708df5d378af6ff4e804464b34f7c9be2b5d (patch) | |
| tree | 0d2bd143a3d539600de773b55caaea93da4b758e | |
| parent | d0eb1e0ed65fc9585c1b1a1378d747f79060fcb3 (diff) | |
| parent | 21482ad1a861148ae994e0b12e6ecf82da97f4be (diff) | |
| download | podman-a01f708df5d378af6ff4e804464b34f7c9be2b5d.tar.gz podman-a01f708df5d378af6ff4e804464b34f7c9be2b5d.tar.bz2 podman-a01f708df5d378af6ff4e804464b34f7c9be2b5d.zip | |
Merge pull request #282 from randomvariable/fix/sandbox
Set default configuration container type annotation to sandbox
| -rw-r--r-- | cmd/podman/spec.go | 2 | ||||
| -rw-r--r-- | cmd/podman/spec_test.go | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/cmd/podman/spec.go b/cmd/podman/spec.go index 0b5a3c3e3..a14bd7dfb 100644 --- a/cmd/podman/spec.go +++ b/cmd/podman/spec.go @@ -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] = "" diff --git a/cmd/podman/spec_test.go b/cmd/podman/spec_test.go index 586c09656..768b079aa 100644 --- a/cmd/podman/spec_test.go +++ b/cmd/podman/spec_test.go @@ -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", |