Skip to content

Commit 5655443

Browse files
orenc1perdasilva
authored andcommitted
[BZ #2048441] Fix a bug in deletion of webhook service for replacement (#2606)
The condition that checks for an error with the webhook service deletion is based on the wrong variable, and the return statement is never reached, which leads to a continuous error when OLM tries to replace the webhook service on certain conditions Signed-off-by: orenc1 <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: e9aef37a1f293bbbf833206f2037a2f36ffe2673
1 parent 5863540 commit 5655443

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)