Fix naming of bootstrap service for oddly named listener

[scholzj]

Type of change

• Bugfix

Description

When using a type: internal listener with the name external and port 9094, the backward compatibility naming will use the my-cluster-kafka-external-bootstrap as the service name for it. This name is wrong and should be used only for listeners named external with port 9094 that are not type: internal. This service is never created, but the incorrect name is used in the Kafka CR .status section.

This PR also simplifies some other methods that provide some backward compatible naming to really distinguish the backward compatible cases only where needed and simply the conditions where it is not needed.

Checklist

• Write tests
• Make sure all tests pass
• Try your changes from Pod inside your Kubernetes and OpenShift cluster, not just locally

[scholzj]

/azp run regression

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).