common: Move container type into separate package

Also:
Including an entire package just to retrieve the definition of the
ContainerName label is pointless as it will never ever change again.

Size reduction:
 cilium            27M => 17M
 cilium-agent      37M => 37M
 cilium-docker     26M => 16M
 cilium-cni        26M => 16M

Signed-off-by: Thomas Graf <thomas@cilium.io>

Author: tgraf

NEWS.rst

@@ -14,6 +14,7 @@ Features
 --------
 
 - Improved logging readability (`GH #499 <https://github.com/cilium/cilium/pull/499>`_)
+- Reduced size of cilium binary from 27M to 17M
 
 0.8.0
 =====

daemon/daemon.go

@@ -36,6 +36,7 @@ import (
 	"github.com/cilium/cilium/daemon/options"
 	"github.com/cilium/cilium/pkg/apierror"
 	"github.com/cilium/cilium/pkg/bpf"
+	"github.com/cilium/cilium/pkg/container"
 	"github.com/cilium/cilium/pkg/endpoint"
 	"github.com/cilium/cilium/pkg/events"
 	"github.com/cilium/cilium/pkg/kvstore"
@@ -63,7 +64,7 @@ import (
 type Daemon struct {
 	ipamConf          *ipam.IPAMConfig
 	kvClient          kvstore.KVClient
-	containers        map[string]*types.Container
+	containers        map[string]*container.Container
 	containersMU      sync.RWMutex
 	endpoints         map[uint16]*endpoint.Endpoint
 	endpointsAux      map[string]*endpoint.Endpoint
@@ -488,7 +489,7 @@ func NewDaemon(c *Config) (*Daemon, error) {
 		conf:              c,
 		kvClient:          kvClient,
 		dockerClient:      dockerClient,
-		containers:        make(map[string]*types.Container),
+		containers:        make(map[string]*container.Container),
 		endpoints:         make(map[uint16]*endpoint.Endpoint),
 		endpointsAux:      make(map[string]*endpoint.Endpoint),
 		events:            make(chan events.Event, 512),

daemon/docker_watcher.go

@@ -26,7 +26,7 @@ import (
 
 	"github.com/cilium/cilium/common"
 	"github.com/cilium/cilium/common/addressing"
-	"github.com/cilium/cilium/common/types"
+	"github.com/cilium/cilium/pkg/container"
 	"github.com/cilium/cilium/pkg/endpoint"
 	"github.com/cilium/cilium/pkg/labels"
 	"github.com/cilium/cilium/pkg/policy"
@@ -205,18 +205,18 @@ func (d *Daemon) getFilteredLabels(allLabels map[string]string) labels.Labels {
 	return normalLabels
 }
 
-func (d *Daemon) retrieveWorkingContainerCopy(id string) (types.Container, bool) {
+func (d *Daemon) retrieveWorkingContainerCopy(id string) (container.Container, bool) {
 	d.containersMU.RLock()
 	defer d.containersMU.RUnlock()
 
 	if c, ok := d.containers[id]; ok {
 		return *c, true
 	}
-	return types.Container{}, false
+	return container.Container{}, false
 }
 
-func createContainer(dc *dTypes.ContainerJSON, l labels.Labels) types.Container {
-	return types.Container{
+func createContainer(dc *dTypes.ContainerJSON, l labels.Labels) container.Container {
+	return container.Container{
 		ContainerJSON: *dc,
 		OpLabels: labels.OpLabels{
 			Custom:        labels.Labels{},
@@ -362,7 +362,7 @@ func (d *Daemon) retrieveDockerLabels(dockerID string) (*dTypes.ContainerJSON, l
 	return &dockerCont, newLabels, nil
 }
 
-func updateOrchLabels(c *types.Container, l labels.Labels) bool {
+func updateOrchLabels(c *container.Container, l labels.Labels) bool {
 	changed := false
 
 	c.OpLabels.Orchestration.MarkAllForDeletion()

daemon/labels.go

@@ -23,8 +23,8 @@ import (
 
 	. "github.com/cilium/cilium/api/v1/server/restapi/policy"
 	"github.com/cilium/cilium/common"
-	"github.com/cilium/cilium/common/types"
 	"github.com/cilium/cilium/pkg/apierror"
+	"github.com/cilium/cilium/pkg/container"
 	"github.com/cilium/cilium/pkg/events"
 	"github.com/cilium/cilium/pkg/labels"
 	"github.com/cilium/cilium/pkg/policy"
@@ -141,7 +141,7 @@ func (d *Daemon) CreateOrUpdateIdentity(lbls labels.Labels, epid string) (*polic
 	return identity, isNew, nil
 }
 
-func (d *Daemon) updateContainerIdentity(container *types.Container) (*policy.Identity, error) {
+func (d *Daemon) updateContainerIdentity(container *container.Container) (*policy.Identity, error) {
 	lbls := container.OpLabels.Enabled()
 	log.Debugf("Container %s is resolving identity for labels %+v", container.ID, lbls)
 

common/types/container.go pkg/container/container.go

@@ -12,13 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package types
+package container
 
 import (
 	"github.com/cilium/cilium/pkg/labels"
 
 	dTypes "github.com/docker/engine-api/types"
-	k8sDockerLbls "k8s.io/client-go/1.5/pkg/kubelet/types"
+)
+
+const (
+	// KubernetesContainerNameLabel is the name of the pod label carrying
+	// the name of the container
+	KubernetesContainerNameLabel = "io.kubernetes.container.name"
 )
 
 type Container struct {
@@ -29,7 +34,7 @@ type Container struct {
 
 func (c *Container) IsDockerOrInfracontainer() bool {
 	if c.Config != nil {
-		contName, exists := c.Config.Labels[k8sDockerLbls.KubernetesContainerNameLabel]
+		contName, exists := c.Config.Labels[KubernetesContainerNameLabel]
 		return !exists || contName == "POD"
 	}
 	return false