From ef8bb5aac08a846a61f77c194906233bae83ecf2 Mon Sep 17 00:00:00 2001 From: Rajat Vig <rvig@etsy.com> Date: Thu, 13 Jun 2019 14:46:36 -0700 Subject: [PATCH] Fix Thanos deployment and service for ksonnet.beta.4 --- .../kube-prometheus/kube-prometheus-thanos.libsonnet | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jsonnet/kube-prometheus/kube-prometheus-thanos.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-thanos.libsonnet index 68deb4f0..0bfd596f 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-thanos.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-thanos.libsonnet @@ -33,8 +33,8 @@ local servicePort = k.core.v1.service.mixin.spec.portsType; }, thanosPeerService: service.new('thanos-peers', { 'thanos-peers': 'true' }, [ - servicePort.newNamed('cluster', 10900, 'cluster'), - servicePort.newNamed('http', 10902, 'http'), + servicePort.newNamed('cluster', 10900, 10900), + servicePort.newNamed('http', 10902, 10902), ]) + service.mixin.metadata.withNamespace($._config.namespace) + service.mixin.metadata.withLabels({ 'thanos-peers': 'true' }) + @@ -75,9 +75,9 @@ local servicePort = k.core.v1.service.mixin.spec.portsType; local thanosQueryContainer = container.new('thanos-query', $._config.imageRepos.thanos + ':' + $._config.versions.thanos) + container.withPorts([ - containerPort.newNamed('http', 10902), - containerPort.newNamed('grpc', 10901), - containerPort.newNamed('cluster', 10900), + containerPort.newNamed(10902, 'http'), + containerPort.newNamed(10901, 'grpc'), + containerPort.newNamed(10900, 'cluster'), ]) + container.withArgs([ 'query', -- GitLab