Merge pull request #877 from gcs278/OCPBUGS-6698

OCPBUGS-6698: Fix conflict error message in ensureNodePortService
openshift · Feb 1, 2023 · e24a381 · e24a381
2 parents 3d11e8d + 49ffd83
commit e24a381
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/operator/controller/ingress/nodeport_service.go b/pkg/operator/controller/ingress/nodeport_service.go
@@ -60,7 +60,7 @@ func (r *reconciler) ensureNodePortService(ic *operatorv1.IngressController, dep
 		return false, nil, nil
 	case !wantService && haveService:
 		if !ownLBS {
-			return false, nil, fmt.Errorf("a conflicting nodeport service exists that is not owned by the ingress controller: %s", controller.LoadBalancerServiceName(ic))
+			return false, nil, fmt.Errorf("a conflicting nodeport service exists that is not owned by the ingress controller: %s", current.Name)
 		}
 		if err := r.client.Delete(context.TODO(), current); err != nil {
 			if !errors.IsNotFound(err) {
@@ -78,7 +78,7 @@ func (r *reconciler) ensureNodePortService(ic *operatorv1.IngressController, dep
 		return r.currentNodePortService(ic)
 	case wantService && haveService:
 		if !ownLBS {
-			return false, nil, fmt.Errorf("a conflicting nodeport service exists that is not owned by the ingress controller: %s", controller.LoadBalancerServiceName(ic))
+			return false, nil, fmt.Errorf("a conflicting nodeport service exists that is not owned by the ingress controller: %s", current.Name)
 		}
 		if updated, err := r.updateNodePortService(current, desired); err != nil {
 			return true, current, fmt.Errorf("failed to update NodePort service: %v", err)