Rebase fixups

openstack-k8s-operators · Dec 9, 2024 · 4a64a83 · 4a64a83
1 parent 1ef836e
commit 4a64a83
Showing 1 changed file with 0 additions and 20 deletions.
diff --git a/controllers/keystoneapi_controller.go b/controllers/keystoneapi_controller.go
@@ -1210,14 +1210,7 @@ func (r *KeystoneAPIReconciler) generateServiceConfigMaps(
 		"enableFederation":            enableFederation,
 		"federationTrustedDashboard":  fmt.Sprintf("%s/dashboard/auth/websso/", endpointPublic),
 		"federationRemoteIDAttribute": instance.Spec.OIDCFederation.RemoteIDAttribute,
-<<<<<<< HEAD
-<<<<<<< HEAD
 		"fernetMaxActiveKeys":         instance.Spec.FernetMaxActiveKeys,
-=======
->>>>>>> 3ba233c (Rebase temp commit)
-=======
-		"fernetMaxActiveKeys":         instance.Spec.FernetMaxActiveKeys,
->>>>>>> 98b420d (Fix formatting)
 	}
 
 	var OIDCClientSecret string
@@ -1233,18 +1226,6 @@ func (r *KeystoneAPIReconciler) generateServiceConfigMaps(
 			return err
 		}
 
-<<<<<<< HEAD
-		OIDCClientSecret := string(ospSecret.Data[instance.Spec.PasswordSelectors.KeystoneOIDCClientSecret])
-		if OIDCClientSecret == "" {
-			return fmt.Errorf("OIDCClientSecret cannot be empty, no password found for selector %s in secret %s", ospSecret.Name, instance.Spec.PasswordSelectors.KeystoneOIDCClientSecret)
-		}
-
-		OIDCCryptoPassphrase := string(ospSecret.Data[instance.Spec.PasswordSelectors.KeystoneOIDCCryptoPassphrase])
-		if OIDCCryptoPassphrase == "" {
-			return fmt.Errorf("OIDCCryptoPassphrase cannot be empty, no password found for selector %s in secret %s", ospSecret.Name, instance.Spec.PasswordSelectors.KeystoneOIDCCryptoPassphrase)
-		}
-
-=======
 		OIDCClientSecret = string(ospSecret.Data[instance.Spec.PasswordSelectors.KeystoneOIDCClientSecret])
 		if OIDCClientSecret == "" {
 			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(
 		if OIDCCryptoPassphrase == "" {
 			return fmt.Errorf("OIDCCryptoPassphrase cannot be empty, no password found for selector %s in secret %s", ospSecret.Name, instance.Spec.PasswordSelectors.KeystoneOIDCCryptoPassphrase)
 		}
->>>>>>> 3ba233c (Rebase temp commit)
 	}
 
 	// create httpd  vhost template parameters