kubernetes
/
autoscaler
mirror of https://github.com/kubernetes/autoscaler.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3787 from yaroslava-serdiuk/cluster-autoscaler-release-1.17 

Cherry-pick #3722: update generic labels for GCE
This commit is contained in:
Kubernetes Prow Robot 2020-12-30 00:43:49 -08:00 committed by GitHub
parent a62e3bd0da 2a2c575a4d
commit 873ad55d8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster-autoscaler/cloudprovider/gce/templates.go
View File

@ -37,6 +37,10 @@ import (
// GceTemplateBuilder builds templates for GCE nodes. // GceTemplateBuilder builds templates for GCE nodes.
type GceTemplateBuilder struct{} type GceTemplateBuilder struct{}
// TODO: This should be imported from sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common/constants.go
// This key is applicable to both GCE and GKE
const gceCSITopologyKeyZone = "topology.gke.io/zone"
func (t *GceTemplateBuilder) getAcceleratorCount(accelerators []*gce.AcceleratorConfig) int64 { func (t *GceTemplateBuilder) getAcceleratorCount(accelerators []*gce.AcceleratorConfig) int64 {
count := int64(0) count := int64(0)
for _, accelerator := range accelerators { for _, accelerator := range accelerators {
@ -180,12 +184,16 @@ func BuildGenericLabels(ref GceRef, machineType string, nodeName string) (map[st
result[kubeletapis.LabelOS] = cloudprovider.DefaultOS result[kubeletapis.LabelOS] = cloudprovider.DefaultOS
result[apiv1.LabelInstanceType] = machineType result[apiv1.LabelInstanceType] = machineType
result[apiv1.LabelInstanceTypeStable] = machineType
ix := strings.LastIndex(ref.Zone, "-") ix := strings.LastIndex(ref.Zone, "-")
if ix == -1 { if ix == -1 {
return nil, fmt.Errorf("unexpected zone: %s", ref.Zone) return nil, fmt.Errorf("unexpected zone: %s", ref.Zone)
} }
result[apiv1.LabelZoneRegion] = ref.Zone[:ix] result[apiv1.LabelZoneRegion] = ref.Zone[:ix]
result[apiv1.LabelZoneRegionStable] = ref.Zone[:ix]
result[apiv1.LabelZoneFailureDomain] = ref.Zone result[apiv1.LabelZoneFailureDomain] = ref.Zone
result[apiv1.LabelZoneFailureDomainStable] = ref.Zone
result[gceCSITopologyKeyZone] = ref.Zone
result[apiv1.LabelHostname] = nodeName result[apiv1.LabelHostname] = nodeName
return result, nil return result, nil
} }

3
cluster-autoscaler/cloudprovider/gce/templates_test.go
View File

@ -134,7 +134,10 @@ func TestBuildGenericLabels(t *testing.T) {
"n1-standard-8", "sillyname") "n1-standard-8", "sillyname")
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, "us-central1", labels[apiv1.LabelZoneRegion]) assert.Equal(t, "us-central1", labels[apiv1.LabelZoneRegion])
assert.Equal(t, "us-central1", labels[apiv1.LabelZoneRegionStable])
assert.Equal(t, "us-central1-b", labels[apiv1.LabelZoneFailureDomain]) assert.Equal(t, "us-central1-b", labels[apiv1.LabelZoneFailureDomain])
assert.Equal(t, "us-central1-b", labels[apiv1.LabelZoneFailureDomainStable])
assert.Equal(t, "us-central1-b", labels[gceCSITopologyKeyZone])
assert.Equal(t, "sillyname", labels[apiv1.LabelHostname]) assert.Equal(t, "sillyname", labels[apiv1.LabelHostname])
assert.Equal(t, "n1-standard-8", labels[apiv1.LabelInstanceType]) assert.Equal(t, "n1-standard-8", labels[apiv1.LabelInstanceType])
assert.Equal(t, cloudprovider.DefaultArch, labels[kubeletapis.LabelArch]) assert.Equal(t, cloudprovider.DefaultArch, labels[kubeletapis.LabelArch])