github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 15:58:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7735 from fabioy/yank-nodes-status.fix

Browse Source 
Remove node status from "componentstatuses" call.
This commit is contained in:
Robert Bailey 2015-05-04 20:43:01 -07:00
commit 72048a824c
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/master/master.go
View File

@ -441,7 +441,7 @@ func (m *Master) init(c *Config) {
"persistentVolumeClaims": persistentVolumeClaimStorage, "persistentVolumeClaims": persistentVolumeClaimStorage,
"persistentVolumeClaims/status": persistentVolumeClaimStatusStorage, "persistentVolumeClaims/status": persistentVolumeClaimStatusStorage,
"componentStatuses": componentstatus.NewStorage(func() map[string]apiserver.Server { return m.getServersToValidate(c) }), "componentStatuses": componentstatus.NewStorage(func() map[string]apiserver.Server { return m.getServersToValidate(c, false) }),
} }
apiVersions := []string{"v1beta1", "v1beta2"} apiVersions := []string{"v1beta1", "v1beta2"}
@ -477,8 +477,8 @@ func (m *Master) init(c *Config) {
m.mux.HandleFunc("/", apiserver.IndexHandler(m.handlerContainer, m.muxHelper)) m.mux.HandleFunc("/", apiserver.IndexHandler(m.handlerContainer, m.muxHelper))
} }
// TODO: use go-restful // TODO: This is now deprecated. Should be removed once client dependencies are gone.
apiserver.InstallValidator(m.muxHelper, func() map[string]apiserver.Server { return m.getServersToValidate(c) }) apiserver.InstallValidator(m.muxHelper, func() map[string]apiserver.Server { return m.getServersToValidate(c, true) })
if c.EnableLogsSupport { if c.EnableLogsSupport {
apiserver.InstallLogsSupport(m.muxHelper) apiserver.InstallLogsSupport(m.muxHelper)
} }
@ -580,7 +580,7 @@ func (m *Master) InstallSwaggerAPI() {
swagger.RegisterSwaggerService(swaggerConfig, m.handlerContainer) swagger.RegisterSwaggerService(swaggerConfig, m.handlerContainer)
} }
func (m *Master) getServersToValidate(c *Config) map[string]apiserver.Server { func (m *Master) getServersToValidate(c *Config, includeNodes bool) map[string]apiserver.Server {
serversToValidate := map[string]apiserver.Server{ serversToValidate := map[string]apiserver.Server{
"controller-manager": {Addr: "127.0.0.1", Port: ports.ControllerManagerPort, Path: "/healthz"}, "controller-manager": {Addr: "127.0.0.1", Port: ports.ControllerManagerPort, Path: "/healthz"},
"scheduler": {Addr: "127.0.0.1", Port: ports.SchedulerPort, Path: "/healthz"}, "scheduler": {Addr: "127.0.0.1", Port: ports.SchedulerPort, Path: "/healthz"},
@ -607,12 +607,14 @@ func (m *Master) getServersToValidate(c *Config) map[string]apiserver.Server {
} }
serversToValidate[fmt.Sprintf("etcd-%d", ix)] = apiserver.Server{Addr: addr, Port: port, Path: "/v2/keys/"} serversToValidate[fmt.Sprintf("etcd-%d", ix)] = apiserver.Server{Addr: addr, Port: port, Path: "/v2/keys/"}
} }
nodes, err := m.nodeRegistry.ListMinions(api.NewDefaultContext(), labels.Everything(), fields.Everything()) if includeNodes && m.nodeRegistry != nil {
if err != nil { nodes, err := m.nodeRegistry.ListMinions(api.NewDefaultContext(), labels.Everything(), fields.Everything())
glog.Errorf("Failed to list minions: %v", err) if err != nil {
} glog.Errorf("Failed to list minions: %v", err)
for ix, node := range nodes.Items { }
serversToValidate[fmt.Sprintf("node-%d", ix)] = apiserver.Server{Addr: node.Name, Port: ports.KubeletPort, Path: "/healthz", EnableHTTPS: true} for ix, node := range nodes.Items {
serversToValidate[fmt.Sprintf("node-%d", ix)] = apiserver.Server{Addr: node.Name, Port: ports.KubeletPort, Path: "/healthz", EnableHTTPS: true}
}
} }
return serversToValidate return serversToValidate
} }

13
pkg/master/master_test.go
View File

@ -36,7 +36,7 @@ func TestGetServersToValidate(t *testing.T) {
master.nodeRegistry = registrytest.NewMinionRegistry([]string{"node1", "node2"}, api.NodeResources{}) master.nodeRegistry = registrytest.NewMinionRegistry([]string{"node1", "node2"}, api.NodeResources{})
servers := master.getServersToValidate(&config) servers := master.getServersToValidate(&config, true)
if len(servers) != 7 { if len(servers) != 7 {
t.Errorf("unexpected server list: %#v", servers) t.Errorf("unexpected server list: %#v", servers)
@ -46,4 +46,15 @@ func TestGetServersToValidate(t *testing.T) {
t.Errorf("server list missing: %s", server) t.Errorf("server list missing: %s", server)
} }
} }
servers = master.getServersToValidate(&config, false)
if len(servers) != 5 {
t.Errorf("unexpected server list: %#v", servers)
}
for _, server := range []string{"scheduler", "controller-manager", "etcd-0", "etcd-1", "etcd-2"} {
if _, ok := servers[server]; !ok {
t.Errorf("server list missing: %s", server)
}
}
} }