scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-12-15 20:37:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7775 from simon3z/cloud-provider-id

Browse Source 
api: add the ProviderID attribute to NodeSpec
This commit is contained in:
Tim Hockin
2015-05-28 15:54:00 -07:00
parent 081ab3abac 1a41082ca8
commit 32bb3ae8f1
26 changed files with 200 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -888,6 +888,7 @@ func addConversionFuncs() {
}
out.PodCIDR = in.Spec.PodCIDR
out.ExternalID = in.Spec.ExternalID
out.ProviderID = in.Spec.ProviderID
out.Unschedulable = in.Spec.Unschedulable
return s.Convert(&in.Status.Capacity, &out.NodeResources.Capacity, 0)
},
@@ -920,6 +921,7 @@ func addConversionFuncs() {
}
out.Spec.PodCIDR = in.PodCIDR
out.Spec.ExternalID = in.ExternalID
out.Spec.ProviderID = in.ProviderID
out.Spec.Unschedulable = in.Unschedulable
return s.Convert(&in.NodeResources.Capacity, &out.Status.Capacity, 0)
},