Skip to content

Commit b2392e9

Browse files
Merge pull request #488 from guillaumerose/unmanagedclusterop
Bug 1907313: Don't create ClusterOperator during precreation step if it's present in overrides
2 parents d3e90d9 + b0f73af commit b2392e9

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

pkg/cvo/sync_worker.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -678,6 +678,11 @@ func (w *SyncWorker) apply(ctx context.Context, payloadUpdate *payload.Update, w
678678
if task.Manifest.GVK != configv1.SchemeGroupVersion.WithKind("ClusterOperator") {
679679
continue
680680
}
681+
ov, ok := getOverrideForManifest(work.Overrides, task.Manifest)
682+
if ok && ov.Unmanaged {
683+
klog.V(4).Infof("Skipping precreation of %s as unmanaged", task)
684+
continue
685+
}
681686
if err := w.builder.Apply(ctx, task.Manifest, payload.PrecreatingPayload); err != nil {
682687
klog.V(2).Infof("Unable to precreate resource %s: %v", task, err)
683688
continue

0 commit comments

Comments
 (0)