From 51349a16d2dee2958a6ede1f92e438e95384b905 Mon Sep 17 00:00:00 2001 From: Haim Kortovich Date: Tue, 19 Nov 2024 15:01:05 -0500 Subject: [PATCH] do not replace initjob [ZITADOPER-7] --- .../controller/zitadelcluster_controller.go | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/src/internal/controller/zitadelcluster_controller.go b/src/internal/controller/zitadelcluster_controller.go index 8c548f7..a8076c4 100644 --- a/src/internal/controller/zitadelcluster_controller.go +++ b/src/internal/controller/zitadelcluster_controller.go @@ -296,38 +296,6 @@ func (r *ZitadelClusterReconciler) reconcileInitJob(ctx context.Context, zitadel } return ctrl.Result{}, nil } - - // Compare the image in the existing job with the desired image - existingImage := existingJob.Spec.Template.Spec.Containers[0].Image - desiredImage := desiredInitJob.Spec.Template.Spec.Containers[0].Image - - // If the images don't match, delete the existing job and wait for deletion - if existingImage != desiredImage { - if err := r.Delete(ctx, &existingJob); err != nil { - return ctrl.Result{}, fmt.Errorf("error deleting existing InitJob: %v", err) - } - - // Wait for the job to be fully deleted before creating a new one - for { - err := r.Get(ctx, key, &existingJob) - if errors.IsNotFound(err) { - break // Job has been deleted, we can proceed - } - if err != nil { - return ctrl.Result{}, fmt.Errorf("error checking if InitJob is deleted: %v", err) - } - // Sleep for a short interval to avoid tight loop - time.Sleep(1 * time.Second) - } - - // Now create the new InitJob - if err := r.Create(ctx, desiredInitJob); err != nil { - return ctrl.Result{}, fmt.Errorf("error creating new InitJob: %v", err) - } - return ctrl.Result{}, nil - } - - // If the job exists and the image matches, no action is needed return ctrl.Result{}, nil }