From f98dba861142a6c363d50ae4e70a5eb4c944f1a4 Mon Sep 17 00:00:00 2001 From: Dmitry Rakitin Date: Thu, 19 Sep 2024 09:45:58 +0200 Subject: [PATCH] fix(api): add rbac patch for ingress and fix vd reconciliation Add patch rule for ingress Fix vd reconciliation Signed-off-by: Isteb4k --- .../pkg/controller/vd/internal/source/upload.go | 6 +++--- templates/virtualization-controller/rbac-for-us.yaml | 1 + 2 files changed, 4 insertions(+), 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 index 54970eea5..8887b32b2 100644 --- 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 index def0ca00a..987765767 100644 --- 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: