Skip to content

Commit 78ab524

Browse files
JackLemaitreLemaitre Jacques
andauthored
fix created by and pointor (#47)
Co-authored-by: Lemaitre Jacques <[email protected]>
1 parent ccd36fa commit 78ab524

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

controllers/user_controller.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ func handleReconcileS3User(ctx context.Context, err error, r *S3UserReconciler,
133133
uiid := userResource.GetUID()
134134
secretNameFromUser := userResource.Spec.SecretName
135135

136-
err = r.List(ctx, secretsList, client.InNamespace(userResource.Namespace), client.MatchingLabels{"app.kubernetes.io/created-by": "s3-operator"}) // Use r.Client.List instead of r.List
136+
err = r.List(ctx, secretsList, client.InNamespace(userResource.Namespace))
137137

138138
if err != nil && (errors.IsNotFound(err) || len(secretsList.Items) == 0) {
139139
logger.Info("Secret associated to user not found, user will be deleted and recreated", "user", userResource.Name)
@@ -150,8 +150,9 @@ func handleReconcileS3User(ctx context.Context, err error, r *S3UserReconciler,
150150
fmt.Sprintf("Cannot locate k8s secrets [%s]", userResource.Name), err)
151151
}
152152

153-
secretToTest := &corev1.Secret{}
153+
secretToTest := corev1.Secret{}
154154
for _, secret := range secretsList.Items {
155+
155156
for _, ref := range secret.OwnerReferences {
156157
if ref.UID == uiid {
157158
// i do have a spec.secretName i compar with the secret Name
@@ -160,15 +161,15 @@ func handleReconcileS3User(ctx context.Context, err error, r *S3UserReconciler,
160161
deleteSecret(ctx, r, secret, logger)
161162
} else {
162163
logger.Info("A secret named after the userResource.Spec.SecretName was found " + secret.Name)
163-
secretToTest = &secret
164+
secretToTest = secret
164165
}
165166
// else old case i dont have a spec.SecretName i compar with the s3user.name
166167
} else {
167168
if secret.Name != userResource.Name {
168169
deleteSecret(ctx, r, secret, logger)
169170
} else {
170-
logger.Info("A secret named after the userResource.Spec.SecretName was found " + secret.Name)
171-
secretToTest = &secret
171+
logger.Info("A secret named after the userResource.name was found " + secret.Name)
172+
secretToTest = secret
172173
}
173174
}
174175
}

0 commit comments

Comments
 (0)