From bd8d597f8d49c0a2f3770e12c9d494f0ae2432bd Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Tue, 8 Oct 2019 17:30:12 +0200
Subject: [PATCH] jsonnet/kube-prometheus/kube-promehtues-anti-affinity: fix
construction
Currently, anti affinity sources configuration from the global configuration,
not respecting local prometheus settings.
This fixes it.
---
.../kube-prometheus-anti-affinity.libsonnet | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet
index dafe4ec9..51b3c19b 100644
--- a/jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet
@@ -4,13 +4,13 @@ local affinity = statefulSet.mixin.spec.template.spec.affinity.podAntiAffinity.p
local matchExpression = affinity.mixin.podAffinityTerm.labelSelector.matchExpressionsType;
{
- local antiaffinity(key, values) = {
+ local antiaffinity(key, values, namespace) = {
affinity: {
podAntiAffinity: {
preferredDuringSchedulingIgnoredDuringExecution: [
affinity.new() +
affinity.withWeight(100) +
- affinity.mixin.podAffinityTerm.withNamespaces($._config.namespace) +
+ affinity.mixin.podAffinityTerm.withNamespaces(namespace) +
affinity.mixin.podAffinityTerm.withTopologyKey('kubernetes.io/hostname') +
affinity.mixin.podAffinityTerm.labelSelector.withMatchExpressions([
matchExpression.new() +
@@ -26,14 +26,16 @@ local matchExpression = affinity.mixin.podAffinityTerm.labelSelector.matchExpres
alertmanager+:: {
alertmanager+: {
spec+:
- antiaffinity('alertmanager', [$._config.alertmanager.name]),
+ antiaffinity('alertmanager', [$._config.alertmanager.name], $._config.namespace),
},
},
prometheus+: {
+ local p = self,
+
prometheus+: {
spec+:
- antiaffinity('prometheus', [$._config.prometheus.name]),
+ antiaffinity('prometheus', [p.name], p.namespace),
},
},
}
--
GitLab