easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

contrib/kube-prometheus: Set podAntiAffinity for Prometheus & Alertmanager

Browse Source 
contrib/kube-prometheus: Generate new manifests with antiAffinity

contrib/kube-prometheus: jb update

Documentation: Generate after updating kube-prometheus manifests

contrib/kube-prometheus: Move antiaffinity into own jsonnet file

foobar
This commit is contained in:
Matthias Loibl
2018-09-25 17:14:30 +02:00
parent 57a0e161ff
commit 916863e4d5
2 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet Normal file
View File

@@ -0,0 +1,39 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
local statefulSet = k.apps.v1beta2.statefulSet;
local affinity = statefulSet.mixin.spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecutionType;
local matchExpression = affinity.mixin.podAffinityTerm.labelSelector.matchExpressionsType;
{
local antiaffinity(key, values) = {
affinity: {
podAntiAffinity: {
preferredDuringSchedulingIgnoredDuringExecution: [
affinity.new() +
affinity.withWeight(100) +
affinity.mixin.podAffinityTerm.withNamespaces($._config.namespace) +
affinity.mixin.podAffinityTerm.withTopologyKey('kubernetes.io/hostname') +
affinity.mixin.podAffinityTerm.labelSelector.withMatchExpressions([
matchExpression.new() +
matchExpression.withKey(key) +
matchExpression.withOperator('In') +
matchExpression.withValues(values),
]),
],
},
},
},
alertmanager+:: {
alertmanager+: {
spec+:
antiaffinity('alertmanager', [$._config.alertmanager.name]),
},
},
prometheus+: {
prometheus+: {
spec+:
antiaffinity('prometheus', [$._config.prometheus.name]),
},
},
}

10
jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
View File

@@ -144,12 +144,14 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
local roleList = k.rbac.v1.roleList;
roleList.new([newSpecificRole(x) for x in $._config.prometheus.namespaces]),
prometheus:
local container = k.core.v1.pod.mixin.spec.containersType;
local statefulSet = k.apps.v1beta2.statefulSet;
local container = statefulSet.mixin.spec.template.spec.containersType;
local resourceRequirements = container.mixin.resourcesType;
local selector = k.apps.v1beta2.deployment.mixin.spec.selectorType;
local selector = statefulSet.mixin.spec.selectorType;
local resources = resourceRequirements.new() +
resourceRequirements.withRequests({ memory: '400Mi' });
local resources =
resourceRequirements.new() +
resourceRequirements.withRequests({ memory: '400Mi' });
{
apiVersion: 'monitoring.coreos.com/v1',