Skip to content

Commit 1476ff1

Browse files
committed
fix(csv): prevent duplicate service ownerrefs
1 parent 0267187 commit 1476ff1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

pkg/controller/install/certresources.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,21 +215,21 @@ func (i *StrategyDeploymentInstaller) installCertRequirementsForDeployment(deplo
215215
}
216216
service.SetName(ServiceName(deploymentName))
217217
service.SetNamespace(i.owner.GetNamespace())
218-
ownerutil.AddNonBlockingOwner(service, i.owner)
219218

220219
existingService, err := i.strategyClient.GetOpLister().CoreV1().ServiceLister().Services(i.owner.GetNamespace()).Get(service.GetName())
221220
if err == nil {
222221
if !ownerutil.Adoptable(i.owner, existingService.GetOwnerReferences()) {
223222
return nil, fmt.Errorf("service %s not safe to replace: extraneous ownerreferences found", service.GetName())
224223
}
225-
service.SetOwnerReferences(append(service.GetOwnerReferences(), existingService.GetOwnerReferences()...))
224+
service.SetOwnerReferences(existingService.GetOwnerReferences())
226225

227226
// Delete the Service to replace
228227
deleteErr := i.strategyClient.GetOpClient().DeleteService(service.GetNamespace(), service.GetName(), &metav1.DeleteOptions{})
229228
if err != nil && !k8serrors.IsNotFound(deleteErr) {
230229
return nil, fmt.Errorf("could not delete existing service %s", service.GetName())
231230
}
232231
}
232+
ownerutil.AddNonBlockingOwner(service, i.owner)
233233

234234
// Attempt to create the Service
235235
_, err = i.strategyClient.GetOpClient().CreateService(service)

0 commit comments

Comments
 (0)