github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5030 from simon3z/nodeinfo

Browse Source 
Add support for fetching node collected information
This commit is contained in:
Brian Grant
2015-03-10 14:05:41 -07:00
parent 25cad2c474 644d775bc1
commit 9aa744925e
15 changed files with 220 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/v1beta1/conversion.go
View File

@@ -699,6 +699,9 @@ func init() {
if err := s.Convert(&in.Status.Addresses, &out.Status.Addresses, 0); err != nil {
return err
}
if err := s.Convert(&in.Status.NodeInfo, &out.Status.NodeInfo, 0); err != nil {
return err
}
for _, address := range in.Status.Addresses {
if address.Type == newer.NodeLegacyHostIP {
@@ -728,6 +731,9 @@ func init() {
if err := s.Convert(&in.Status.Addresses, &out.Status.Addresses, 0); err != nil {
return err
}
if err := s.Convert(&in.Status.NodeInfo, &out.Status.NodeInfo, 0); err != nil {
return err
}
if in.HostIP != "" {
newer.AddToNodeAddresses(&out.Status.Addresses,