fix(api): add rbac patch for ingress and fix vd reconciliation

Add patch rule for ingress Fix vd reconciliation Signed-off-by: Isteb4k <dmitry.rakitin@flant.com>
deckhouse · Sep 19, 2024 · f98dba8 · f98dba8
1 parent a435890
commit f98dba8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/source/upload.go b/images/virtualization-artifact/pkg/controller/vd/internal/source/upload.go
@@ -137,8 +137,6 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bo
 
 		return requeue, nil
 	case !common.IsPodComplete(pod):
-		log.Info("Provisioning to DVCR is in progress", "podPhase", pod.Status.Phase)
-
 		err = ds.statService.CheckPod(pod)
 		if err != nil {
 			vd.Status.Phase = virtv2.DiskFailed
@@ -167,9 +165,11 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bo
 			condition.Reason = vdcondition.WaitForUserUpload
 			condition.Message = "Waiting for the user upload."
 
-			return false, nil
+			return true, nil
 		}
 
+		log.Info("Provisioning to DVCR is in progress", "podPhase", pod.Status.Phase)
+
 		vd.Status.Phase = virtv2.DiskProvisioning
 		condition.Status = metav1.ConditionFalse
 		condition.Reason = vdcondition.Provisioning

diff --git a/templates/virtualization-controller/rbac-for-us.yaml b/templates/virtualization-controller/rbac-for-us.yaml
@@ -40,6 +40,7 @@ rules:
   - delete
   - list
   - watch
+  - patch
 - apiGroups:
   - ""
   resources: