Remove admin endpoint creation

it was deprecated in rocky and removed in train See https://bugs.launchpad.net/keystone/+bug/1829453
openstack-k8s-operators · Feb 13, 2023 · 135f951 · 135f951
1 parent 14d3aba
commit 135f951
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 6 deletions.
diff --git a/api/bases/keystone.openstack.org_keystoneapis.yaml b/api/bases/keystone.openstack.org_keystoneapis.yaml
@@ -119,7 +119,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
@@ -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
@@ -119,7 +119,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
@@ -336,9 +336,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 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -119,7 +119,6 @@ spec: @@
                           description: Endpoint, OpenStack endpoint this service maps
                             to
                           enum:
-                          - admin
                           - internal
                           - public
                           type: string
@@ Expand Down @@