fix: remove pod labels with potentially incompatible names (#9349)

determined-ai · May 10, 2024 · 1e8f8de · 1e8f8de
1 parent 6995ca6
commit 1e8f8de
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/docs/release-notes/pod-label-bugfix.rst b/docs/release-notes/pod-label-bugfix.rst
@@ -0,0 +1,6 @@
+:orphan:
+
+**Bug Fixes**
+
+-  Kubernetes: Fix an issue introduced in 0.32.0 where workspaces with names incompatible with
+   Kubernetes naming requirements would cause jobs in that workspace to fail.
diff --git a/master/internal/rm/kubernetesrm/spec.go b/master/internal/rm/kubernetesrm/spec.go
@@ -368,12 +368,6 @@ func (p *pod) configurePodSpec(
 	if podSpec.ObjectMeta.Labels == nil {
 		podSpec.ObjectMeta.Labels = make(map[string]string)
 	}
-	if p.submissionInfo.taskSpec.Owner != nil {
-		// Owner label will disappear if Owner is somehow nil.
-		podSpec.ObjectMeta.Labels[userLabel] = p.submissionInfo.taskSpec.Owner.Username
-	}
-	podSpec.ObjectMeta.Labels[workspaceLabel] = p.submissionInfo.taskSpec.Workspace
-	podSpec.ObjectMeta.Labels[resourcePoolLabel] = p.req.ResourcePool
 	podSpec.ObjectMeta.Labels[taskTypeLabel] = string(p.submissionInfo.taskSpec.TaskType)
 	podSpec.ObjectMeta.Labels[taskIDLabel] = p.submissionInfo.taskSpec.TaskID
 	podSpec.ObjectMeta.Labels[containerIDLabel] = p.submissionInfo.taskSpec.ContainerID

diff --git a/master/internal/rm/kubernetesrm/spec_test.go b/master/internal/rm/kubernetesrm/spec_test.go
@@ -246,13 +246,10 @@ func TestDeterminedLabels(t *testing.T) {
 
 	// define expectations
 	expectedLabels := map[string]string{
-		determinedLabel:   taskSpec.AllocationID,
-		userLabel:         taskSpec.Owner.Username,
-		workspaceLabel:    taskSpec.Workspace,
-		resourcePoolLabel: p.req.ResourcePool,
-		taskTypeLabel:     string(taskSpec.TaskType),
-		taskIDLabel:       taskSpec.TaskID,
-		containerIDLabel:  taskSpec.ContainerID,
+		determinedLabel:  taskSpec.AllocationID,
+		taskTypeLabel:    string(taskSpec.TaskType),
+		taskIDLabel:      taskSpec.TaskID,
+		containerIDLabel: taskSpec.ContainerID,
 	}
 	for k, v := range taskSpec.ExtraPodLabels {
 		expectedLabels[labelPrefix+k] = v