Addressing review comments

Signed-off-by: Vishesh Tanksale <vtanksale@nvidia.com>
NVIDIA · Feb 21, 2025 · ee0cd32 · ee0cd32
1 parent b5d2025
commit ee0cd32
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/api/apps/v1alpha1/nemo_evaluator_types.go b/api/apps/v1alpha1/nemo_evaluator_types.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"encoding/base64"
 	"fmt"
 	"maps"
 	"os"
@@ -835,7 +834,7 @@ func (n *NemoEvaluator) GetServiceMonitorAnnotations() map[string]string {
 	return NemoEvaluatorAnnotations
 }
 
-func (n *NemoEvaluator) GetSecretParams(secretValue string) *rendertypes.SecretParams {
+func (n *NemoEvaluator) GetSecretParams(secretMapData map[string]string) *rendertypes.SecretParams {
 	params := &rendertypes.SecretParams{}
 
 	// Set metadata
@@ -844,14 +843,7 @@ func (n *NemoEvaluator) GetSecretParams(secretValue string) *rendertypes.SecretP
 	params.Labels = n.GetLabels()
 	params.Annotations = n.GetAnnotations()
 
-	// Initialize the Secret data
-	data := n.GeneratePostgresConnString(secretValue)
-	// Encode to base64
-	encoded := base64.StdEncoding.EncodeToString([]byte(data))
-
-	params.SecretMapData = map[string]string{
-		"uri": encoded,
-	}
+	params.SecretMapData = secretMapData
 
 	return params
 }

diff --git a/internal/controller/nemo_evaluator_controller.go b/internal/controller/nemo_evaluator_controller.go
@@ -18,6 +18,7 @@ package controller
 
 import (
 	"context"
+	"encoding/base64"
 	"fmt"
 	"reflect"
 
@@ -350,14 +351,21 @@ func (r *NemoEvaluatorReconciler) reconcileNemoEvaluator(ctx context.Context, ne
 		}
 	}
 
-	secretValue, err := r.getKubernetesSecret(ctx, nemoEvaluator.GetNamespace(), nemoEvaluator.Spec.DatabaseConfig.Credentials.SecretName, nemoEvaluator.Spec.DatabaseConfig.Credentials.PasswordKey)
+	secretValue, err := r.getValueFromSecret(ctx, nemoEvaluator.GetNamespace(), nemoEvaluator.Spec.DatabaseConfig.Credentials.SecretName, nemoEvaluator.Spec.DatabaseConfig.Credentials.PasswordKey)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
+	data := nemoEvaluator.GeneratePostgresConnString(secretValue)
+	// Encode to base64
+	encoded := base64.StdEncoding.EncodeToString([]byte(data))
+
+	secretMapData := map[string]string{
+		"uri": encoded,
+	}
 
 	// Sync Evaluator Secret
 	err = r.renderAndSyncResource(ctx, nemoEvaluator, &renderer, &corev1.Secret{}, func() (client.Object, error) {
-		return renderer.Secret(nemoEvaluator.GetSecretParams(secretValue))
+		return renderer.Secret(nemoEvaluator.GetSecretParams(secretMapData))
 	}, "secret", conditions.ReasonSecretFailed)
 	if err != nil {
 		return ctrl.Result{}, err
@@ -461,7 +469,7 @@ func (r *NemoEvaluatorReconciler) renderAndSyncResource(ctx context.Context, Nem
 	return nil
 }
 
-func (r *NemoEvaluatorReconciler) getKubernetesSecret(ctx context.Context, namespace, secretName, key string) (string, error) {
+func (r *NemoEvaluatorReconciler) getValueFromSecret(ctx context.Context, namespace, secretName, key string) (string, error) {
 
 	// Get the secret
 	secret := &corev1.Secret{}