Remove MXJob from Kueue code (#4077)

kubernetes-sigs · Jan 28, 2025 · 595cf00 · 595cf00
1 parent f955feb
commit 595cf00
Show file tree

Hide file tree

Showing 29 changed files with 18 additions and 2,164 deletions.
diff --git a/apis/config/v1beta1/configuration_types.go b/apis/config/v1beta1/configuration_types.go
@@ -325,7 +325,6 @@ type Integrations struct {
 	//  - "ray.io/rayjob"
 	//  - "ray.io/raycluster"
 	//  - "jobset.x-k8s.io/jobset"
-	//  - "kubeflow.org/mxjob"
 	//  - "kubeflow.org/paddlejob"
 	//  - "kubeflow.org/pytorchjob"
 	//  - "kubeflow.org/tfjob"

diff --git a/charts/kueue/templates/rbac/mxjob_editor_role.yaml b/charts/kueue/templates/rbac/mxjob_editor_role.yaml
diff --git a/charts/kueue/templates/rbac/mxjob_viewer_role.yaml b/charts/kueue/templates/rbac/mxjob_viewer_role.yaml
diff --git a/charts/kueue/templates/rbac/role.yaml b/charts/kueue/templates/rbac/role.yaml
@@ -168,7 +168,6 @@ rules:
       - kubeflow.org
     resources:
       - mpijobs
-      - mxjobs
       - paddlejobs
       - pytorchjobs
       - tfjobs
@@ -183,8 +182,6 @@ rules:
       - kubeflow.org
     resources:
       - mpijobs/finalizers
-      - mxjobs/finalizers
-      - mxjobs/status
       - paddlejobs/finalizers
       - pytorchjobs/finalizers
       - tfjobs/finalizers

diff --git a/charts/kueue/templates/webhook/webhook.yaml b/charts/kueue/templates/webhook/webhook.yaml
@@ -114,25 +114,6 @@ webhooks:
         resources:
           - jobsets
     sideEffects: None
-  - admissionReviewVersions:
-      - v1
-    clientConfig:
-      service:
-        name: '{{ include "kueue.fullname" . }}-webhook-service'
-        namespace: '{{ .Release.Namespace }}'
-        path: /mutate-kubeflow-org-v1-mxjob
-    failurePolicy: Fail
-    name: mmxjob.kb.io
-    rules:
-      - apiGroups:
-          - kubeflow.org
-        apiVersions:
-          - v1
-        operations:
-          - CREATE
-        resources:
-          - mxjobs
-    sideEffects: None
   - admissionReviewVersions:
       - v1
     clientConfig:
@@ -482,26 +463,6 @@ webhooks:
         resources:
           - jobsets
     sideEffects: None
-  - admissionReviewVersions:
-      - v1
-    clientConfig:
-      service:
-        name: '{{ include "kueue.fullname" . }}-webhook-service'
-        namespace: '{{ .Release.Namespace }}'
-        path: /validate-kubeflow-org-v1-mxjob
-    failurePolicy: Fail
-    name: vmxjob.kb.io
-    rules:
-      - apiGroups:
-          - kubeflow.org
-        apiVersions:
-          - v1
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - mxjobs
-    sideEffects: None
   - admissionReviewVersions:
       - v1
     clientConfig:

diff --git a/charts/kueue/values.yaml b/charts/kueue/values.yaml
@@ -103,7 +103,6 @@ managerConfig:
       - "ray.io/rayjob"
       - "ray.io/raycluster"
       - "jobset.x-k8s.io/jobset"
-      - "kubeflow.org/mxjob"
       - "kubeflow.org/paddlejob"
       - "kubeflow.org/pytorchjob"
       - "kubeflow.org/tfjob"

diff --git a/cmd/kueuectl/app/list/list_pods_test.go b/cmd/kueuectl/app/list/list_pods_test.go
@@ -331,51 +331,6 @@ dev-team-b   valid-pod-2   1/1     Running   0          <unknown>
 			args: []string{"--for", "pytorchjob/test-job"},
 			wantOut: `NAME          READY   STATUS    RESTARTS   AGE
 valid-pod-1   1/1     Running   0          <unknown>
-`,
-		}, {
-			name: "list pods for kubeflow.org/MXjob type",
-			job: &kftraining.MXJob{
-				TypeMeta: metav1.TypeMeta{
-					Kind: "MXJob",
-				},
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "test-job",
-					Namespace: metav1.NamespaceDefault,
-					Labels: map[string]string{
-						kftraining.OperatorNameLabel: "mxjob-controller",
-						kftraining.JobNameLabel:      "test-job",
-					},
-				},
-			},
-			pods: []corev1.Pod{
-				{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "valid-pod-1",
-						Namespace: metav1.NamespaceDefault,
-						CreationTimestamp: metav1.Time{
-							Time: testStartTime.Add(-time.Hour).Truncate(time.Second),
-						},
-						Labels: map[string]string{
-							kftraining.OperatorNameLabel: "mxjob-controller",
-							kftraining.JobNameLabel:      "test-job",
-						},
-					},
-				},
-			},
-			mapperGVKs: []schema.GroupVersionKind{
-				{
-					Group:   "kubeflow.org",
-					Version: "v1",
-					Kind:    "MXJob",
-				}, {
-					Group:   "",
-					Version: "v1",
-					Kind:    "Pod",
-				},
-			},
-			args: []string{"--for", "mxjob/test-job"},
-			wantOut: `NAME          READY   STATUS    RESTARTS   AGE
-valid-pod-1   1/1     Running   0          <unknown>
 `,
 		}, {
 			name: "list pods for kubeflow.org/paddlejob type",

diff --git a/config/components/manager/controller_manager_config.yaml b/config/components/manager/controller_manager_config.yaml
@@ -47,7 +47,6 @@ integrations:
   - "ray.io/rayjob"
   - "ray.io/raycluster"
   - "jobset.x-k8s.io/jobset"
-  - "kubeflow.org/mxjob"
   - "kubeflow.org/paddlejob"
   - "kubeflow.org/pytorchjob"
   - "kubeflow.org/tfjob"

diff --git a/config/components/rbac/kustomization.yaml b/config/components/rbac/kustomization.yaml
@@ -39,8 +39,6 @@ resources:
 - jobset_viewer_role.yaml
 - mpijob_editor_role.yaml
 - mpijob_viewer_role.yaml
-- mxjob_editor_role.yaml
-- mxjob_viewer_role.yaml
 - raycluster_editor_role.yaml
 - raycluster_viewer_role.yaml
 - rayjob_editor_role.yaml

diff --git a/config/components/rbac/mxjob_editor_role.yaml b/config/components/rbac/mxjob_editor_role.yaml
diff --git a/config/components/rbac/mxjob_viewer_role.yaml b/config/components/rbac/mxjob_viewer_role.yaml
diff --git a/config/components/rbac/role.yaml b/config/components/rbac/role.yaml
@@ -167,7 +167,6 @@ rules:
   - kubeflow.org
   resources:
   - mpijobs
-  - mxjobs
   - paddlejobs
   - pytorchjobs
   - tfjobs
@@ -182,8 +181,6 @@ rules:
   - kubeflow.org
   resources:
   - mpijobs/finalizers
-  - mxjobs/finalizers
-  - mxjobs/status
   - paddlejobs/finalizers
   - pytorchjobs/finalizers
   - tfjobs/finalizers

diff --git a/config/components/webhook/manifests.yaml b/config/components/webhook/manifests.yaml
@@ -81,25 +81,6 @@ webhooks:
     resources:
     - jobsets
   sideEffects: None
-- admissionReviewVersions:
-  - v1
-  clientConfig:
-    service:
-      name: webhook-service
-      namespace: system
-      path: /mutate-kubeflow-org-v1-mxjob
-  failurePolicy: Fail
-  name: mmxjob.kb.io
-  rules:
-  - apiGroups:
-    - kubeflow.org
-    apiVersions:
-    - v1
-    operations:
-    - CREATE
-    resources:
-    - mxjobs
-  sideEffects: None
 - admissionReviewVersions:
   - v1
   clientConfig:
@@ -416,26 +397,6 @@ webhooks:
     resources:
     - jobsets
   sideEffects: None
-- admissionReviewVersions:
-  - v1
-  clientConfig:
-    service:
-      name: webhook-service
-      namespace: system
-      path: /validate-kubeflow-org-v1-mxjob
-  failurePolicy: Fail
-  name: vmxjob.kb.io
-  rules:
-  - apiGroups:
-    - kubeflow.org
-    apiVersions:
-    - v1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - mxjobs
-  sideEffects: None
 - admissionReviewVersions:
   - v1
   clientConfig:

diff --git a/pkg/controller/jobs/kubeflow/jobs/jobs.go b/pkg/controller/jobs/kubeflow/jobs/jobs.go
@@ -18,7 +18,6 @@ package jobs
 
 // Reference the job framework integration packages to ensure linking.
 import (
-	_ "sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/jobs/mxjob"
 	_ "sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/jobs/paddlejob"
 	_ "sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/jobs/pytorchjob"
 	_ "sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/jobs/tfjob"