Updating log.

Author: sriroopar

internal/controller/ols_app_postgres_reconciliator.go

@@ -345,7 +345,7 @@ func (r *OLSConfigReconciler) reconcilePostgresCA(ctx context.Context, cr *olsv1
 		return nil
 	}
 
-	r.logger.Info("Postgres CA hash updated - deployment will be updated via updatePostgresDeployment", "newHash", combinedHash)
+	r.logger.Info("Postgres CA hash updated,deployment will be updated via updatePostgresDeployment")
 
 	return nil
 }

internal/controller/olsconfig_controller.go

@@ -349,15 +349,11 @@ func (r *OLSConfigReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Owns(&corev1.PersistentVolumeClaim{}).
 		Watches(&corev1.Secret{}, handler.EnqueueRequestsFromMapFunc(secretWatcherFilter)).
 		Watches(&corev1.Secret{}, handler.EnqueueRequestsFromMapFunc(telemetryPullSecretWatcherFilter)).
-<<<<<<< HEAD
+		Watches(&corev1.Secret{}, handler.EnqueueRequestsFromMapFunc(postgresCAWatcherFilter)).
 		Watches(&corev1.ConfigMap{}, handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, obj client.Object) []reconcile.Request {
 			return r.configMapWatcherFilter(ctx, obj)
 		})).
-=======
-		Watches(&corev1.Secret{}, handler.EnqueueRequestsFromMapFunc(postgresCAWatcherFilter)).
-		Watches(&corev1.ConfigMap{}, handler.EnqueueRequestsFromMapFunc(configMapWatcherFilter)).
 		Watches(&corev1.ConfigMap{}, handler.EnqueueRequestsFromMapFunc(postgresCAWatcherFilter)).
->>>>>>> ca97db2 (Postgres reconciliation on certificate rotation.)
 		Owns(&consolev1.ConsolePlugin{}).
 		Owns(&monv1.ServiceMonitor{}).
 		Owns(&monv1.PrometheusRule{}).