from here I can rework the controller-runtime upgrade and will this time also see if I can then add some e2e test to cover the problem introduced earlier.