Change to struct reference and remove boolean

Author: d34dh0r53

api/v1beta1/keystoneapi_types.go

@@ -185,11 +185,6 @@ type KeystoneAPISpecCore struct {
 	// TLS - Parameters related to the TLS
 	TLS tls.API `json:"tls,omitempty"`
 
-	// +kubebuilder:validation:Required
-	// +kubebuilder:default=false
-	// Enablement of Federation configuration
-	EnableFederation bool `json:"enableFederation"`
-
 	// +kubebuilder:validation:Optional
 	// +OIDCFederation - parameters to configure keystone for OIDC federation
 	OIDCFederation KeystoneFederationSpec `json:"oidcFederation,omitempty"`

controllers/keystoneapi_controller.go

@@ -1187,6 +1187,11 @@ func (r *KeystoneAPIReconciler) generateServiceConfigMaps(
 	databaseAccount := db.GetAccount()
 	dbSecret := db.GetSecret()
 
+	enableFederation := false
+	if &instance.Spec.OIDCFederation != nil {
+		enableFederation = true
+	}
+
 	templateParameters := map[string]interface{}{
 		"memcachedServers": mc.GetMemcachedServerListString(),
 		"memcachedTLS":     mc.GetMemcachedTLSSupport(),
@@ -1199,10 +1204,10 @@ func (r *KeystoneAPIReconciler) generateServiceConfigMaps(
 		),
 		"enableSecureRBAC": instance.Spec.EnableSecureRBAC,
 		"ProcessNumber":    instance.Spec.HttpdCustomization.ProcessNumber,
-		"enableFederation": instance.Spec.EnableFederation,
+		"enableFederation": enableFederation,
 	}
 
-	if instance.Spec.EnableFederation {
+	if enableFederation {
 		federationParameters := map[string]interface{}{
 			"federationTrustedDashboard": fmt.Sprintf("https://%s-%s.%s.svc/dashboard/auth/websso/",
 				instance.Name, service.EndpointPublic, instance.Namespace),
@@ -1223,8 +1228,7 @@ func (r *KeystoneAPIReconciler) generateServiceConfigMaps(
 			endptConfig["SSLCertificateKeyFile"] = fmt.Sprintf("/etc/pki/tls/private/%s.key", endpt.String())
 		}
 
-		endptConfig["EnableFederation"] = false // default OIDCFederation to false, and set it below to true if enabled
-		if instance.Spec.EnableFederation {
+		if enableFederation {
 			ospSecret, _, err := oko_secret.GetSecret(
 				ctx,
 				h,
@@ -1244,7 +1248,6 @@ func (r *KeystoneAPIReconciler) generateServiceConfigMaps(
 				return errors.New("OIDCCryptoPassphrase cannot be empty")
 			}
 
-			endptConfig["EnableFederation"] = true
 			endptConfig["OIDCClaimPrefix"] = instance.Spec.OIDCFederation.OIDCClaimPrefix
 			endptConfig["OIDCResponseType"] = instance.Spec.OIDCFederation.OIDCResponseType
 			endptConfig["OIDCScope"] = instance.Spec.OIDCFederation.OIDCScope