Skip to content

Commit 0f188bc

Browse files
Merge pull request #281 from openshift-cherrypick-robot/cherry-pick-272-to-release-4.8
[release-4.8] Bug 2073963: Fix a bug in deletion of webhook service for replacement
2 parents b3aabf2 + 6f29877 commit 0f188bc

File tree

2 files changed

+2
-2
lines changed
  • staging/operator-lifecycle-manager/pkg/controller/install
  • vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install

2 files changed

+2
-2
lines changed

staging/operator-lifecycle-manager/pkg/controller/install/certresources.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ func (i *StrategyDeploymentInstaller) installCertRequirementsForDeployment(deplo
243243

244244
// Delete the Service to replace
245245
deleteErr := i.strategyClient.GetOpClient().DeleteService(service.GetNamespace(), service.GetName(), &metav1.DeleteOptions{})
246-
if err != nil && !k8serrors.IsNotFound(deleteErr) {
246+
if deleteErr != nil && !k8serrors.IsNotFound(deleteErr) {
247247
return nil, nil, fmt.Errorf("could not delete existing service %s", service.GetName())
248248
}
249249
}

vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install/certresources.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)