53 lines
2.1 KiB
Plaintext
53 lines
2.1 KiB
Plaintext
--- pkg/kubectl/cmd/top_test.go
|
|
+++ pkg/kubectl/cmd/top_test.go
|
|
@@ -62,13 +63,13 @@ func marshallBody(metrics interface{}) (io.ReadCloser, error) {
|
|
|
|
func testNodeMetricsData() (*metrics_api.NodeMetricsList, *api.NodeList) {
|
|
metrics := &metrics_api.NodeMetricsList{
|
|
- ListMeta: metav1.ListMeta{
|
|
+ ListMeta: unversioned.ListMeta{
|
|
ResourceVersion: "1",
|
|
},
|
|
Items: []metrics_api.NodeMetrics{
|
|
{
|
|
ObjectMeta: v1.ObjectMeta{Name: "node1", ResourceVersion: "10"},
|
|
- Window: metav1.Duration{Duration: time.Minute},
|
|
+ Window: unversioned.Duration{Duration: time.Minute},
|
|
Usage: v1.ResourceList{
|
|
v1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI),
|
|
v1.ResourceMemory: *resource.NewQuantity(2*(1024*1024), resource.DecimalSI),
|
|
@@ -118,13 +119,13 @@ func testNodeMetricsData() (*metrics_api.NodeMetricsList, *api.NodeList) {
|
|
|
|
func testPodMetricsData() *metrics_api.PodMetricsList {
|
|
return &metrics_api.PodMetricsList{
|
|
- ListMeta: metav1.ListMeta{
|
|
+ ListMeta: unversioned.ListMeta{
|
|
ResourceVersion: "2",
|
|
},
|
|
Items: []metrics_api.PodMetrics{
|
|
{
|
|
ObjectMeta: v1.ObjectMeta{Name: "pod1", Namespace: "test", ResourceVersion: "10"},
|
|
- Window: metav1.Duration{Duration: time.Minute},
|
|
+ Window: unversioned.Duration{Duration: time.Minute},
|
|
Containers: []metrics_api.ContainerMetrics{
|
|
{
|
|
Name: "container1-1",
|
|
@@ -146,7 +147,7 @@ func testPodMetricsData() *metrics_api.PodMetricsList {
|
|
},
|
|
{
|
|
ObjectMeta: v1.ObjectMeta{Name: "pod2", Namespace: "test", ResourceVersion: "11"},
|
|
- Window: metav1.Duration{Duration: time.Minute},
|
|
+ Window: unversioned.Duration{Duration: time.Minute},
|
|
Containers: []metrics_api.ContainerMetrics{
|
|
{
|
|
Name: "container2-1",
|
|
@@ -176,7 +177,7 @@ func testPodMetricsData() *metrics_api.PodMetricsList {
|
|
},
|
|
{
|
|
ObjectMeta: v1.ObjectMeta{Name: "pod3", Namespace: "test", ResourceVersion: "12"},
|
|
- Window: metav1.Duration{Duration: time.Minute},
|
|
+ Window: unversioned.Duration{Duration: time.Minute},
|
|
Containers: []metrics_api.ContainerMetrics{
|
|
{
|
|
Name: "container3-1",
|