[don't merge/just review] operator: Add token storage for ingester + make sure PDBs are maxUnavail 1

operator/internal/manifests/distributor.go

@@ -236,7 +236,7 @@ func configureDistributorGRPCServicePKI(deployment *appsv1.Deployment, opts Opti
 // Distributor pods.
 func newDistributorPodDisruptionBudget(opts Options) *policyv1.PodDisruptionBudget {
 	l := ComponentLabels(LabelDistributorComponent, opts.Name)
-	mu := intstr.FromInt(1)
+	maxUnavailable := intstr.FromInt32(1)
 	return &policyv1.PodDisruptionBudget{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "PodDisruptionBudget",
@@ -251,7 +251,7 @@ func newDistributorPodDisruptionBudget(opts Options) *policyv1.PodDisruptionBudg
 			Selector: &metav1.LabelSelector{
 				MatchLabels: l,
 			},
-			MinAvailable: &mu,
+			MaxUnavailable: &maxUnavailable,
 		},
 	}
 }

operator/internal/manifests/distributor_test.go

@@ -116,8 +116,8 @@ func TestBuildDistributor_PodDisruptionBudget(t *testing.T) {
 	require.NotNil(t, pdb)
 	require.Equal(t, "abcd-distributor", pdb.Name)
 	require.Equal(t, "efgh", pdb.Namespace)
-	require.NotNil(t, pdb.Spec.MinAvailable.IntVal)
-	require.Equal(t, int32(1), pdb.Spec.MinAvailable.IntVal)
+	require.NotNil(t, pdb.Spec.MaxUnavailable)
+	require.Equal(t, int32(1), pdb.Spec.MaxUnavailable.IntVal)
 	require.EqualValues(t, ComponentLabels(LabelDistributorComponent, opts.Name), pdb.Spec.Selector.MatchLabels)
 }
 

operator/internal/manifests/ingester.go

@@ -103,6 +103,7 @@ func NewIngesterStatefulSet(opts Options) *appsv1.StatefulSet {
 					fmt.Sprintf("-config.file=%s", path.Join(config.LokiConfigMountDir, config.LokiConfigFileName)),
 					fmt.Sprintf("-runtime-config.file=%s", path.Join(config.LokiConfigMountDir, config.LokiRuntimeConfigFileName)),
 					"-config.expand-env=true",
+					fmt.Sprintf("-ingester.tokens-file-path=%s", ingesterTokensFilePath),
 				},
 				ReadinessProbe: lokiReadinessProbe(),
 				LivenessProbe:  lokiLivenessProbe(),
@@ -290,16 +291,7 @@ func configureIngesterGRPCServicePKI(sts *appsv1.StatefulSet, opts Options) erro
 // Ingester pods.
 func newIngesterPodDisruptionBudget(opts Options) *policyv1.PodDisruptionBudget {
 	l := ComponentLabels(LabelIngesterComponent, opts.Name)
-	rf := DefaultLokiStackSpec(opts.Stack.Size).Replication.Factor
-	if opts.Stack.Replication != nil && opts.Stack.Replication.Factor != 0 {
-		rf = opts.Stack.Replication.Factor
-	}
-
-	pdbMinAvailable := rf
-	if pdbMinAvailable >= opts.Stack.Template.Ingester.Replicas {
-		pdbMinAvailable = max(1, opts.Stack.Template.Ingester.Replicas-1)
-	}
-	minAvailable := intstr.FromInt32(pdbMinAvailable)
+	maxUnavailable := intstr.FromInt32(1)
 
 	return &policyv1.PodDisruptionBudget{
 		TypeMeta: metav1.TypeMeta{
@@ -315,7 +307,7 @@ func newIngesterPodDisruptionBudget(opts Options) *policyv1.PodDisruptionBudget
 			Selector: &metav1.LabelSelector{
 				MatchLabels: l,
 			},
-			MinAvailable: &minAvailable,
+			MaxUnavailable: &maxUnavailable,
 		},
 	}
 }

operator/internal/manifests/ingester_test.go

@@ -1,6 +1,7 @@
 package manifests
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -104,61 +105,50 @@ func TestNewIngesterStatefulSet_SelectorMatchesLabels(t *testing.T) {
 }
 
 func TestBuildIngester_PodDisruptionBudget(t *testing.T) {
-	for _, tc := range []struct {
-		Name                 string
-		Replicas             int
-		ExpectedMinAvailable int
-		Size                 lokiv1.LokiStackSizeType
-	}{
-		{
-			Name:                 "replication factor = replicas",
-			Size:                 lokiv1.SizeOneXExtraSmall,
-			Replicas:             2,
-			ExpectedMinAvailable: 1,
-		},
-		{
-			Name:                 "replication factor < replicas",
-			Size:                 lokiv1.SizeOneXMedium,
-			Replicas:             3,
-			ExpectedMinAvailable: 2,
-		},
-		{
-			Name:                 "replication factor > replicas",
-			Size:                 lokiv1.SizeOneXDemo,
-			Replicas:             1,
-			ExpectedMinAvailable: 1,
-		},
-	} {
-		t.Run(tc.Name, func(t *testing.T) {
-			opts := Options{
-				Name:      "abcd",
-				Namespace: "efgh",
-				Gates:     v1.FeatureGates{},
-				Stack: lokiv1.LokiStackSpec{
-					Size: tc.Size,
-					Template: &lokiv1.LokiTemplateSpec{
-						Ingester: &lokiv1.LokiComponentSpec{
-							Replicas: int32(tc.Replicas),
-						},
-					},
-					Tenants: &lokiv1.TenantsSpec{
-						Mode: lokiv1.OpenshiftLogging,
-					},
+	opts := Options{
+		Name:      "abcd",
+		Namespace: "efgh",
+		Gates:     v1.FeatureGates{},
+		Stack: lokiv1.LokiStackSpec{
+			Template: &lokiv1.LokiTemplateSpec{
+				Ingester: &lokiv1.LokiComponentSpec{
+					Replicas: 3,
 				},
-			}
-			objs, err := BuildIngester(opts)
-			require.NoError(t, err)
-			require.Len(t, objs, 4)
-
-			pdb := objs[3].(*policyv1.PodDisruptionBudget)
-			require.NotNil(t, pdb)
-			require.Equal(t, "abcd-ingester", pdb.Name)
-			require.Equal(t, "efgh", pdb.Namespace)
-			require.NotNil(t, pdb.Spec.MinAvailable.IntVal)
-			require.Equal(t, int32(tc.ExpectedMinAvailable), pdb.Spec.MinAvailable.IntVal)
-			require.EqualValues(t, ComponentLabels(LabelIngesterComponent, opts.Name), pdb.Spec.Selector.MatchLabels)
-		})
+			},
+			Tenants: &lokiv1.TenantsSpec{
+				Mode: lokiv1.OpenshiftLogging,
+			},
+		},
 	}
+	objs, err := BuildIngester(opts)
+	require.NoError(t, err)
+	require.Len(t, objs, 4)
+
+	pdb := objs[3].(*policyv1.PodDisruptionBudget)
+	require.NotNil(t, pdb)
+	require.Equal(t, "abcd-ingester", pdb.Name)
+	require.Equal(t, "efgh", pdb.Namespace)
+	require.NotNil(t, pdb.Spec.MaxUnavailable)
+	require.Equal(t, int32(1), pdb.Spec.MaxUnavailable.IntVal)
+	require.EqualValues(t, ComponentLabels(LabelIngesterComponent, opts.Name), pdb.Spec.Selector.MatchLabels)
+}
+
+func TestNewIngesterStatefulSet_HasTokensFileArg(t *testing.T) {
+	ss := NewIngesterStatefulSet(Options{
+		Name:      "abcd",
+		Namespace: "efgh",
+		Stack: lokiv1.LokiStackSpec{
+			StorageClassName: "standard",
+			Template: &lokiv1.LokiTemplateSpec{
+				Ingester: &lokiv1.LokiComponentSpec{
+					Replicas: 1,
+				},
+			},
+		},
+	})
+
+	container := ss.Spec.Template.Spec.Containers[0]
+	require.Contains(t, container.Args, fmt.Sprintf("-ingester.tokens-file-path=%s", ingesterTokensFilePath))
 }
 
 func TestNewIngesterStatefulSet_TopologySpreadConstraints(t *testing.T) {

operator/internal/manifests/var.go

@@ -53,6 +53,8 @@ const (
 	dataDirectory         = "/tmp/loki"
 	rulesStorageDirectory = "/tmp/rules"
 
+	ingesterTokensFilePath = dataDirectory + "/ring-tokens"
+
 	rulerContainerName = "loki-ruler"
 
 	// EnvRelatedImageLoki is the environment variable to fetch the Loki image pullspec.