Merge pull request #257 from kajinamit/api-endpoints-followup

Remove status.APIEndpoint
openstack-k8s-operators · Jun 15, 2023 · 7d7aa98 · 7d7aa98
2 parents e0616af + 7f1d0f5
commit 7d7aa98
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 24 deletions.
diff --git a/api/bases/keystone.openstack.org_keystoneapis.yaml b/api/bases/keystone.openstack.org_keystoneapis.yaml
@@ -267,11 +267,6 @@ spec:
           status:
             description: KeystoneAPIStatus defines the observed state of KeystoneAPI
             properties:
-              apiEndpoint:
-                additionalProperties:
-                  type: string
-                description: API endpoint (deprecated)
-                type: object
               apiEndpoints:
                 additionalProperties:
                   type: string

diff --git a/api/v1beta1/keystoneapi_types.go b/api/v1beta1/keystoneapi_types.go
@@ -218,9 +218,6 @@ type KeystoneAPIStatus struct {
 	// API endpoint
 	APIEndpoints map[string]string `json:"apiEndpoints,omitempty"`
 
-	// API endpoint (deprecated)
-	APIEndpoint map[string]string `json:"apiEndpoint,omitempty"`
-
 	// Conditions
 	Conditions condition.Conditions `json:"conditions,omitempty" optional:"true"`
 

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/keystone.openstack.org_keystoneapis.yaml b/config/crd/bases/keystone.openstack.org_keystoneapis.yaml
@@ -267,11 +267,6 @@ spec:
           status:
             description: KeystoneAPIStatus defines the observed state of KeystoneAPI
             properties:
-              apiEndpoint:
-                additionalProperties:
-                  type: string
-                description: API endpoint (deprecated)
-                type: object
               apiEndpoints:
                 additionalProperties:
                   type: string

diff --git a/controllers/keystoneapi_controller.go b/controllers/keystoneapi_controller.go
@@ -189,9 +189,6 @@ func (r *KeystoneAPIReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	if instance.Status.Hash == nil {
 		instance.Status.Hash = map[string]string{}
 	}
-	if instance.Status.APIEndpoint == nil {
-		instance.Status.APIEndpoint = map[string]string{}
-	}
 	if instance.Status.APIEndpoints == nil {
 		instance.Status.APIEndpoints = map[string]string{}
 	}
@@ -432,7 +429,6 @@ func (r *KeystoneAPIReconciler) reconcileInit(
 	//
 	// TODO: need to support https default here
 	instance.Status.APIEndpoints = apiEndpoints
-	instance.Status.APIEndpoint = apiEndpoints
 
 	// expose service - end