Remove interface from GetAdminServiceClient

Refactor the change added in this branch to pick the right bundle
internally based on KeystoneAPI spec instead of making callers of
GetAdminServiceClient figure that out.

The client will continue to default to the internal interface, but use
the public interface when using an external Keytone API.

Author: dmendiza

api/v1beta1/keystoneapi.go

@@ -121,7 +121,6 @@ func GetAdminServiceClient(
 	ctx context.Context,
 	h *helper.Helper,
 	keystoneAPI *KeystoneAPI,
-	endpointInterface ...endpoint.Endpoint,
 ) (*openstack.OpenStack, ctrl.Result, error) {
 	os, ctrlResult, err := GetScopedAdminServiceClient(
 		ctx,
@@ -130,7 +129,6 @@ func GetAdminServiceClient(
 		&gophercloud.AuthScope{
 			System: true,
 		},
-		endpointInterface...,
 	)
 	if err != nil {
 		return nil, ctrlResult, err
@@ -145,13 +143,12 @@ func GetScopedAdminServiceClient(
 	h *helper.Helper,
 	keystoneAPI *KeystoneAPI,
 	scope *gophercloud.AuthScope,
-	endpointInterface ...endpoint.Endpoint,
 ) (*openstack.OpenStack, ctrl.Result, error) {
 	// get endpoint as authurl from keystone instance
 	// default to internal endpoint if not specified
 	epInterface := endpoint.EndpointInternal
-	if len(endpointInterface) > 0 {
-		epInterface = endpoint.Endpoint(endpointInterface[0])
+	if keystoneAPI.Spec.ExternalKeystoneAPI {
+		epInterface = endpoint.Endpoint(endpoint.EndpointPublic)
 	}
 	authURL, err := keystoneAPI.GetEndpoint(epInterface)
 	if err != nil {

internal/controller/keystoneendpoint_controller.go

@@ -32,7 +32,6 @@ import (
 	"github.com/go-logr/logr"
 	keystonev1 "github.com/openstack-k8s-operators/keystone-operator/api/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
-	"github.com/openstack-k8s-operators/lib-common/modules/common/endpoint"
 	helper "github.com/openstack-k8s-operators/lib-common/modules/common/helper"
 	util "github.com/openstack-k8s-operators/lib-common/modules/common/util"
 	openstack "github.com/openstack-k8s-operators/lib-common/modules/openstack"
@@ -213,15 +212,10 @@ func (r *KeystoneEndpointReconciler) Reconcile(ctx context.Context, req ctrl.Req
 	//
 	// get admin authentication OpenStack
 	//
-	adminInterface := endpoint.EndpointInternal
-	if keystoneAPI.Spec.ExternalKeystoneAPI {
-		adminInterface = endpoint.EndpointPublic
-	}
 	os, ctrlResult, err := keystonev1.GetAdminServiceClient(
 		ctx,
 		helper,
 		keystoneAPI,
-		adminInterface,
 	)
 	if err != nil {
 		instance.Status.Conditions.Set(condition.FalseCondition(

internal/controller/keystoneservice_controller.go

@@ -25,7 +25,6 @@ import (
 	"github.com/go-logr/logr"
 	keystonev1 "github.com/openstack-k8s-operators/keystone-operator/api/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
-	endpoint "github.com/openstack-k8s-operators/lib-common/modules/common/endpoint"
 	helper "github.com/openstack-k8s-operators/lib-common/modules/common/helper"
 	secret "github.com/openstack-k8s-operators/lib-common/modules/common/secret"
 
@@ -215,15 +214,10 @@ func (r *KeystoneServiceReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 	//
 	// get admin authentication OpenStack
 	//
-	adminInterface := endpoint.EndpointInternal
-	if keystoneAPI.Spec.ExternalKeystoneAPI {
-		adminInterface = endpoint.EndpointPublic
-	}
 	os, ctrlResult, err := keystonev1.GetAdminServiceClient(
 		ctx,
 		helper,
 		keystoneAPI,
-		adminInterface,
 	)
 	if err != nil {
 		instance.Status.Conditions.Set(condition.FalseCondition(