Merge pull request #3 from sujoshua/master

fix: 修复deployment创建顺序
CQUPTMirror · Aug 24, 2024 · e747be1 · e747be1
2 parents fd004a3 + a31d69f
commit e747be1
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/internal/controller/job_controller.go b/internal/controller/job_controller.go
@@ -113,11 +113,6 @@ func (r *JobReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
 	}
 
 	if app != nil {
-		err = r.Patch(ctx, app, client.Apply, applyOpts...)
-		if err != nil {
-			return ctrl.Result{}, err
-		}
-
 		err = r.Patch(ctx, svc, client.Apply, applyOpts...)
 		if err != nil {
 			return ctrl.Result{}, err
@@ -135,6 +130,10 @@ func (r *JobReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
 				}
 			}
 		}
+		err = r.Patch(ctx, app, client.Apply, applyOpts...)
+		if err != nil {
+			return ctrl.Result{}, err
+		}
 	} else {
 		deploy := new(appsv1.Deployment)
 		err := r.Get(ctx, client.ObjectKey{Name: job.Name, Namespace: job.Namespace}, deploy)