Skip to content

Commit 4a64a83

Browse files
committed
Rebase fixups
1 parent 1ef836e commit 4a64a83

File tree

1 file changed

+0
-20
lines changed

1 file changed

+0
-20
lines changed

controllers/keystoneapi_controller.go

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,14 +1210,7 @@ func (r *KeystoneAPIReconciler) generateServiceConfigMaps(
12101210
"enableFederation": enableFederation,
12111211
"federationTrustedDashboard": fmt.Sprintf("%s/dashboard/auth/websso/", endpointPublic),
12121212
"federationRemoteIDAttribute": instance.Spec.OIDCFederation.RemoteIDAttribute,
1213-
<<<<<<< HEAD
1214-
<<<<<<< HEAD
12151213
"fernetMaxActiveKeys": instance.Spec.FernetMaxActiveKeys,
1216-
=======
1217-
>>>>>>> 3ba233c (Rebase temp commit)
1218-
=======
1219-
"fernetMaxActiveKeys": instance.Spec.FernetMaxActiveKeys,
1220-
>>>>>>> 98b420d (Fix formatting)
12211214
}
12221215

12231216
var OIDCClientSecret string
@@ -1233,18 +1226,6 @@ func (r *KeystoneAPIReconciler) generateServiceConfigMaps(
12331226
return err
12341227
}
12351228

1236-
<<<<<<< HEAD
1237-
OIDCClientSecret := string(ospSecret.Data[instance.Spec.PasswordSelectors.KeystoneOIDCClientSecret])
1238-
if OIDCClientSecret == "" {
1239-
return fmt.Errorf("OIDCClientSecret cannot be empty, no password found for selector %s in secret %s", ospSecret.Name, instance.Spec.PasswordSelectors.KeystoneOIDCClientSecret)
1240-
}
1241-
1242-
OIDCCryptoPassphrase := string(ospSecret.Data[instance.Spec.PasswordSelectors.KeystoneOIDCCryptoPassphrase])
1243-
if OIDCCryptoPassphrase == "" {
1244-
return fmt.Errorf("OIDCCryptoPassphrase cannot be empty, no password found for selector %s in secret %s", ospSecret.Name, instance.Spec.PasswordSelectors.KeystoneOIDCCryptoPassphrase)
1245-
}
1246-
1247-
=======
12481229
OIDCClientSecret = string(ospSecret.Data[instance.Spec.PasswordSelectors.KeystoneOIDCClientSecret])
12491230
if OIDCClientSecret == "" {
12501231
return fmt.Errorf("OIDCClientSecret cannot be empty, no password found for selector %s in secret %s", ospSecret.Name, instance.Spec.PasswordSelectors.KeystoneOIDCClientSecret)
@@ -1254,7 +1235,6 @@ func (r *KeystoneAPIReconciler) generateServiceConfigMaps(
12541235
if OIDCCryptoPassphrase == "" {
12551236
return fmt.Errorf("OIDCCryptoPassphrase cannot be empty, no password found for selector %s in secret %s", ospSecret.Name, instance.Spec.PasswordSelectors.KeystoneOIDCCryptoPassphrase)
12561237
}
1257-
>>>>>>> 3ba233c (Rebase temp commit)
12581238
}
12591239

12601240
// create httpd vhost template parameters

0 commit comments

Comments
 (0)