Skip to content

Commit

Permalink
[release-v1.57] DataVolume Controller uses VolumeCloneSource Populator (
Browse files Browse the repository at this point in the history 
#2783)

* remove CSI clone

bye bye

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>

* no more smart clone

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>

* PVC clone same namespace

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>

* cross namespace pvc clone

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>

* various fixes to get some functional tests to work

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>

* delete smart clone controller again

somehow reappeared after rebase

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>

* mostly pvc clone functional test fixes

make sure size detect pod only runs on kubevirt content type

clone populator was skipping last round op applying pvc' annotations

various func test fixes

review comments

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>

* more various test fixes

host clone phase should (implicitly) wait for clone source pod to exit

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>

* remove "smart" clone from snapshot

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>

* DataVolume clone from snapshot uses populator

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>

* improve clone populator/datavolume coordination on "running" condition

For host clone, not much changes, values still comming from annotations on host clone PVC

For smart/csi clone the DataVolume will be "running" if not in pending or error phase

Will have the same values for terminal "completed" state regardless of clone type

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>

* unit tests for pvc/snapshot clone controllers

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>

* remove skipped test added in #2759

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>

* attempt address AfterSuite and generate-verify failures

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>

* handle snapshot clone with no target size specified

also add more validation to some snapshot clone tests

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>

* remove Patch calls

Using the controller runtime Patch API with controller runtime cached client seems to be a pretty bad fit

At least given the way the CR API is designed where an old object is compared to new.

I like patch in theory though and will revisit

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>

* Clone populator should plan and execute even if PVC is bound

It was possible to miss "preallocation applied" annotation otherwise

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>

* add long term token to datavolume

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>

* Rename ProgressReporter to StatusReporter

Should have been done back when annotations were addded to "progress"

Also, if pvc is bound do not call phase Reconcile functions only Status

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>

---------

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>
Co-authored-by: Michael Henriksen <mhenriks@redhat.com>
  • Loading branch information
@kubevirt-bot @mhenriks
kubevirt-bot and mhenriks committed Jun 30, 2023
1 parent c6429e3 commit b80ff58
Show file tree
Hide file tree
Showing 39 changed files with 1,803 additions and 3,015 deletions.
2 changes: 1 addition & 1 deletion cmd/cdi-controller/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ func start() {
klog.Errorf("Unable to setup upload populator: %v", err)
os.Exit(1)
}
if _, err := populators.NewClonePopulator(ctx, mgr, log, clonerImage, pullPolicy, installerLabels); err != nil {
if _, err := populators.NewClonePopulator(ctx, mgr, log, clonerImage, pullPolicy, installerLabels, getTokenPublicKey()); err != nil {
klog.Errorf("Unable to setup clone populator: %v", err)
os.Exit(1)
}
Expand Down
1 change: 0 additions & 1 deletion pkg/controller/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ go_library(
"//pkg/monitoring:go_default_library",
"//pkg/operator:go_default_library",
"//pkg/storagecapabilities:go_default_library",
"//pkg/token:go_default_library",
"//pkg/util:go_default_library",
"//pkg/util/cert:go_default_library",
"//pkg/util/cert/fetcher:go_default_library",
Expand Down
24 changes: 8 additions & 16 deletions pkg/controller/clone-controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ import (
cdiv1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
"kubevirt.io/containerized-data-importer/pkg/common"
cc "kubevirt.io/containerized-data-importer/pkg/controller/common"
"kubevirt.io/containerized-data-importer/pkg/token"
"kubevirt.io/containerized-data-importer/pkg/util"
"kubevirt.io/containerized-data-importer/pkg/util/cert/fetcher"
"kubevirt.io/containerized-data-importer/pkg/util/cert/generator"
Expand Down Expand Up @@ -67,8 +66,7 @@ type CloneReconciler struct {
clientCertGenerator generator.CertGenerator
serverCAFetcher fetcher.CertBundleFetcher
log logr.Logger
longTokenValidator token.Validator
shortTokenValidator token.Validator
multiTokenValidator *cc.MultiTokenValidator
image string
verbose string
pullPolicy string
Expand All @@ -88,8 +86,7 @@ func NewCloneController(mgr manager.Manager,
client: mgr.GetClient(),
scheme: mgr.GetScheme(),
log: log.WithName("clone-controller"),
shortTokenValidator: cc.NewCloneTokenValidator(common.CloneTokenIssuer, apiServerKey),
longTokenValidator: cc.NewCloneTokenValidator(common.ExtendedCloneTokenIssuer, apiServerKey),
multiTokenValidator: cc.NewMultiTokenValidator(apiServerKey),
image: image,
verbose: verbose,
pullPolicy: pullPolicy,
Expand Down Expand Up @@ -249,10 +246,14 @@ func (r *CloneReconciler) reconcileSourcePod(ctx context.Context, sourcePod *cor
}

if len(pods) > 0 {
es, err := cc.GetAnnotatedEventSource(ctx, r.client, targetPvc)
if err != nil {
return 0, err
}
for _, pod := range pods {
r.log.V(1).Info("can't create clone source pod, pvc in use by other pod",
"namespace", sourcePvc.Namespace, "name", sourcePvc.Name, "pod", pod.Name)
r.recorder.Eventf(targetPvc, corev1.EventTypeWarning, cc.CloneSourceInUse,
r.recorder.Eventf(es, corev1.EventTypeWarning, cc.CloneSourceInUse,
"pod %s/%s using PersistentVolumeClaim %s", pod.Namespace, pod.Name, sourcePvc.Name)
}
return 2 * time.Second, nil
Expand Down Expand Up @@ -406,16 +407,7 @@ func (r *CloneReconciler) findCloneSourcePod(pvc *corev1.PersistentVolumeClaim)
}

func (r *CloneReconciler) validateSourceAndTarget(ctx context.Context, sourcePvc, targetPvc *corev1.PersistentVolumeClaim) error {
// first check for extended token
v := r.longTokenValidator
tok, ok := targetPvc.Annotations[cc.AnnExtendedCloneToken]
if !ok {
// if token doesn't exist, no prob for same namespace
tok = targetPvc.Annotations[cc.AnnCloneToken]
v = r.shortTokenValidator
}

if err := cc.ValidateCloneTokenPVC(tok, v, sourcePvc, targetPvc); err != nil {
if err := r.multiTokenValidator.ValidatePVC(sourcePvc, targetPvc); err != nil {
return err
}
contentType, err := ValidateCanCloneSourceAndTargetContentType(sourcePvc, targetPvc)
Expand Down
86 changes: 44 additions & 42 deletions pkg/controller/clone-controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,11 @@ var _ = Describe("Clone controller reconcile loop", func() {
AnnUploadClientName: "uploadclient"}, nil)
reconciler = createCloneReconciler(testPvc, cc.CreatePvc("source", "default", map[string]string{}, nil))
By("Setting up the match token")
reconciler.shortTokenValidator.(*cc.FakeValidator).Match = "foobaz"
reconciler.shortTokenValidator.(*cc.FakeValidator).Name = "source"
reconciler.shortTokenValidator.(*cc.FakeValidator).Namespace = "default"
reconciler.shortTokenValidator.(*cc.FakeValidator).Params["targetNamespace"] = "default"
reconciler.shortTokenValidator.(*cc.FakeValidator).Params["targetName"] = "testPvc1"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Match = "foobaz"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Name = "source"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Namespace = "default"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Params["targetNamespace"] = "default"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Params["targetName"] = "testPvc1"
By("Verifying no source pod exists")
sourcePod, err := reconciler.findCloneSourcePod(testPvc)
Expect(sourcePod).To(BeNil())
Expand Down Expand Up @@ -147,11 +147,11 @@ var _ = Describe("Clone controller reconcile loop", func() {
sourcePvc := cc.CreatePvc("source", "default", map[string]string{}, nil)
reconciler = createCloneReconciler(testPvc, sourcePvc, podFunc(sourcePvc))
By("Setting up the match token")
reconciler.shortTokenValidator.(*cc.FakeValidator).Match = "foobaz"
reconciler.shortTokenValidator.(*cc.FakeValidator).Name = "source"
reconciler.shortTokenValidator.(*cc.FakeValidator).Namespace = "default"
reconciler.shortTokenValidator.(*cc.FakeValidator).Params["targetNamespace"] = "default"
reconciler.shortTokenValidator.(*cc.FakeValidator).Params["targetName"] = "testPvc1"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Match = "foobaz"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Name = "source"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Namespace = "default"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Params["targetNamespace"] = "default"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Params["targetName"] = "testPvc1"
By("Verifying no source pod exists")
sourcePod, err := reconciler.findCloneSourcePod(testPvc)
Expect(err).ToNot(HaveOccurred())
Expand Down Expand Up @@ -197,11 +197,11 @@ var _ = Describe("Clone controller reconcile loop", func() {
}
reconciler = createCloneReconciler(objs...)
By("Setting up the match token")
reconciler.shortTokenValidator.(*cc.FakeValidator).Match = "foobaz"
reconciler.shortTokenValidator.(*cc.FakeValidator).Name = "source"
reconciler.shortTokenValidator.(*cc.FakeValidator).Namespace = "default"
reconciler.shortTokenValidator.(*cc.FakeValidator).Params["targetNamespace"] = "default"
reconciler.shortTokenValidator.(*cc.FakeValidator).Params["targetName"] = "testPvc1"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Match = "foobaz"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Name = "source"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Namespace = "default"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Params["targetNamespace"] = "default"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Params["targetName"] = "testPvc1"
By("Verifying no source pod exists")
sourcePod, err := reconciler.findCloneSourcePod(testPvc)
Expect(err).ToNot(HaveOccurred())
Expand Down Expand Up @@ -269,11 +269,11 @@ var _ = Describe("Clone controller reconcile loop", func() {
sourcePod.Namespace = "default"
reconciler = createCloneReconciler(testPvc, cc.CreatePvc("source", "default", map[string]string{}, nil), sourcePod)
By("Setting up the match token")
reconciler.shortTokenValidator.(*cc.FakeValidator).Match = "foobaz"
reconciler.shortTokenValidator.(*cc.FakeValidator).Name = "source"
reconciler.shortTokenValidator.(*cc.FakeValidator).Namespace = "default"
reconciler.shortTokenValidator.(*cc.FakeValidator).Params["targetNamespace"] = "default"
reconciler.shortTokenValidator.(*cc.FakeValidator).Params["targetName"] = "testPvc1"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Match = "foobaz"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Name = "source"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Namespace = "default"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Params["targetNamespace"] = "default"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Params["targetName"] = "testPvc1"
_, err := reconciler.Reconcile(context.TODO(), reconcile.Request{NamespacedName: types.NamespacedName{Name: "testPvc1", Namespace: "default"}})
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring("missing required " + AnnUploadClientName + " annotation"))
Expand All @@ -286,11 +286,11 @@ var _ = Describe("Clone controller reconcile loop", func() {
sourcePod.Namespace = "default"
reconciler = createCloneReconciler(testPvc, cc.CreatePvc("source", "default", map[string]string{}, nil), sourcePod)
By("Setting up the match token")
reconciler.shortTokenValidator.(*cc.FakeValidator).Match = "foobaz"
reconciler.shortTokenValidator.(*cc.FakeValidator).Name = "source"
reconciler.shortTokenValidator.(*cc.FakeValidator).Namespace = "default"
reconciler.shortTokenValidator.(*cc.FakeValidator).Params["targetNamespace"] = "default"
reconciler.shortTokenValidator.(*cc.FakeValidator).Params["targetName"] = "testPvc1"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Match = "foobaz"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Name = "source"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Namespace = "default"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Params["targetNamespace"] = "default"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Params["targetName"] = "testPvc1"
_, err := reconciler.Reconcile(context.TODO(), reconcile.Request{NamespacedName: types.NamespacedName{Name: "testPvc1", Namespace: "default"}})
Expect(err).ToNot(HaveOccurred())
secret := &corev1.Secret{}
Expand All @@ -303,11 +303,11 @@ var _ = Describe("Clone controller reconcile loop", func() {
cc.AnnCloneRequest: "default/source", cc.AnnPodReady: "true", cc.AnnCloneToken: "foobaz", AnnUploadClientName: "uploadclient", cc.AnnCloneSourcePod: "default-testPvc1-source-pod"}, nil)
reconciler = createCloneReconciler(testPvc, cc.CreatePvc("source", "default", map[string]string{}, nil))
By("Setting up the match token")
reconciler.shortTokenValidator.(*cc.FakeValidator).Match = "foobaz"
reconciler.shortTokenValidator.(*cc.FakeValidator).Name = "source"
reconciler.shortTokenValidator.(*cc.FakeValidator).Namespace = "default"
reconciler.shortTokenValidator.(*cc.FakeValidator).Params["targetNamespace"] = "default"
reconciler.shortTokenValidator.(*cc.FakeValidator).Params["targetName"] = "testPvc1"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Match = "foobaz"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Name = "source"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Namespace = "default"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Params["targetNamespace"] = "default"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Params["targetName"] = "testPvc1"
By("Verifying no source pod exists")
sourcePod, err := reconciler.findCloneSourcePod(testPvc)
Expect(err).ToNot(HaveOccurred())
Expand All @@ -324,11 +324,11 @@ var _ = Describe("Clone controller reconcile loop", func() {
testPvc := createTargetPvcFunc()
reconciler = createCloneReconciler(testPvc, createSourcePvcFunc())
By("Setting up the match token")
reconciler.shortTokenValidator.(*cc.FakeValidator).Match = "foobaz"
reconciler.shortTokenValidator.(*cc.FakeValidator).Name = "source"
reconciler.shortTokenValidator.(*cc.FakeValidator).Namespace = "default"
reconciler.shortTokenValidator.(*cc.FakeValidator).Params["targetNamespace"] = "default"
reconciler.shortTokenValidator.(*cc.FakeValidator).Params["targetName"] = "testPvc1"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Match = "foobaz"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Name = "source"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Namespace = "default"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Params["targetNamespace"] = "default"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Params["targetName"] = "testPvc1"
By("Verifying no source pod exists")
sourcePod, err := reconciler.findCloneSourcePod(testPvc)
Expect(err).ToNot(HaveOccurred())
Expand Down Expand Up @@ -431,11 +431,11 @@ var _ = Describe("Clone controller reconcile loop", func() {
testPvc := createTargetPvcFunc()
reconciler = createCloneReconciler(testPvc, createSourcePvcFunc())
By("Setting up the match token")
reconciler.shortTokenValidator.(*cc.FakeValidator).Match = "foobaz"
reconciler.shortTokenValidator.(*cc.FakeValidator).Name = "source"
reconciler.shortTokenValidator.(*cc.FakeValidator).Namespace = "default"
reconciler.shortTokenValidator.(*cc.FakeValidator).Params["targetNamespace"] = "default"
reconciler.shortTokenValidator.(*cc.FakeValidator).Params["targetName"] = "testPvc1"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Match = "foobaz"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Name = "source"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Namespace = "default"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Params["targetNamespace"] = "default"
reconciler.multiTokenValidator.ShortTokenValidator.(*cc.FakeValidator).Params["targetName"] = "testPvc1"
By("Verifying no source pod exists")
sourcePod, err := reconciler.findCloneSourcePod(testPvc)
Expect(err).ToNot(HaveOccurred())
Expand Down Expand Up @@ -721,8 +721,10 @@ func createCloneReconciler(objects ...runtime.Object) *CloneReconciler {
scheme: s,
log: cloneLog,
recorder: rec,
shortTokenValidator: &cc.FakeValidator{
Params: make(map[string]string, 0),
multiTokenValidator: &cc.MultiTokenValidator{
ShortTokenValidator: &cc.FakeValidator{
Params: make(map[string]string, 0),
},
},
image: testImage,
clientCertGenerator: &fakeCertGenerator{},
Expand Down
36 changes: 32 additions & 4 deletions pkg/controller/clone/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"fmt"
"sort"

"github.com/go-logr/logr"
snapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
corev1 "k8s.io/api/core/v1"
storagev1 "k8s.io/api/storage/v1"
Expand All @@ -21,6 +22,17 @@ import (
"kubevirt.io/containerized-data-importer/pkg/util"
)

const (
// PendingPhaseName is the phase when the clone is pending
PendingPhaseName = "Pending"

// SucceededPhaseName is the phase when the clone is succeeded
SucceededPhaseName = "Succeeded"

// ErrorPhaseName is the phase when the clone is in error
ErrorPhaseName = "Error"
)

// IsDataSourcePVC checks for PersistentVolumeClaim source kind
func IsDataSourcePVC(kind string) bool {
return kind == "PersistentVolumeClaim"
Expand Down Expand Up @@ -55,10 +67,20 @@ func AddOwnershipLabel(label string, obj, owner metav1.Object) {
obj.GetLabels()[label] = string(owner.GetUID())
}

// IsSourceClaimReadyArgs are arguments for IsSourceClaimReady
type IsSourceClaimReadyArgs struct {
Target client.Object
SourceNamespace string
SourceName string
Client client.Client
Log logr.Logger
Recorder record.EventRecorder
}

// IsSourceClaimReady checks that PVC exists, is bound, and is not being used
func IsSourceClaimReady(ctx context.Context, c client.Client, namespace, name string) (bool, error) {
func IsSourceClaimReady(ctx context.Context, args *IsSourceClaimReadyArgs) (bool, error) {
claim := &corev1.PersistentVolumeClaim{}
exists, err := getResource(ctx, c, namespace, name, claim)
exists, err := getResource(ctx, args.Client, args.SourceNamespace, args.SourceName, claim)
if err != nil {
return false, err
}
Expand All @@ -71,16 +93,22 @@ func IsSourceClaimReady(ctx context.Context, c client.Client, namespace, name st
return false, nil
}

pods, err := cc.GetPodsUsingPVCs(ctx, c, namespace, sets.New(name), true)
pods, err := cc.GetPodsUsingPVCs(ctx, args.Client, args.SourceNamespace, sets.New(args.SourceName), true)
if err != nil {
return false, err
}

for _, pod := range pods {
args.Log.V(1).Info("Source PVC is being used by pod", "namespace", args.SourceNamespace, "name", args.SourceName, "pod", pod.Name)
args.Recorder.Eventf(args.Target, corev1.EventTypeWarning, cc.CloneSourceInUse,
"pod %s/%s using PersistentVolumeClaim %s", pod.Namespace, pod.Name, args.SourceName)
}

if len(pods) > 0 {
return false, nil
}

return cdiv1.IsPopulated(claim, dataVolumeGetter(ctx, c))
return cdiv1.IsPopulated(claim, dataVolumeGetter(ctx, args.Client))
}

// GetGlobalCloneStrategyOverride returns the global clone strategy override
Expand Down
16 changes: 14 additions & 2 deletions pkg/controller/clone/csi-clone.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
)

// CSIClonePhaseName is the name of the csi clone phase
const CSIClonePhaseName = "CSIClone"

// CSIClonePhase is responsible for csi cloning a pvc
type CSIClonePhase struct {
Owner client.Object
Expand All @@ -31,7 +34,7 @@ var _ Phase = &CSIClonePhase{}

// Name returns the name of the phase
func (p *CSIClonePhase) Name() string {
return "CSIClone"
return CSIClonePhaseName
}

// Reconcile ensures a csi cloned pvc is created correctly
Expand All @@ -43,7 +46,16 @@ func (p *CSIClonePhase) Reconcile(ctx context.Context) (*reconcile.Result, error
}

if !exists {
ready, err := IsSourceClaimReady(ctx, p.Client, p.Namespace, p.SourceName)
args := &IsSourceClaimReadyArgs{
Target: p.Owner,
SourceNamespace: p.Namespace,
SourceName: p.SourceName,
Client: p.Client,
Log: p.Log,
Recorder: p.Recorder,
}

ready, err := IsSourceClaimReady(ctx, args)
if err != nil {
return nil, err
}
Expand Down

0 comments on commit b80ff58

Please sign in to comment.