...

k8ssandra · Dec 14, 2023 · a9aff8a · a9aff8a
1 parent 0234bb9
commit a9aff8a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/controllers/medusa/medusarestorejob_controller.go b/controllers/medusa/medusarestorejob_controller.go
@@ -178,8 +178,7 @@ func (r *MedusaRestoreJobReconciler) Reconcile(ctx context.Context, req ctrl.Req
 
 	request.Log.Info("The restore operation is complete for DC", "CassandraDatacenter", request.Datacenter.Name)
 
-	err = medusa.RefreshSecrets(request.Datacenter, ctx, r.Client, request.Log, r.DefaultDelay)
-	if err != nil {
+	if err = medusa.RefreshSecrets(request.Datacenter, ctx, r.Client, logger, r.DefaultDelay); err != nil {
 		request.Log.Error(err, "Failed to refresh Cassandra users in the DB")
 		// Not going to bother applying updates here since we hit an error.
 		return ctrl.Result{RequeueAfter: r.DefaultDelay}, err

diff --git a/pkg/medusa/refresh_secrets.go b/pkg/medusa/refresh_secrets.go
@@ -15,7 +15,7 @@ import (
 )
 
 func RefreshSecrets(dc *cassdcapi.CassandraDatacenter, ctx context.Context, client client.Client, logger logr.Logger, requeueDelay time.Duration) error {
-	println(fmt.Sprintf("Restore complete for DC %#v, Refreshing secrets", dc.ObjectMeta))
+	logger.Info("Refreshing secrets entered")
 	userSecrets := []string{}
 	for _, user := range dc.Spec.Users {
 		userSecrets = append(userSecrets, user.SecretName)
@@ -25,7 +25,6 @@ func RefreshSecrets(dc *cassdcapi.CassandraDatacenter, ctx context.Context, clie
 	} else {
 		userSecrets = append(userSecrets, dc.Spec.SuperuserSecretName)
 	}
-	println(fmt.Sprintf("refreshing user secrets for %v", userSecrets))
 	//  Both Reaper and medusa secrets go into the userSecrets, so they don't need special handling.
 	for _, i := range userSecrets {
 		secret := &corev1.Secret{}
@@ -38,7 +37,9 @@ func RefreshSecrets(dc *cassdcapi.CassandraDatacenter, ctx context.Context, clie
 			secret.ObjectMeta.Annotations = make(map[string]string)
 		}
 		secret.ObjectMeta.Annotations[k8ssandraapi.RefreshAnnotation] = time.Now().String()
-		reconciliation.ReconcileObject(ctx, client, requeueDelay, *secret)
+		if req := reconciliation.ReconcileObject(ctx, client, requeueDelay, *secret); req.IsError() {
+			return fmt.Errorf("refreshSecret reconcile failed")
+		}
 	}
 	return nil