Skip to content

Commit a521cd9

Browse files
committed
[WIP] First stab at changing to a pointer
1 parent 5e74798 commit a521cd9

File tree

5 files changed

+6
-15
lines changed

5 files changed

+6
-15
lines changed

api/bases/keystone.openstack.org_keystoneapis.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,6 @@ spec:
8484
files. Those get added to the service config dir in /etc/<service>
8585
. TODO: -> implement'
8686
type: object
87-
enableFederation:
88-
default: false
89-
description: Enablement of Federation configuration
90-
type: boolean
9187
enableSecureRBAC:
9288
default: true
9389
description: EnableSecureRBAC - Enable Consistent and Secure RBAC
@@ -524,7 +520,6 @@ spec:
524520
required:
525521
- containerImage
526522
- databaseInstance
527-
- enableFederation
528523
- memcachedInstance
529524
- rabbitMqClusterName
530525
- secret

api/v1beta1/keystoneapi_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ type KeystoneAPISpecCore struct {
187187

188188
// +kubebuilder:validation:Optional
189189
// +OIDCFederation - parameters to configure keystone for OIDC federation
190-
OIDCFederation KeystoneFederationSpec `json:"oidcFederation,omitempty"`
190+
OIDCFederation *KeystoneFederationSpec `json:"oidcFederation,omitempty"`
191191
}
192192

193193
// APIOverrideSpec to override the generated manifest of several child resources.

api/v1beta1/zz_generated.deepcopy.go

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/keystone.openstack.org_keystoneapis.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,6 @@ spec:
8484
files. Those get added to the service config dir in /etc/<service>
8585
. TODO: -> implement'
8686
type: object
87-
enableFederation:
88-
default: false
89-
description: Enablement of Federation configuration
90-
type: boolean
9187
enableSecureRBAC:
9288
default: true
9389
description: EnableSecureRBAC - Enable Consistent and Secure RBAC
@@ -524,7 +520,6 @@ spec:
524520
required:
525521
- containerImage
526522
- databaseInstance
527-
- enableFederation
528523
- memcachedInstance
529524
- rabbitMqClusterName
530525
- secret

controllers/keystoneapi_controller.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,9 +1188,6 @@ func (r *KeystoneAPIReconciler) generateServiceConfigMaps(
11881188
dbSecret := db.GetSecret()
11891189

11901190
enableFederation := false
1191-
if &instance.Spec.OIDCFederation != nil {
1192-
enableFederation = true
1193-
}
11941191

11951192
templateParameters := map[string]interface{}{
11961193
"memcachedServers": mc.GetMemcachedServerListString(),

0 commit comments

Comments
 (0)