Merge pull request #2617 from losipiuk/lo/templates-fixes

Set stable OS and Arch labels based on GCE template
kubernetes · Dec 6, 2019 · f5cf06f · f5cf06f
2 parents 6940f47 + 9492283
commit f5cf06f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/cluster-autoscaler/cloudprovider/gce/templates.go b/cluster-autoscaler/cloudprovider/gce/templates.go
@@ -177,7 +177,9 @@ func BuildGenericLabels(ref GceRef, machineType string, nodeName string) (map[st
 
 	// TODO: extract it somehow
 	result[kubeletapis.LabelArch] = cloudprovider.DefaultArch
+	result[apiv1.LabelArchStable] = cloudprovider.DefaultArch
 	result[kubeletapis.LabelOS] = cloudprovider.DefaultOS
+	result[apiv1.LabelOSStable] = cloudprovider.DefaultOS
 
 	result[apiv1.LabelInstanceType] = machineType
 	ix := strings.LastIndex(ref.Zone, "-")

diff --git a/cluster-autoscaler/cloudprovider/gce/templates_test.go b/cluster-autoscaler/cloudprovider/gce/templates_test.go
@@ -127,18 +127,23 @@ func TestBuildNodeFromTemplateSetsResources(t *testing.T) {
 }
 
 func TestBuildGenericLabels(t *testing.T) {
+	expectedLabels := map[string]string{
+		apiv1.LabelZoneRegion:        "us-central1",
+		apiv1.LabelZoneFailureDomain: "us-central1-b",
+		apiv1.LabelHostname:          "sillyname",
+		apiv1.LabelInstanceType:      "n1-standard-8",
+		kubeletapis.LabelArch:        cloudprovider.DefaultArch,
+		kubeletapis.LabelOS:          cloudprovider.DefaultOS,
+		apiv1.LabelArchStable:        cloudprovider.DefaultArch,
+		apiv1.LabelOSStable:          cloudprovider.DefaultOS,
+	}
 	labels, err := BuildGenericLabels(GceRef{
 		Name:    "kubernetes-minion-group",
 		Project: "mwielgus-proj",
 		Zone:    "us-central1-b"},
 		"n1-standard-8", "sillyname")
-	assert.Nil(t, err)
-	assert.Equal(t, "us-central1", labels[apiv1.LabelZoneRegion])
-	assert.Equal(t, "us-central1-b", labels[apiv1.LabelZoneFailureDomain])
-	assert.Equal(t, "sillyname", labels[apiv1.LabelHostname])
-	assert.Equal(t, "n1-standard-8", labels[apiv1.LabelInstanceType])
-	assert.Equal(t, cloudprovider.DefaultArch, labels[kubeletapis.LabelArch])
-	assert.Equal(t, cloudprovider.DefaultOS, labels[kubeletapis.LabelOS])
+	assert.NoError(t, err)
+	assert.Equal(t, expectedLabels, labels)
 }
 
 func TestCalculateAllocatable(t *testing.T) {