Support zone aware replication

Author: Debakel Orakel

class/loki.yml

@@ -30,6 +30,7 @@ parameters:
         output_path: ${_instance}/10_helm_loki
         helm_values_files:
           - ${_base_directory}/helmcharts/loki/${loki:charts:loki:version}/${loki:preset}.yaml
+          - ${_base_directory}/helmcharts/loki/${loki:charts:loki:version}/${_instance}-components.yaml
           - ${_base_directory}/helmcharts/loki/${loki:charts:loki:version}/${_instance}-configs.yaml
           - ${_base_directory}/helmcharts/loki/${loki:charts:loki:version}/${_instance}-overrides.yaml
         helm_params:

component/helm_values.jsonnet

@@ -10,7 +10,12 @@ local hasRolloutOperator = std.member(inv.applications, 'rollout-operator');
 // Global Params and Zone Aware Replication
 local globalConfig = params.global + com.makeMergeable({
   nodeSelector: std.get(params, 'globalNodeSelector', params.global.nodeSelector),
-  zoneAwareReplication: if hasRolloutOperator then params.global.zoneAwareReplication else std.trace('rollout-operator must be installed', {}),
+  zoneAwareReplication: params.global.zoneAwareReplication {
+    enabled: if params.global.zoneAwareReplication.enabled then
+      // Assert that zone aware replication is only enabled if rollout-operator is installed
+      if hasRolloutOperator then true else error 'rollout-operator must be installed for zone-aware replication'
+    else false,
+  },
 });
 
 local components = com.makeMergeable({
@@ -237,6 +242,11 @@ local hardRestrictions = com.makeMergeable({
     enabled: false,
   },
   [if !std.member([ 'none', 'legacy' ], params.preset) then 'deploymentMode']: 'Distributed',
+  ingester: {
+    zoneAwareReplication: {
+      enabled: if hasRolloutOperator && params.global.zoneAwareReplication.enabled then true else false,
+    },
+  },
 });
 
 {

tests/extra-config.yml

@@ -1,4 +1,5 @@
 applications:
+  - rollout-operator
   - openshift4-monitoring
 
 parameters:
@@ -28,10 +29,18 @@ parameters:
       accessLogExporter:
         tag: latest
 
+    preset: extra-small
+
     components:
       ruler:
         enabled: true
 
+    global:
+      nodeSelector:
+        appuio.io/node-class: plus
+      zoneAwareReplication:
+        enabled: true
+
     s3:
       endpoint: 's3.example.com'
       region: 'us-east-1'

tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/monitoring/loki-rules.yaml

@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/instance: loki
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.7.2
-    helm.sh/chart: loki-13.7.2
+    helm.sh/chart: loki-17.4.11
   name: loki-loki-rules
   namespace: syn-loki
 spec:

tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml

@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/instance: loki
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.7.2
-    helm.sh/chart: loki-13.7.2
+    helm.sh/chart: loki-17.4.11
   name: loki
   namespace: syn-loki
 spec:

tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/backend/query-scheduler-discovery.yaml

@@ -2,17 +2,15 @@ apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   labels:
-    app.kubernetes.io/component: write
+    app.kubernetes.io/component: memcached-chunks-cache
     app.kubernetes.io/instance: loki
     app.kubernetes.io/name: loki
-    app.kubernetes.io/version: 3.7.2
-    helm.sh/chart: loki-17.4.11
-  name: loki-write
+  name: loki-chunks-cache
   namespace: syn-loki
 spec:
   maxUnavailable: 1
   selector:
     matchLabels:
-      app.kubernetes.io/component: write
+      app.kubernetes.io/component: memcached-chunks-cache
       app.kubernetes.io/instance: loki
       app.kubernetes.io/name: loki

…_helm_loki/loki/templates/write/pdb.yaml …oki/loki/templates/chunks-cache/pdb.yamltests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/write/pdb.yaml renamed to tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/chunks-cache/pdb.yaml tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/write/pdb.yaml renamed to tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/chunks-cache/pdb.yaml

@@ -13,7 +13,7 @@ metadata:
   namespace: syn-loki
 spec:
   podManagementPolicy: Parallel
-  replicas: 1
+  replicas: 2
   selector:
     matchLabels:
       app.kubernetes.io/component: memcached-chunks-cache
@@ -66,10 +66,10 @@ spec:
             timeoutSeconds: 3
           resources:
             limits:
-              memory: 9830Mi
+              memory: 4Gi
             requests:
               cpu: 500m
-              memory: 9830Mi
+              memory: 4Gi
           securityContext:
             allowPrivilegeEscalation: false
             capabilities:
@@ -117,7 +117,8 @@ spec:
             seccompProfile:
               type: RuntimeDefault
       initContainers: []
-      nodeSelector: {}
+      nodeSelector:
+        appuio.io/node-class: plus
       securityContext:
         fsGroup: 11211
         runAsGroup: 11211

tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml

@@ -3,12 +3,12 @@ kind: Service
 metadata:
   annotations: null
   labels:
-    app.kubernetes.io/component: backend
+    app.kubernetes.io/component: compactor
     app.kubernetes.io/instance: loki
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.7.2
     helm.sh/chart: loki-17.4.11
-  name: loki-backend
+  name: loki-compactor
   namespace: syn-loki
 spec:
   ports:
@@ -26,7 +26,7 @@ spec:
       targetPort: grpc
   publishNotReadyAddresses: true
   selector:
-    app.kubernetes.io/component: backend
+    app.kubernetes.io/component: compactor
     app.kubernetes.io/instance: loki
     app.kubernetes.io/name: loki
   type: ClusterIP
@@ -36,14 +36,14 @@ kind: Service
 metadata:
   annotations: null
   labels:
-    app.kubernetes.io/component: backend
+    app.kubernetes.io/component: compactor
     app.kubernetes.io/instance: loki
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.7.2
     helm.sh/chart: loki-17.4.11
     prometheus.io/service-monitor: 'false'
     variant: headless
-  name: loki-backend-headless
+  name: loki-compactor-headless
   namespace: syn-loki
 spec:
   clusterIP: None
@@ -62,7 +62,7 @@ spec:
       targetPort: grpc
   publishNotReadyAddresses: true
   selector:
-    app.kubernetes.io/component: backend
+    app.kubernetes.io/component: compactor
     app.kubernetes.io/instance: loki
     app.kubernetes.io/name: loki
   type: ClusterIP

…loki/loki/templates/backend/service.yaml …ki/loki/templates/compactor/service.yamltests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/backend/service.yaml renamed to tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/compactor/service.yaml tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/backend/service.yaml renamed to tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/compactor/service.yaml

@@ -2,30 +2,30 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   labels:
-    app.kubernetes.io/component: write
+    app.kubernetes.io/component: compactor
     app.kubernetes.io/instance: loki
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.7.2
     helm.sh/chart: loki-17.4.11
-  name: loki-write
+  name: loki-compactor
   namespace: syn-loki
 spec:
   podManagementPolicy: Parallel
-  replicas: 3
+  replicas: 1
   revisionHistoryLimit: 10
   selector:
     matchLabels:
-      app.kubernetes.io/component: write
+      app.kubernetes.io/component: compactor
       app.kubernetes.io/instance: loki
       app.kubernetes.io/name: loki
-  serviceName: loki-write-headless
+  serviceName: loki-compactor-headless
   template:
     metadata:
       annotations:
-        checksum/config: 024a6bdf8e5f9fcb1b738320856091cf13e30a5fd575d46b637df747723e7f78
-        kubectl.kubernetes.io/default-container: write
+        checksum/config: ef7e4e1428196d5f360adf616f57243174b2d1a6cf5180603f91bc7ba17deaeb
+        kubectl.kubernetes.io/default-container: compactor
       labels:
-        app.kubernetes.io/component: write
+        app.kubernetes.io/component: compactor
         app.kubernetes.io/instance: loki
         app.kubernetes.io/name: loki
         app.kubernetes.io/part-of: memberlist
@@ -37,7 +37,7 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
             - labelSelector:
                 matchLabels:
-                  app.kubernetes.io/component: write
+                  app.kubernetes.io/component: compactor
                   app.kubernetes.io/instance: loki
                   app.kubernetes.io/name: loki
               topologyKey: kubernetes.io/hostname
@@ -47,10 +47,10 @@ spec:
             - -config.file=/etc/loki/config/config.yaml
             - -config.expand-env=true
             - -memberlist.advertise-addr=$(POD_IP)
-            - -target=write
+            - -target=compactor
           env:
             - name: GOMEMLIMIT
-              value: 6963MiB
+              value: 435MiB
             - name: GOGC
               value: '80'
             - name: POD_IP
@@ -70,7 +70,7 @@ spec:
             periodSeconds: 30
             successThreshold: 1
             timeoutSeconds: 1
-          name: write
+          name: compactor
           ports:
             - containerPort: 3100
               name: http-metrics
@@ -92,11 +92,10 @@ spec:
             timeoutSeconds: 1
           resources:
             limits:
-              cpu: 3
-              memory: 8Gi
+              memory: 512Mi
             requests:
-              cpu: 1
-              memory: 4Gi
+              cpu: 250m
+              memory: 384Mi
           securityContext:
             allowPrivilegeEscalation: false
             capabilities:
@@ -115,13 +114,18 @@ spec:
             - mountPath: /tmp
               name: temp
       enableServiceLinks: true
+      nodeSelector:
+        appuio.io/node-class: plus
       securityContext:
+        fsGroup: 10001
         fsGroupChangePolicy: OnRootMismatch
+        runAsGroup: 10001
         runAsNonRoot: true
+        runAsUser: 10001
         seccompProfile:
           type: RuntimeDefault
       serviceAccountName: loki
-      terminationGracePeriodSeconds: 300
+      terminationGracePeriodSeconds: 30
       volumes:
         - emptyDir: {}
           name: temp
@@ -134,17 +138,8 @@ spec:
         - configMap:
             name: loki-runtime
           name: runtime-config
+        - emptyDir: {}
+          name: data
   updateStrategy:
     rollingUpdate:
       partition: 0
-  volumeClaimTemplates:
-    - apiVersion: v1
-      kind: PersistentVolumeClaim
-      metadata:
-        name: data
-      spec:
-        accessModes:
-          - ReadWriteOnce
-        resources:
-          requests:
-            storage: 10Gi