From bc810b2ab36271a72cbc0cbbc546845397e69e54 Mon Sep 17 00:00:00 2001 From: Matthias Loibl <mail@matthiasloibl.com> Date: Thu, 10 Jan 2019 15:32:51 +0100 Subject: [PATCH] contrib/kube-prometheus: Move thanosPeerService up for better ordering --- .../kube-prometheus/kube-prometheus-thanos.libsonnet | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jsonnet/kube-prometheus/kube-prometheus-thanos.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-thanos.libsonnet index d809e493..3dd55df4 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-thanos.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-thanos.libsonnet @@ -31,6 +31,12 @@ local servicePort = k.core.v1.service.mixin.spec.portsType; }, }, }, + thanosPeerService: + local thanosPeerPort = servicePort.newNamed('cluster', 10900, 'cluster'); + service.new('thanos-peers', { 'thanos-peer': 'true' }, thanosPeerPort) + + service.mixin.metadata.withNamespace($._config.namespace) + + service.mixin.spec.withType('ClusterIP') + + service.mixin.spec.withClusterIp('None'), thanosQueryDeployment: local deployment = k.apps.v1beta2.deployment; local container = k.apps.v1beta2.deployment.mixin.spec.template.spec.containersType; @@ -60,11 +66,5 @@ local servicePort = k.core.v1.service.mixin.spec.portsType; service.new('thanos-query', { app: 'thanos-query' }, thanosQueryPort) + service.mixin.metadata.withNamespace($._config.namespace) + service.mixin.metadata.withLabels({ app: 'thanos-query' }), - thanosPeerService: - local thanosPeerPort = servicePort.newNamed('cluster', 10900, 'cluster'); - service.new('thanos-peers', { 'thanos-peer': 'true' }, thanosPeerPort) + - service.mixin.metadata.withNamespace($._config.namespace) + - service.mixin.spec.withType('ClusterIP') + - service.mixin.spec.withClusterIp('None'), }, } -- GitLab