Skip to content
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

fix reconcile failed when update mpijob. #3

Merged
merged 1 commit into from
Sep 5, 2023
Merged

fix reconcile failed when update mpijob. #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 4 additions & 11 deletions pkg/controllers/mpi_job_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ import (
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
metav1unstructured "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
pruntime "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/wait"
appsinformers "k8s.io/client-go/informers/apps/v1"
Expand Down Expand Up @@ -186,7 +184,7 @@ func NewMPIJobController(
mpiJobInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
AddFunc: controller.enqueueMPIJob,
UpdateFunc: func(old, new interface{}) {
job, err := MPIJobFromUnstructured(old)
job, err := MPIJobFromObject(old)
if err != nil {
return
}
Expand Down Expand Up @@ -1143,16 +1141,11 @@ func newLauncher(mpiJob *kubeflow.MPIJob, kubectlDeliveryImage string) *batchv1.
}
}

func MPIJobFromUnstructured(obj interface{}) (*kubeflow.MPIJob, error) {
un, ok := obj.(*metav1unstructured.Unstructured)
func MPIJobFromObject(obj interface{}) (*kubeflow.MPIJob, error) {
job, ok := obj.(*kubeflow.MPIJob)
if !ok {
return nil, fmt.Errorf("failed to get MPIJob from key")
}
var job kubeflow.MPIJob
err := pruntime.DefaultUnstructuredConverter.FromUnstructured(un.Object, &job)
if err != nil {
return nil, fmt.Errorf("failed to marshal the object to MPIJob")
}

return &job, nil
return job, nil
}