Skip to content

Commit 4f13cab

Browse files
committed
Fixes based on code review
change last character in extended resources prefix to be `.` instead of `-`. Add a warning if the extended resource already exists.
1 parent ad6d6c9 commit 4f13cab

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

cluster-autoscaler/cloudprovider/gce/templates.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,10 +457,13 @@ func extractExtendedResourcesFromKubeEnv(kubeEnv KubeEnv) (apiv1.ResourceList, e
457457
if err != nil {
458458
return apiv1.ResourceList{}, err
459459
}
460-
const extendedResourcesKeyPrefix = "clusterautoscaler-nodetemplate-resources-"
460+
const extendedResourcesKeyPrefix = "clusterautoscaler-nodetemplate-resources."
461461
for key, value := range nodeLabelsMap {
462462
if strings.HasPrefix(key, extendedResourcesKeyPrefix) {
463463
key = strings.TrimPrefix(key, extendedResourcesKeyPrefix)
464+
if _, existsBefore := extendedResourcesMap[key]; existsBefore {
465+
klog.Warningf("extended resource %s defined twice in template", key)
466+
}
464467
extendedResourcesMap[key] = value
465468
}
466469
}

cluster-autoscaler/cloudprovider/gce/templates_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1306,7 +1306,7 @@ func TestExtractExtendedResourcesFromKubeEnv(t *testing.T) {
13061306
},
13071307
{
13081308
name: "two valid values one of them defined in node labels",
1309-
kubeEnvValue: "AUTOSCALER_ENV_VARS: node_labels=a=b,c=d,clusterautoscaler-nodetemplate-resources-test.co/test-resource=3,cloud.google.com/gke-nodepool=pool-3,cloud.google.com/gke-preemptible=true;" +
1309+
kubeEnvValue: "AUTOSCALER_ENV_VARS: node_labels=a=b,c=d,clusterautoscaler-nodetemplate-resources.test.co/test-resource=3,cloud.google.com/gke-nodepool=pool-3,cloud.google.com/gke-preemptible=true;" +
13101310
"node_taints='dedicated=ml:NoSchedule,test=dev:PreferNoSchedule,a=b:c';" +
13111311
"kube_reserved=cpu=1000m,memory=300000Mi;" +
13121312
"extended_resources=foo=bar,baz=10G",

0 commit comments

Comments
 (0)