fix(operator): properly handle the deprecated replicationFactor (#20935)

Author: btaani

operator/internal/manifests/build.go

@@ -121,6 +121,14 @@ func DefaultLokiStackSpec(size lokiv1.LokiStackSizeType) *lokiv1.LokiStackSpec {
 // ApplyDefaultSettings manipulates the options to conform to
 // build specifications
 func ApplyDefaultSettings(opts *Options) error {
+	// Handle the deprecated field opt.Stack.ReplicationFactor.
+	if (opts.Stack.Replication == nil || opts.Stack.Replication.Factor == 0) && opts.Stack.ReplicationFactor > 0 { // nolint:staticcheck
+		if opts.Stack.Replication == nil {
+			opts.Stack.Replication = &lokiv1.ReplicationSpec{}
+		}
+		opts.Stack.Replication.Factor = opts.Stack.ReplicationFactor // nolint:staticcheck
+	}
+
 	spec := DefaultLokiStackSpec(opts.Stack.Size)
 
 	if err := mergo.Merge(spec, opts.Stack, mergo.WithOverride); err != nil {

operator/internal/manifests/config.go

@@ -107,16 +107,6 @@ func ConfigOptions(opt Options) config.Options {
 		protocol = "https"
 	}
 
-	// nolint:staticcheck
-	// Handle the deprecated field opt.Stack.ReplicationFactor.
-	if (opt.Stack.Replication == nil || opt.Stack.Replication.Factor == 0) && opt.Stack.ReplicationFactor > 0 {
-		if opt.Stack.Replication == nil {
-			opt.Stack.Replication = &lokiv1.ReplicationSpec{}
-		}
-
-		opt.Stack.Replication.Factor = opt.Stack.ReplicationFactor
-	}
-
 	// Build a slice of with the shippers that are being used in the config
 	// booleans used to prevent duplicates
 	shippers := []string{}

operator/internal/manifests/config_test.go

@@ -1299,6 +1299,8 @@ func TestConfigOptions_Replication(t *testing.T) {
 				Stack:    tc.spec,
 				Timeouts: testTimeoutConfig(),
 			}
+			err := ApplyDefaultSettings(&inOpt)
+			require.NoError(t, err)
 			options := ConfigOptions(inOpt)
 			require.Equal(t, tc.wantOptions, *options.Stack.Replication)
 		})

operator/internal/status/lokistack.go

@@ -204,6 +204,8 @@ func generateWarnings(stack *lokiv1.LokiStack) []metav1.Condition {
 	rf := manifests.DefaultLokiStackSpec(stack.Spec.Size).Replication.Factor
 	if stack.Spec.Replication != nil && stack.Spec.Replication.Factor > 0 {
 		rf = stack.Spec.Replication.Factor
+	} else if stack.Spec.ReplicationFactor > 0 { // nolint:staticcheck
+		rf = stack.Spec.ReplicationFactor // nolint:staticcheck
 	}
 	replicas := manifests.DefaultLokiStackSpec(stack.Spec.Size).Template.Ingester.Replicas
 	if stack.Spec.Template != nil && stack.Spec.Template.Ingester != nil && stack.Spec.Template.Ingester.Replicas > 0 {