From b195d982cdd648dbc08295adc9ea2e559bb3ad36 Mon Sep 17 00:00:00 2001 From: Eric Tune Date: Tue, 11 Nov 2014 11:27:04 -0800 Subject: [PATCH] Remove todos about addin usage to Pods. Usage in Pods would be quite noisy when watching pods. People should get usage from heapster, or from some other object TBD. --- pkg/api/types.go | 2 -- pkg/api/v1beta1/types.go | 2 -- pkg/api/v1beta2/types.go | 2 -- pkg/api/v1beta3/types.go | 2 -- 4 files changed, 8 deletions(-) diff --git a/pkg/api/types.go b/pkg/api/types.go index 59fd543ea4c..4bc4e483d51 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -393,8 +393,6 @@ type ContainerStatus struct { PodIP string `json:"podIP,omitempty" yaml:"podIP,omitempty"` // TODO(dchen1107): Need to decide how to represent this in v1beta3 Image string `yaml:"image" json:"image"` - // TODO(dchen1107): Once we have done with integration with cadvisor, resource - // usage should be included. } // PodInfo contains one entry for every container with available info. diff --git a/pkg/api/v1beta1/types.go b/pkg/api/v1beta1/types.go index 213f1b8b7f2..beaac26706c 100644 --- a/pkg/api/v1beta1/types.go +++ b/pkg/api/v1beta1/types.go @@ -357,8 +357,6 @@ type ContainerStatus struct { PodIP string `json:"podIP,omitempty" yaml:"podIP,omitempty"` // TODO(dchen1107): Need to decide how to reprensent this in v1beta3 Image string `yaml:"image" json:"image"` - // TODO(dchen1107): Once we have done with integration with cadvisor, resource - // usage should be included. } // PodInfo contains one entry for every container with available info. diff --git a/pkg/api/v1beta2/types.go b/pkg/api/v1beta2/types.go index 42e7f80aedb..23596b53ca5 100644 --- a/pkg/api/v1beta2/types.go +++ b/pkg/api/v1beta2/types.go @@ -322,8 +322,6 @@ type ContainerStatus struct { PodIP string `json:"podIP,omitempty" yaml:"podIP,omitempty"` // TODO(dchen1107): Need to decide how to reprensent this in v1beta3 Image string `yaml:"image" json:"image"` - // TODO(dchen1107): Once we have done with integration with cadvisor, resource - // usage should be included. } // PodInfo contains one entry for every container with available info. diff --git a/pkg/api/v1beta3/types.go b/pkg/api/v1beta3/types.go index c0c45474c06..e2fe673f8c7 100644 --- a/pkg/api/v1beta3/types.go +++ b/pkg/api/v1beta3/types.go @@ -419,8 +419,6 @@ type ContainerStatus struct { RestartCount int `json:"restartCount" yaml:"restartCount"` // TODO(dchen1107): Introduce our own NetworkSettings struct here? // TODO(dchen1107): Which image the container is running with? - // TODO(dchen1107): Once we have done with integration with cadvisor, resource - // usage should be included. } // PodInfo contains one entry for every container with available info.