Skip to content

Commit f3b6c0e

Browse files
committed
feat: correctly apply feature flag for password update when user reconciles
1 parent 63ea089 commit f3b6c0e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

controllers/user_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@ func (r *UserReconciler) setUserStatus(ctx context.Context, user *topology.User,
189189
func (r *UserReconciler) DeclareFunc(ctx context.Context, client rabbitmqclient.Client, obj topology.TopologyResource) error {
190190
logger := ctrl.LoggerFrom(ctx)
191191
user := obj.(*topology.User)
192-
if user.Status.Credentials == nil || user.Status.Username == "" {
192+
if user.Status.Credentials == nil || user.Status.Username == "" || user.Spec.AutoUpdateCredentialsSecret {
193193
var username string
194-
if user.Status.Credentials != nil && user.Status.Username == "" || user.Spec.AutoUpdateCredentialsSecret {
194+
if user.Status.Credentials != nil && user.Status.Username == "" {
195195
// Only run once for migration to set user.Status.Username on existing resources
196196
credentials, err := r.getUserCredentials(ctx, user)
197197
if err != nil {

0 commit comments

Comments
 (0)