Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

K8SPSMDB-1257: Fix secret change detection after upgrade #1790

Merged
merged 1 commit into from
Jan 15, 2025
Merged

K8SPSMDB-1257: Fix secret change detection after upgrade #1790

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions pkg/controller/perconaservermongodb/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ import (
"github.com/percona/percona-server-mongodb-operator/pkg/psmdb/mongo"
)

func getInternalSecretData(secret *corev1.Secret) map[string][]byte {
func getInternalSecretData(cr *api.PerconaServerMongoDB, secret *corev1.Secret) map[string][]byte {
m := secret.DeepCopy().Data
for k, v := range secret.Data {
m[k+"_ESCAPED"] = []byte(url.QueryEscape(string(v)))
if cr.CompareVersion("1.19.0") >= 0 {
for k, v := range secret.Data {
m[k+"_ESCAPED"] = []byte(url.QueryEscape(string(v)))
}
}
return m
}
Expand Down Expand Up @@ -78,7 +80,7 @@ func (r *ReconcilePerconaServerMongoDB) reconcileUsers(ctx context.Context, cr *
internalSysUsersSecret.Labels = nil
}
if cr.CompareVersion("1.19.0") >= 0 {
internalSysUsersSecret.Data = getInternalSecretData(&sysUsersSecretObj)
internalSysUsersSecret.Data = getInternalSecretData(cr, &sysUsersSecretObj)
}
err = r.client.Create(ctx, internalSysUsersSecret)
if err != nil {
Expand All @@ -92,7 +94,7 @@ func (r *ReconcilePerconaServerMongoDB) reconcileUsers(ctx context.Context, cr *
return nil
}

dataChanged, err := sysUsersSecretDataChanged(&sysUsersSecretObj, &internalSysSecretObj)
dataChanged, err := sysUsersSecretDataChanged(cr, &sysUsersSecretObj, &internalSysSecretObj)
if err != nil {
return errors.Wrap(err, "check sys users data changes")
}
Expand Down Expand Up @@ -142,7 +144,7 @@ func (r *ReconcilePerconaServerMongoDB) reconcileUsers(ctx context.Context, cr *

internalSysSecretObj.Data = sysUsersSecretObj.Data
if cr.CompareVersion("1.19.0") >= 0 {
internalSysSecretObj.Data = getInternalSecretData(&sysUsersSecretObj)
internalSysSecretObj.Data = getInternalSecretData(cr, &sysUsersSecretObj)
}
err = r.client.Update(ctx, &internalSysSecretObj)
if err != nil {
Expand Down Expand Up @@ -350,8 +352,8 @@ func (u *systemUser) updateMongo(ctx context.Context, c mongo.Client) error {
return errors.Wrapf(err, "update user %s -> %s", u.currName, u.name)
}

func sysUsersSecretDataChanged(usersSecret *corev1.Secret, internalSecret *corev1.Secret) (bool, error) {
newData := getInternalSecretData(usersSecret)
func sysUsersSecretDataChanged(cr *api.PerconaServerMongoDB, usersSecret *corev1.Secret, internalSecret *corev1.Secret) (bool, error) {
newData := getInternalSecretData(cr, usersSecret)
newDataJSON, err := json.Marshal(newData)
if err != nil {
return false, err
Expand Down
Loading