Merge pull request #119 from thanos-io/zone-spread

receive: Use anti-affinity to spread across zones

CHANGELOG.md

@@ -23,6 +23,8 @@ We use *breaking* word for marking changes that are not backward compatible (rel
 
 - [#105](https://github.com/thanos-io/kube-thanos/pull/105) compactor, store: Add deduplication replica label flags and delete delay labels
 
+- [#119](https://github.com/thanos-io/kube-thanos/pull/119) receive: Distribute receive instances across node zones via pod anti affinity (note: only available on 1.17+).
+
 ### Fixed
 
 -

examples/all/manifests/thanos-receive-statefulSet.yaml

@@ -38,6 +38,17 @@ spec:
               - thanos
               topologyKey: kubernetes.io/hostname
             weight: 100
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app.kubernetes.io/instance
+                  operator: In
+                  values:
+                  - thanos-receive
+              namespaces:
+              - thanos
+              topologyKey: topology.kubernetes.io/zone
+            weight: 100
       containers:
       - args:
         - receive

jsonnet/kube-thanos/kube-thanos-receive.libsonnet

@@ -119,6 +119,16 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
         matchExpression.withOperator('In') +
         matchExpression.withValues([tr.statefulSet.metadata.labels['app.kubernetes.io/instance']]),
       ]),
+      affinity.new() +
+      affinity.withWeight(100) +
+      affinity.mixin.podAffinityTerm.withNamespaces(tr.config.namespace) +
+      affinity.mixin.podAffinityTerm.withTopologyKey('topology.kubernetes.io/zone') +
+      affinity.mixin.podAffinityTerm.labelSelector.withMatchExpressions([
+        matchExpression.new() +
+        matchExpression.withKey('app.kubernetes.io/instance') +
+        matchExpression.withOperator('In') +
+        matchExpression.withValues([tr.statefulSet.metadata.labels['app.kubernetes.io/instance']]),
+      ]),
     ]) +
     sts.mixin.spec.selector.withMatchLabels(tr.config.podLabelSelector) +
     {