Skip to content

Commit a336955

Browse files
Merge pull request #284 from openshift-cherrypick-robot/cherry-pick-272-to-release-4.9
[release-4.9] Bug 2073967: Fix a bug in deletion of webhook service for replacement
2 parents bbf220a + 616d902 commit a336955

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
@@ -246,7 +246,7 @@ func (i *StrategyDeploymentInstaller) installCertRequirementsForDeployment(deplo
246246

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

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)