Fetch the resource before updating it

Signed-off-by: Burak Sekili <[email protected]>

controllers/apidefinition_controller.go

@@ -194,11 +194,20 @@ func (r *ApiDefinitionReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		upstreamRequestStruct.Spec.CollectLoopingTarget()
 
 		//  If this is not set, means it is a new object, set it first
-		if desired.Status.ApiID == "" {
-			return r.create(ctx, upstreamRequestStruct)
+		switch desired.Status.ApiID {
+		case "":
+			err = r.create(ctx, upstreamRequestStruct)
+		default:
+			err = r.update(ctx, upstreamRequestStruct)
 		}
+		if err != nil {
+			return err
+		}
+
+		_ = r.Client.Get(ctx, client.ObjectKeyFromObject(desired), desired) // nolint:errcheck
 
-		return r.update(ctx, upstreamRequestStruct)
+		desired.Spec = upstreamRequestStruct.Spec
+		return nil
 	})
 
 	var transactionInfo *tykv1alpha1.TransactionInfo
@@ -461,11 +470,6 @@ func (r *ApiDefinitionReconciler) create(ctx context.Context, desired *tykv1alph
 			status.ApiID = *desired.Spec.APIID
 			status.LatestTykSpecHash = calculateHash(apiOnTyk)
 			status.LatestCRDSpecHash = calculateHash(desired.Spec)
-			status.LatestTransaction = tykv1alpha1.TransactionInfo{
-				Time:   metav1.Now(),
-				Status: tykv1alpha1.Successful,
-				Error:  "",
-			}
 		},
 	)
 	if err != nil {
@@ -539,11 +543,6 @@ func (r *ApiDefinitionReconciler) update(ctx context.Context, desired *tykv1alph
 		func(status *tykv1alpha1.ApiDefinitionStatus) {
 			status.LatestTykSpecHash = calculateHash(apiOnTyk)
 			status.LatestCRDSpecHash = calculateHash(desired.Spec)
-			status.LatestTransaction = tykv1alpha1.TransactionInfo{
-				Time:   metav1.Now(),
-				Status: tykv1alpha1.Successful,
-				Error:  "",
-			}
 		},
 	)
 	if err != nil {