From cfccf37f21694a7012bffda883c9fc60a43f7caf Mon Sep 17 00:00:00 2001
From: Simon Gerber <simon.gerber@vshn.ch>
Date: Tue, 16 Jan 2024 12:59:10 +0100
Subject: [PATCH] Bump replica count for LokiStack read path to 2 for 1x.demo

Cluster-logging 5.8 introduces PDBs for the Loki stack. Unfortunately
the PDBs are created unconditionally, and block node drains when
deploying LokiStack with `1x.demo`.

We adjust the replica count for the LokiStack read path (gateway,
querier, queryfrontend) to 2, so that we can drain infra nodes without
violating the PDBs for those components.
---
 component/loki.libsonnet                                    | 6 +++---
 .../openshift4-logging/50_loki_stack.yaml                   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/component/loki.libsonnet b/component/loki.libsonnet
index 01ee290..2ed7d92 100644
--- a/component/loki.libsonnet
+++ b/component/loki.libsonnet
@@ -20,7 +20,7 @@ local lokistack_spec = {
       nodeSelector: { 'node-role.kubernetes.io/infra': '' },
     },
     gateway: {
-      [if loki.spec.size == '1x.demo' then 'replicas']: 1,
+      [if loki.spec.size == '1x.demo' then 'replicas']: 2,
       nodeSelector: { 'node-role.kubernetes.io/infra': '' },
     },
     indexGateway: {
@@ -32,11 +32,11 @@ local lokistack_spec = {
       nodeSelector: { 'node-role.kubernetes.io/infra': '' },
     },
     querier: {
-      [if loki.spec.size == '1x.demo' then 'replicas']: 1,
+      [if loki.spec.size == '1x.demo' then 'replicas']: 2,
       nodeSelector: { 'node-role.kubernetes.io/infra': '' },
     },
     queryFrontend: {
-      [if loki.spec.size == '1x.demo' then 'replicas']: 1,
+      [if loki.spec.size == '1x.demo' then 'replicas']: 2,
       nodeSelector: { 'node-role.kubernetes.io/infra': '' },
     },
     ruler: {
diff --git a/tests/golden/lokistack/openshift4-logging/openshift4-logging/50_loki_stack.yaml b/tests/golden/lokistack/openshift4-logging/openshift4-logging/50_loki_stack.yaml
index 33d0ed7..d61e352 100644
--- a/tests/golden/lokistack/openshift4-logging/openshift4-logging/50_loki_stack.yaml
+++ b/tests/golden/lokistack/openshift4-logging/openshift4-logging/50_loki_stack.yaml
@@ -33,7 +33,7 @@ spec:
     gateway:
       nodeSelector:
         node-role.kubernetes.io/infra: ''
-      replicas: 1
+      replicas: 2
     indexGateway:
       nodeSelector:
         node-role.kubernetes.io/infra: ''
@@ -45,11 +45,11 @@ spec:
     querier:
       nodeSelector:
         node-role.kubernetes.io/infra: ''
-      replicas: 1
+      replicas: 2
     queryFrontend:
       nodeSelector:
         node-role.kubernetes.io/infra: ''
-      replicas: 1
+      replicas: 2
     ruler:
       nodeSelector:
         node-role.kubernetes.io/infra: ''