[WIP] First stab at changing to a pointer

openstack-k8s-operators · Nov 25, 2024 · a521cd9 · a521cd9
1 parent 5e74798
commit a521cd9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 15 deletions.
diff --git a/api/bases/keystone.openstack.org_keystoneapis.yaml b/api/bases/keystone.openstack.org_keystoneapis.yaml
@@ -84,10 +84,6 @@ spec:
                   files. Those get added to the service config dir in /etc/<service>
                   . TODO: -> implement'
                 type: object
-              enableFederation:
-                default: false
-                description: Enablement of Federation configuration
-                type: boolean
               enableSecureRBAC:
                 default: true
                 description: EnableSecureRBAC - Enable Consistent and Secure RBAC
@@ -524,7 +520,6 @@ spec:
             required:
             - containerImage
             - databaseInstance
-            - enableFederation
             - memcachedInstance
             - rabbitMqClusterName
             - secret

diff --git a/api/v1beta1/keystoneapi_types.go b/api/v1beta1/keystoneapi_types.go
@@ -187,7 +187,7 @@ type KeystoneAPISpecCore struct {
 
 	// +kubebuilder:validation:Optional
 	// +OIDCFederation - parameters to configure keystone for OIDC federation
-	OIDCFederation KeystoneFederationSpec `json:"oidcFederation,omitempty"`
+	OIDCFederation *KeystoneFederationSpec `json:"oidcFederation,omitempty"`
 }
 
 // APIOverrideSpec to override the generated manifest of several child resources.

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
@@ -84,10 +84,6 @@ spec:
                   files. Those get added to the service config dir in /etc/<service>
                   . TODO: -> implement'
                 type: object
-              enableFederation:
-                default: false
-                description: Enablement of Federation configuration
-                type: boolean
               enableSecureRBAC:
                 default: true
                 description: EnableSecureRBAC - Enable Consistent and Secure RBAC
@@ -524,7 +520,6 @@ spec:
             required:
             - containerImage
             - databaseInstance
-            - enableFederation
             - memcachedInstance
             - rabbitMqClusterName
             - secret

diff --git a/controllers/keystoneapi_controller.go b/controllers/keystoneapi_controller.go
@@ -1188,9 +1188,6 @@ func (r *KeystoneAPIReconciler) generateServiceConfigMaps(
 	dbSecret := db.GetSecret()
 
 	enableFederation := false
-	if &instance.Spec.OIDCFederation != nil {
-		enableFederation = true
-	}
 
 	templateParameters := map[string]interface{}{
 		"memcachedServers": mc.GetMemcachedServerListString(),