Merge pull request kubernetes#4973 from olagacek/master

Handle gracefully empty arch in kube env.
navinjoy · Jun 15, 2022 · d2c950d · d2c950d
2 parents de77005 + 02b3904
commit d2c950d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/cluster-autoscaler/cloudprovider/gce/templates.go b/cluster-autoscaler/cloudprovider/gce/templates.go
@@ -599,7 +599,7 @@ func ToSystemArchitecture(arch string) SystemArchitecture {
 	case string(Amd64):
 		return Amd64
 	default:
-		return UnknownArch
+		return DefaultArch
 	}
 }
 

diff --git a/cluster-autoscaler/cloudprovider/gce/templates_test.go b/cluster-autoscaler/cloudprovider/gce/templates_test.go
@@ -170,6 +170,15 @@ func TestBuildNodeFromTemplateSetsResources(t *testing.T) {
 			attachedLocalSSDCount:         4,
 			expectedErr:                   false,
 		},
+		{
+			scenario:                      "handle empty arch gracefully",
+			kubeEnv:                       "AUTOSCALER_ENV_VARS: os_distribution=cos;arch=;os=linux;ephemeral_storage_local_ssd_count=2\n",
+			physicalCpu:                   8,
+			physicalMemory:                200 * units.MiB,
+			ephemeralStorageLocalSSDCount: 2,
+			attachedLocalSSDCount:         4,
+			expectedErr:                   false,
+		},
 		{
 			scenario:                      "ephemeral storage on local SSDs with kube-reserved",
 			kubeEnv:                       "AUTOSCALER_ENV_VARS: kube_reserved=cpu=0,memory=0,ephemeral-storage=10Gi;os_distribution=cos;os=linux;ephemeral_storage_local_ssd_count=2\n",