review

Author: adutra

deploy/bundle.yaml

@@ -26737,6 +26737,8 @@ spec:
               value: percona-server-mongodb-operator
             - name: RESYNC_PERIOD
               value: 5s
+            - name: RECONCILE_INTERVAL
+              value: 5s
             - name: DISABLE_TELEMETRY
               value: "false"
             - name: MAX_CONCURRENT_RECONCILES

deploy/cw-bundle.yaml

@@ -26763,6 +26763,8 @@ spec:
               value: percona-server-mongodb-operator
             - name: RESYNC_PERIOD
               value: 5s
+            - name: RECONCILE_INTERVAL
+              value: 5s
             - name: DISABLE_TELEMETRY
               value: "false"
             - name: MAX_CONCURRENT_RECONCILES

pkg/controller/perconaservermongodb/psmdb_controller.go

@@ -157,9 +157,9 @@ func getReconcileInterval() time.Duration {
 		return defaultInterval
 	}
 
-	if d <= 0 {
+	if d < defaultInterval {
 		log := logf.Log.WithName("psmdb-controller")
-		log.Info("RECONCILE_INTERVAL must be a positive duration, using default (5s)", "value", interval, "default", defaultInterval)
+		log.Info("RECONCILE_INTERVAL must be at least 5s, using 5s", "value", interval, "default", defaultInterval)
 		return defaultInterval
 	}
 

pkg/controller/perconaservermongodb/psmdb_controller_test.go

@@ -8,6 +8,8 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -52,31 +54,27 @@ func TestGetReconcileInterval(t *testing.T) {
 			setEnv:   true,
 			want:     5 * time.Second,
 		},
+		{
+			name:     "duration less than 5s falls back to default",
+			envValue: "1s",
+			setEnv:   true,
+			want:     5 * time.Second,
+		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			// Save original env value
-			originalValue, wasSet := os.LookupEnv("RECONCILE_INTERVAL")
 			defer func() {
-				if wasSet {
-					os.Setenv("RECONCILE_INTERVAL", originalValue)
-				} else {
-					os.Unsetenv("RECONCILE_INTERVAL")
-				}
+				err := os.Unsetenv("RECONCILE_INTERVAL")
+				require.NoError(t, err)
 			}()
-
-			// Set test env value
 			if tt.setEnv {
-				os.Setenv("RECONCILE_INTERVAL", tt.envValue)
-			} else {
-				os.Unsetenv("RECONCILE_INTERVAL")
+				err := os.Setenv("RECONCILE_INTERVAL", tt.envValue)
+				require.NoError(t, err)
 			}
 
 			got := getReconcileInterval()
-			if got != tt.want {
-				t.Errorf("getReconcileInterval() = %v, want %v", got, tt.want)
-			}
+			assert.Equal(t, tt.want, got)
 		})
 	}
 }