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

Remove nodeinfo endpoint from kubelet

Browse Source
This commit is contained in:
Deyuan Deng 2015-04-10 15:47:32 -04:00
parent 8dfd7001f5
commit 868e05ce96
8 changed files with 0 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/integration/integration.go
View File

@ -103,10 +103,6 @@ func (fakeKubeletClient) GetPodStatus(host, podNamespace, podName string) (api.P
return r, nil
}
func (fakeKubeletClient) GetNodeInfo(host string) (api.NodeInfo, error) {
return api.NodeInfo{}, nil
}
func (fakeKubeletClient) GetConnectionInfo(host string) (string, uint, http.RoundTripper, error) {
return "", 0, nil, errors.New("Not Implemented")
}

2
pkg/api/register.go
View File

@ -34,7 +34,6 @@ func init() {
&Service{},
&NodeList{},
&Node{},
&NodeInfo{},
&Status{},
&Endpoints{},
&EndpointsList{},
@ -75,7 +74,6 @@ func (*ServiceList) IsAnAPIObject() {}
func (*Endpoints) IsAnAPIObject() {}
func (*EndpointsList) IsAnAPIObject() {}
func (*Node) IsAnAPIObject() {}
func (*NodeInfo) IsAnAPIObject() {}
func (*NodeList) IsAnAPIObject() {}
func (*Binding) IsAnAPIObject() {}
func (*Status) IsAnAPIObject() {}

9
pkg/api/types.go
View File

@ -1079,15 +1079,6 @@ type NodeStatus struct {
NodeInfo NodeSystemInfo `json:"nodeInfo,omitempty"`
}
// NodeInfo is the information collected on the node.
type NodeInfo struct {
TypeMeta `json:",inline"`
// Capacity represents the available resources of a node
Capacity ResourceList `json:"capacity,omitempty"`
// NodeSystemInfo is a set of ids/uuids to uniquely identify the node
NodeSystemInfo `json:",inline,omitempty"`
}
type NodePhase string
// These are the valid phases of node.

2
pkg/api/v1beta3/register.go
View File

@ -38,7 +38,6 @@ func init() {
&Endpoints{},
&EndpointsList{},
&Node{},
&NodeInfo{},
&NodeList{},
&Binding{},
&Status{},
@ -78,7 +77,6 @@ func (*ServiceList) IsAnAPIObject() {}
func (*Endpoints) IsAnAPIObject() {}
func (*EndpointsList) IsAnAPIObject() {}
func (*Node) IsAnAPIObject() {}
func (*NodeInfo) IsAnAPIObject() {}
func (*NodeList) IsAnAPIObject() {}
func (*Binding) IsAnAPIObject() {}
func (*Status) IsAnAPIObject() {}

9
pkg/api/v1beta3/types.go
View File

@ -1073,15 +1073,6 @@ type NodeStatus struct {
NodeInfo NodeSystemInfo `json:"nodeInfo,omitempty"`
}
// NodeInfo is the information collected on the node.
type NodeInfo struct {
TypeMeta `json:",inline"`
// Capacity represents the available resources of a node
Capacity ResourceList `json:"capacity,omitempty"`
// NodeSystemInfo is a set of ids/uuids to uniquely identify the node
NodeSystemInfo `json:",inline,omitempty"`
}
type NodePhase string
// These are the valid phases of node.

17
pkg/client/kubelet.go
View File

@ -39,7 +39,6 @@ var ErrPodInfoNotAvailable = errors.New("no pod info available")
type KubeletClient interface {
KubeletHealthChecker
PodInfoGetter
NodeInfoGetter
ConnectionInfoGetter
}
@ -56,10 +55,6 @@ type PodInfoGetter interface {
GetPodStatus(host, podNamespace, podID string) (api.PodStatusResult, error)
}
type NodeInfoGetter interface {
GetNodeInfo(host string) (api.NodeInfo, error)
}
type ConnectionInfoGetter interface {
GetConnectionInfo(host string) (scheme string, port uint, transport http.RoundTripper, error error)
}
@ -136,13 +131,6 @@ func (c *HTTPKubeletClient) GetPodStatus(host, podNamespace, podID string) (api.
return status, err
}
// GetNodeInfo gets information about the specified node.
func (c *HTTPKubeletClient) GetNodeInfo(host string) (api.NodeInfo, error) {
info := api.NodeInfo{}
_, err := c.getEntity(host, "/api/v1beta1/nodeInfo", "", &info)
return info, err
}
// getEntity might return a nil response.
func (c *HTTPKubeletClient) getEntity(host, path, query string, entity runtime.Object) (*http.Response, error) {
request, err := http.NewRequest("GET", c.url(host, path, query), nil)
@ -179,11 +167,6 @@ func (c FakeKubeletClient) GetPodStatus(host, podNamespace string, podID string)
return api.PodStatusResult{}, errors.New("Not Implemented")
}
// GetNodeInfo is a fake implementation of PodInfoGetter.GetNodeInfo
func (c FakeKubeletClient) GetNodeInfo(host string) (api.NodeInfo, error) {
return api.NodeInfo{}, errors.New("Not Implemented")
}
func (c FakeKubeletClient) HealthCheck(host string) (probe.Result, error) {
return probe.Unknown, errors.New("Not Implemented")
}

4
pkg/cloudprovider/controller/nodecontroller_test.go
View File

@ -146,10 +146,6 @@ func (c *FakeKubeletClient) GetPodStatus(host, podNamespace, podID string) (api.
return api.PodStatusResult{}, errors.New("Not Implemented")
}
func (c *FakeKubeletClient) GetNodeInfo(host string) (api.NodeInfo, error) {
return api.NodeInfo{}, errors.New("Not Implemented")
}
func (c *FakeKubeletClient) GetConnectionInfo(host string) (string, uint, http.RoundTripper, error) {
return "", 0, nil, errors.New("Not Implemented")
}

26
pkg/kubelet/server.go
View File

@ -136,7 +136,6 @@ func (s *Server) InstallDefaultHandlers() {
)
s.mux.HandleFunc("/podInfo", s.handlePodInfoOld)
s.mux.HandleFunc("/api/v1beta1/podInfo", s.handlePodInfoVersioned)
s.mux.HandleFunc("/api/v1beta1/nodeInfo", s.handleNodeInfoVersioned)
s.mux.HandleFunc("/pods", s.handlePods)
s.mux.HandleFunc("/stats/", s.handleStats)
s.mux.HandleFunc("/spec/", s.handleSpec)
@ -346,31 +345,6 @@ func (s *Server) handleLogs(w http.ResponseWriter, req *http.Request) {
s.host.ServeLogs(w, req)
}
// handleNodeInfoVersioned handles node info requests against the Kubelet.
func (s *Server) handleNodeInfoVersioned(w http.ResponseWriter, req *http.Request) {
info, err := s.host.GetCachedMachineInfo()
if err != nil {
s.error(w, err)
return
}
capacity := CapacityFromMachineInfo(info)
data, err := json.Marshal(api.NodeInfo{
Capacity: capacity,
NodeSystemInfo: api.NodeSystemInfo{
MachineID: info.MachineID,
SystemUUID: info.SystemUUID,
BootID: info.BootID,
},
})
if err != nil {
s.error(w, err)
return
}
w.Header().Add("Content-type", "application/json")
w.Write(data)
}
// handleSpec handles spec requests against the Kubelet.
func (s *Server) handleSpec(w http.ResponseWriter, req *http.Request) {
info, err := s.host.GetCachedMachineInfo()