From 262825f13dbcb8d339f803893d102ce4e9954a24 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Wed, 14 Oct 2015 21:47:51 -0700 Subject: [PATCH] make componenetstatus root scoped --- pkg/api/install/install.go | 1 + pkg/kubectl/cmd/get_test.go | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/api/install/install.go b/pkg/api/install/install.go index 49eeb3ca330..0bce74be126 100644 --- a/pkg/api/install/install.go +++ b/pkg/api/install/install.go @@ -77,6 +77,7 @@ func init() { "Minion", "Namespace", "PersistentVolume", + "ComponentStatus", ) // these kinds should be excluded from the list of resources diff --git a/pkg/kubectl/cmd/get_test.go b/pkg/kubectl/cmd/get_test.go index e5f07480da1..98864021b9e 100644 --- a/pkg/kubectl/cmd/get_test.go +++ b/pkg/kubectl/cmd/get_test.go @@ -90,21 +90,21 @@ func testComponentStatusData() *api.ComponentStatusList { Conditions: []api.ComponentCondition{ {Type: api.ComponentHealthy, Status: api.ConditionTrue, Message: "ok", Error: "nil"}, }, - ObjectMeta: api.ObjectMeta{Name: "servergood", Namespace: "test"}, + ObjectMeta: api.ObjectMeta{Name: "servergood"}, } bad := api.ComponentStatus{ Conditions: []api.ComponentCondition{ {Type: api.ComponentHealthy, Status: api.ConditionFalse, Message: "", Error: "bad status: 500"}, }, - ObjectMeta: api.ObjectMeta{Name: "serverbad", Namespace: "test"}, + ObjectMeta: api.ObjectMeta{Name: "serverbad"}, } unknown := api.ComponentStatus{ Conditions: []api.ComponentCondition{ {Type: api.ComponentHealthy, Status: api.ConditionUnknown, Message: "", Error: "fizzbuzz error"}, }, - ObjectMeta: api.ObjectMeta{Name: "serverunknown", Namespace: "test"}, + ObjectMeta: api.ObjectMeta{Name: "serverunknown"}, } return &api.ComponentStatusList{