Remove endpoint url and keystone service id from status

These items presented in CR status are not really used. Endpoints can be discovered using Keystone and we have no use case to require service id.
openstack-k8s-operators · Jul 28, 2023 · 893a591 · 893a591
1 parent c3be85c
commit 893a591
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 49 deletions.
diff --git a/api/v1beta1/barbican_types.go b/api/v1beta1/barbican_types.go
@@ -68,14 +68,6 @@ type BarbicanStatus struct {
 	// Conditions
 	Conditions condition.Conditions `json:"conditions,omitempty" optional:"true"`
 
-	// API endpoints
-	// TODO(dmendiza): This thing is hideous.  Why do we need it?
-	APIEndpoints map[string]map[string]string `json:"apiEndpoints,omitempty"`
-
-	// ServiceIDs
-	// TODO(dmendiza): This thing is hideous.  Why do we need it?
-	ServiceIDs map[string]string `json:"serviceIDs,omitempty"`
-
 	// ReadyCount of Barbican API instances
 	BarbicanAPIReadyCount int32 `json:"barbicanAPIReadyCount,omitempty"`
 

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/barbican.openstack.org_barbicans.yaml b/config/crd/bases/barbican.openstack.org_barbicans.yaml
@@ -282,14 +282,6 @@ spec:
           status:
             description: BarbicanStatus defines the observed state of Barbican
             properties:
-              apiEndpoints:
-                additionalProperties:
-                  additionalProperties:
-                    type: string
-                  type: object
-                description: 'API endpoints TODO(dmendiza): This thing is hideous.  Why
-                  do we need it?'
-                type: object
               barbicanAPIReadyCount:
                 description: ReadyCount of Barbican API instances
                 format: int32
@@ -349,12 +341,6 @@ spec:
                   type: string
                 description: Map of hashes to track e.g. job status
                 type: object
-              serviceIDs:
-                additionalProperties:
-                  type: string
-                description: 'ServiceIDs TODO(dmendiza): This thing is hideous.  Why
-                  do we need it?'
-                type: object
               transportURLSecret:
                 description: TransportURLSecret - Secret containing RabbitMQ transportURL
                 type: string

diff --git a/controllers/barbican_controller.go b/controllers/barbican_controller.go
@@ -138,9 +138,6 @@ func (r *BarbicanReconciler) Reconcile(ctx context.Context, req ctrl.Request) (r
 	if instance.Status.Hash == nil {
 		instance.Status.Hash = map[string]string{}
 	}
-	if instance.Status.APIEndpoints == nil {
-		instance.Status.APIEndpoints = map[string]map[string]string{}
-	}
 
 	// Handle service delete
 	if !instance.DeletionTimestamp.IsZero() {