Feat/zone redundancy

production/helm/loki/templates/_helpers.tpl

@@ -46,6 +46,134 @@ Params:
 {{- $resourceName -}}
 {{- end -}}
 
+{{/*
+loki.componentSectionFromName returns the sections from the user .Values in YAML
+that corresponds to the requested component. loki.componentSectionFromName takes two arguments
+  .ctx = the root context of the chart
+  .component = the name of the component. loki.componentSectionFromName uses an internal mapping to know
+                which component lives where in the values.yaml
+Examples:
+  $componentSection := include "loki.componentSectionFromName" (dict "ctx" . "component" "ingester") | fromYaml
+  $componentSection.podLabels ...
+*/}}
+{{- define "loki.componentSectionFromName" -}}
+{{- $componentsMap := dict
+  "admin-api" "adminApi"
+  "backend" "backend"
+  "bloom-compactor" "bloomCompactor"
+  "bloom-gateway" "bloomGateway"
+  "chunks-cache" "chunksCache"
+  "compactor" "compactor"
+  "distributor" "distributor"
+  "gateway" "gateway"
+  "index-gateway" "indexGateway"
+  "ingester" "ingester"
+  "memcached" "memcached"
+  "pattern-ingester" "patternIngester"
+  "querier" "querier"
+  "query-frontend" "queryFrontend"
+  "query-scheduler" "queryScheduler"
+  "read" "read"
+  "results-cache" "resultsCache"
+  "ruler" "ruler"
+  "single-binary" "singleBinary"
+  "write" "write"
+-}}
+{{- $componentSection := index $componentsMap .component -}}
+{{- if not $componentSection -}}{{- printf "No component section mapping for %s not found in values; submit a bug report if you are a user, edit loki.componentSectionFromName if you are a contributor" .component | fail -}}{{- end -}}
+{{- $section := .ctx.Values -}}
+{{- range regexSplit "\\." $componentSection -1 -}}
+  {{- $section = index $section . -}}
+  {{- if not $section -}}{{- printf "Component section %s not found in values; values: %s" . ($.ctx.Values | toJson | abbrev 100) | fail -}}{{- end -}}
+{{- end -}}
+{{- $section | toYaml -}}
+{{- end -}}
+
+{{/*
+Creates dict for zone-aware replication configuration
+Params:
+  ctx = . context
+  component = component name
+Return value:
+  {
+    zoneName: {
+      affinity: <affinity>,
+      nodeSelector: <nodeSelector>,
+      replicas: <N>,
+      storageClass: <S>
+    },
+    ...
+  }
+During migration there is a special case where an extra "zone" is generated with zonaName == "" empty string.
+The empty string evaluates to false in boolean expressions so it is treated as the default (non zone-aware) zone,
+which allows us to keep generating everything for the default zone.
+*/}}
+{{- define "loki.zoneAwareReplicationMap" -}}
+{{- $zonesMap := (dict) -}}
+{{- $componentSection := include "loki.componentSectionFromName" . | fromYaml -}}
+{{- $defaultZone := (dict "affinity" $componentSection.affinity "nodeSelector" $componentSection.nodeSelector "replicas" $componentSection.replicas "storageClass" $componentSection.storageClass) -}}
+
+{{- if $componentSection.zoneAwareReplication.enabled -}}
+{{- $numberOfZones := len $componentSection.zoneAwareReplication.zones -}}
+{{- if lt $numberOfZones 3 -}}
+{{- fail "When zone-awareness is enabled, you must have at least 3 zones defined." -}}
+{{- end -}}
+
+{{- $requestedReplicas := $componentSection.replicas -}}
+{{- if and (has .component (list "ingester" )) $componentSection.zoneAwareReplication.migration.enabled (not $componentSection.zoneAwareReplication.migration.writePath) -}}
+{{- $requestedReplicas = $componentSection.zoneAwareReplication.migration.replicas }}
+{{- end -}}
+{{- $replicaPerZone := div (add $requestedReplicas $numberOfZones -1) $numberOfZones -}}
+
+{{- range $idx, $rolloutZone := $componentSection.zoneAwareReplication.zones -}}
+{{- $_ := set $zonesMap $rolloutZone.name (dict
+  "affinity" (($rolloutZone.extraAffinity | default (dict)) | mergeOverwrite (include "loki.zoneAntiAffinity" (dict "component" $.component "rolloutZoneName" $rolloutZone.name "topologyKey" $componentSection.zoneAwareReplication.topologyKey ) | fromYaml ) )
+  "nodeSelector" ($rolloutZone.nodeSelector | default (dict) )
+  "replicas" $replicaPerZone
+  "storageClass" $rolloutZone.storageClass
+  ) -}}
+{{- end -}}
+{{- if $componentSection.zoneAwareReplication.migration.enabled -}}
+{{- if $componentSection.zoneAwareReplication.migration.scaleDownDefaultZone -}}
+{{- $_ := set $defaultZone "replicas" 0 -}}
+{{- end -}}
+{{- $_ := set $zonesMap "" $defaultZone -}}
+{{- end -}}
+
+{{- else -}}
+{{- $_ := set $zonesMap "" $defaultZone -}}
+{{- end -}}
+{{- $zonesMap | toYaml }}
+
+{{- end -}}
+
+{{/*
+Calculate anti-affinity for a zone
+Params:
+  component = component name
+  rolloutZoneName = name of the rollout zone
+  topologyKey = topology key
+*/}}
+{{- define "loki.zoneAntiAffinity" -}}
+{{- if .topologyKey -}}
+podAntiAffinity:
+  requiredDuringSchedulingIgnoredDuringExecution:
+    - labelSelector:
+        matchExpressions:
+          - key: rollout-group
+            operator: In
+            values:
+              - {{ .component }}
+          - key: zone
+            operator: NotIn
+            values:
+              - {{ .rolloutZoneName }}
+      topologyKey: {{ .topologyKey | quote }}
+{{- else -}}
+{}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Return if deployment mode is simple scalable
 */}}

production/helm/loki/templates/bloom-builder/deployment-bloom-builder.yaml

@@ -1,5 +1,4 @@
 {{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
-{{- if $isDistributed -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

production/helm/loki/templates/ingester/service-ingester-headless.yaml

@@ -1,9 +1,7 @@
-{{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
-{{- if and $isDistributed (or (not .Values.ingester.zoneAwareReplication.enabled) .Values.ingester.zoneAwareReplication.migration.enabled) }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "loki.ingesterFullname" . }}-headless
+  name: {{ include "loki.resourceName" (dict "ctx" . "component" "ingester") }}-headless
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "loki.ingesterSelectorLabels" . | nindent 4 }}
@@ -28,5 +26,4 @@ spec:
       appProtocol: {{ .Values.ingester.appProtocol.grpc }}
       {{- end }}
   selector:
-    {{- include "loki.ingesterSelectorLabels" . | nindent 4 }}
-{{- end -}}
+    {{- include "loki.ingesterSelectorLabels" .  | nindent 4 }}

production/helm/loki/templates/ingester/service-ingester.yaml

@@ -1,9 +1,12 @@
-{{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
-{{- if and $isDistributed (or (not .Values.ingester.zoneAwareReplication.enabled) .Values.ingester.zoneAwareReplication.migration.enabled) }}
+{{- $args := dict "ctx" . "component" "ingester" "memberlist" true -}}
+{{- $zonesMap := include "loki.zoneAwareReplicationMap" $args | fromYaml -}}
+{{- range $zoneName, $rolloutZone := $zonesMap }}
+{{- with $ -}}
+{{- $_ := set $args "rolloutZoneName" $zoneName -}}
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "loki.ingesterFullname" . }}
+  name: {{ include "loki.resourceName" $args }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "loki.ingesterLabels" . | nindent 4 }}
@@ -30,4 +33,7 @@ spec:
       {{- end }}
   selector:
     {{- include "loki.ingesterSelectorLabels" . | nindent 4 }}
-{{- end -}}
+    name: {{ include "loki.resourceName" $args }}
+---
+{{ end }}
+{{ end }}