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.
kubernetes · Feb 12, 2025 · 4f13cab · 4f13cab
1 parent ad6d6c9
commit 4f13cab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/cluster-autoscaler/cloudprovider/gce/templates.go b/cluster-autoscaler/cloudprovider/gce/templates.go
@@ -457,10 +457,13 @@ func extractExtendedResourcesFromKubeEnv(kubeEnv KubeEnv) (apiv1.ResourceList, e
 		if err != nil {
 			return apiv1.ResourceList{}, err
 		}
-		const extendedResourcesKeyPrefix = "clusterautoscaler-nodetemplate-resources-"
+		const extendedResourcesKeyPrefix = "clusterautoscaler-nodetemplate-resources."
 		for key, value := range nodeLabelsMap {
 			if strings.HasPrefix(key, extendedResourcesKeyPrefix) {
 				key = strings.TrimPrefix(key, extendedResourcesKeyPrefix)
+				if _, existsBefore := extendedResourcesMap[key]; existsBefore {
+					klog.Warningf("extended resource %s defined twice in template", key)
+				}
 				extendedResourcesMap[key] = value
 			}
 		}

diff --git a/cluster-autoscaler/cloudprovider/gce/templates_test.go b/cluster-autoscaler/cloudprovider/gce/templates_test.go
@@ -1306,7 +1306,7 @@ func TestExtractExtendedResourcesFromKubeEnv(t *testing.T) {
 		},
 		{
 			name: "two valid values one of them defined in node labels",
-			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;" +
+			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;" +
 				"node_taints='dedicated=ml:NoSchedule,test=dev:PreferNoSchedule,a=b:c';" +
 				"kube_reserved=cpu=1000m,memory=300000Mi;" +
 				"extended_resources=foo=bar,baz=10G",