From 912ad411ef30ca17bea9a2a98c6dd5f82352d201 Mon Sep 17 00:00:00 2001
From: Martin Schuppert <mschuppert@redhat.com>
Date: Wed, 1 Feb 2023 14:09:34 +0100
Subject: [PATCH] Remove admin endpoint creation

it was deprecated in rocky and removed in train
See https://bugs.launchpad.net/keystone/+bug/1829453
---
 api/bases/keystone.openstack.org_keystoneapis.yaml        | 1 -
 api/v1beta1/keystoneapi_types.go                          | 2 +-
 config/crd/bases/keystone.openstack.org_keystoneapis.yaml | 1 -
 controllers/keystoneapi_controller.go                     | 3 ---
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/api/bases/keystone.openstack.org_keystoneapis.yaml b/api/bases/keystone.openstack.org_keystoneapis.yaml
index 28fdaa073..6bc293a01 100644
--- a/api/bases/keystone.openstack.org_keystoneapis.yaml
+++ b/api/bases/keystone.openstack.org_keystoneapis.yaml
@@ -120,7 +120,6 @@ spec:
                       description: Endpoint, OpenStack endpoint this service maps
                         to
                       enum:
-                      - admin
                       - internal
                       - public
                       type: string
diff --git a/api/v1beta1/keystoneapi_types.go b/api/v1beta1/keystoneapi_types.go
index afc9a047d..94371b5f0 100644
--- a/api/v1beta1/keystoneapi_types.go
+++ b/api/v1beta1/keystoneapi_types.go
@@ -138,7 +138,7 @@ type KeystoneAPISpec struct {
 // MetalLBConfig to configure the MetalLB loadbalancer service
 type MetalLBConfig struct {
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:validation:Enum=admin;internal;public
+	// +kubebuilder:validation:Enum=internal;public
 	// Endpoint, OpenStack endpoint this service maps to
 	Endpoint endpoint.Endpoint `json:"endpoint"`
 
diff --git a/config/crd/bases/keystone.openstack.org_keystoneapis.yaml b/config/crd/bases/keystone.openstack.org_keystoneapis.yaml
index 28fdaa073..6bc293a01 100644
--- a/config/crd/bases/keystone.openstack.org_keystoneapis.yaml
+++ b/config/crd/bases/keystone.openstack.org_keystoneapis.yaml
@@ -120,7 +120,6 @@ spec:
                       description: Endpoint, OpenStack endpoint this service maps
                         to
                       enum:
-                      - admin
                       - internal
                       - public
                       type: string
diff --git a/controllers/keystoneapi_controller.go b/controllers/keystoneapi_controller.go
index f15cefa16..4c9aefb38 100644
--- a/controllers/keystoneapi_controller.go
+++ b/controllers/keystoneapi_controller.go
@@ -333,9 +333,6 @@ func (r *KeystoneAPIReconciler) reconcileInit(
 		endpoint.EndpointInternal: endpoint.Data{
 			Port: keystone.KeystoneInternalPort,
 		},
-		endpoint.EndpointAdmin: endpoint.Data{
-			Port: keystone.KeystoneAdminPort,
-		},
 	}
 
 	for _, metallbcfg := range instance.Spec.ExternalEndpoints {