Skip to content

cleanup(gke): remove redundant switch in GenerateGKENodeSelectorLabel #5846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kadupoornima merged 2 commits into from
Jun 26, 2026
+45 −7
Merged

cleanup(gke): remove redundant switch in GenerateGKENodeSelectorLabel #5846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
306be7e
refactor(gke): remove redundant switch in GenerateGKENodeSelectorLabel
kadupoornima Jun 24, 2026
2341ac5
comment
kadupoornima Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions pkg/orchestrator/gke/gke_job_orchestrator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,7 +1141,6 @@ func (g *GKEOrchestrator) generateAndApplyManifest(opts ManifestOptions, profile
return g.ApplyManifest(gkeManifestContent, outputManifestPath, opts.WorkloadName)
}

// TODO Use a map
var machineFamilyToLabelMap = map[string]string{
"g2-standard": "nvidia-l4",
"a3-highgpu": "nvidia-h100-80gb",
Expand Down Expand Up @@ -1170,12 +1169,6 @@ var machineFamilyToLabelMap = map[string]string{
func (g *GKEOrchestrator) GenerateGKENodeSelectorLabel(acceleratorType string) string {
resolvedLower := strings.ToLower(acceleratorType)

// Fallback for direct values
switch resolvedLower {
case "nvidia-tesla-a100", "tpu-v4-podslice", "tpu-v6e-slice", "tpu-v5p-slice", "tpu-v5-lite-podslice":
return acceleratorType
}

parts := strings.Split(resolvedLower, "-")

// Try matching first two parts (e.g., "g2-standard")
Expand Down
45 changes: 45 additions & 0 deletions pkg/orchestrator/gke/gke_job_orchestrator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2259,3 +2259,48 @@ func TestPopulateNAPFlavors(t *testing.T) {
})
}
}

func TestGenerateGKENodeSelectorLabel(t *testing.T) {
orc := &GKEOrchestrator{}
tests := []struct {
input string
want string
}{
// Mapped families (2 parts)
{"g2-standard-48", "nvidia-l4"},
{"a3-highgpu-8g", "nvidia-h100-80gb"},
{"a2-highgpu-1g", "nvidia-tesla-a100"},
{"g4-standard-4", "nvidia-rtx-pro-6000"},
{"ct6e-standard-8t", "tpu-v6e-slice"},

// Mapped families (1 part)
{"v6e-standard", "tpu-v6e-slice"},
{"v5litepod-slice", "tpu-v5-lite-podslice"},
{"v4-podslice", "tpu-v4-podslice"},
{"l4-standard", "nvidia-l4"},

// Old switch fallbacks (unmapped directly, but should return as is)
{"nvidia-tesla-a100", "nvidia-tesla-a100"},
{"tpu-v4-podslice", "tpu-v4-podslice"},
{"tpu-v6e-slice", "tpu-v6e-slice"},
{"tpu-v5p-slice", "tpu-v5p-slice"},
{"tpu-v5-lite-podslice", "tpu-v5-lite-podslice"},

// Unmapped values
{"unknown-accelerator", "unknown-accelerator"},
{"h100", "h100"},

// Case insensitivity
{"G2-STANDARD-48", "nvidia-l4"},
{"NVIDIA-TESLA-A100", "NVIDIA-TESLA-A100"},
}

for _, tc := range tests {
t.Run(tc.input, func(t *testing.T) {
got := orc.GenerateGKENodeSelectorLabel(tc.input)
if got != tc.want {
t.Errorf("GenerateGKENodeSelectorLabel(%q) = %q, want %q", tc.input, got, tc.want)
}
})
}
}
Loading