Skip to content

Commit 56b7b9d

Browse files
Merge pull request #741 from openshift-bot/synchronize-upstream
NO-ISSUE: Synchronize From Upstream Repositories
2 parents 06c71c9 + e40ed28 commit 56b7b9d

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

staging/operator-lifecycle-manager/pkg/controller/bundle/bundle_unpacker.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -671,9 +671,6 @@ func (c *ConfigMapUnpacker) ensureJob(cmRef *corev1.ObjectReference, bundlePath
671671
}
672672
if len(jobs) == 0 {
673673
job, err = c.client.BatchV1().Jobs(fresh.GetNamespace()).Create(context.TODO(), fresh, metav1.CreateOptions{})
674-
if apierrors.IsAlreadyExists(err) {
675-
job, err = c.client.BatchV1().Jobs(fresh.GetNamespace()).Update(context.TODO(), fresh, metav1.UpdateOptions{})
676-
}
677674
return
678675
}
679676

@@ -688,9 +685,6 @@ func (c *ConfigMapUnpacker) ensureJob(cmRef *corev1.ObjectReference, bundlePath
688685
if time.Now().After(cond.LastTransitionTime.Time.Add(unpackRetryInterval)) {
689686
fresh.SetName(names.SimpleNameGenerator.GenerateName(fresh.GetName()))
690687
job, err = c.client.BatchV1().Jobs(fresh.GetNamespace()).Create(context.TODO(), fresh, metav1.CreateOptions{})
691-
if apierrors.IsAlreadyExists(err) {
692-
job, err = c.client.BatchV1().Jobs(fresh.GetNamespace()).Update(context.TODO(), fresh, metav1.UpdateOptions{})
693-
}
694688
}
695689
}
696690

vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/bundle/bundle_unpacker.go

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)