github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #82049 from andrewsykim/ga-node-instance-type-label

Browse Source 
Promote Node Instance Type Label to GA
This commit is contained in:
Kubernetes Prow Robot
2019-11-08 13:47:58 -08:00
committed by GitHub
parent 8b123b1f4f 560b8efb79
commit 9cf309ed59
9 changed files with 126 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/kubelet_node_status.go
View File

@@ -154,6 +154,7 @@ func (kl *Kubelet) updateDefaultLabels(initialNode, existingNode *v1.Node) bool
v1.LabelZoneRegionStable,
v1.LabelZoneFailureDomain,
v1.LabelZoneRegion,
v1.LabelInstanceTypeStable,
v1.LabelInstanceType,
v1.LabelOSStable,
v1.LabelArchStable,
@@ -333,6 +334,8 @@ func (kl *Kubelet) initialNode(ctx context.Context) (*v1.Node, error) {
if instanceType != "" {
klog.Infof("Adding node label from cloud provider: %s=%s", v1.LabelInstanceType, instanceType)
node.ObjectMeta.Labels[v1.LabelInstanceType] = instanceType
klog.Infof("Adding node label from cloud provider: %s=%s", v1.LabelInstanceTypeStable, instanceType)
node.ObjectMeta.Labels[v1.LabelInstanceTypeStable] = instanceType
}
// If the cloud has zone information, label the node with the zone information
zones, ok := kl.cloud.Zones()